shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-04 09:18:36 +03:00
Code Releases Activity

makefiles: allow using configure cppflags

Browse Source 
Configure defines 'CPPFLAGS' and we should use defined value
for compilation.

Reported-by: debian
This commit is contained in:
Zdenek Kabelac 2023-02-12 13:12:23 +01:00
parent 50f73de4b2
commit 4791a4fc68
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libdm/make.tmpl.in
View File

@ -59,6 +59,7 @@ DEFS += @DEFS@
# FIXME set this only where it's needed, not globally? # FIXME set this only where it's needed, not globally?
CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@ CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@
LDFLAGS ?= @LDFLAGS@ LDFLAGS ?= @LDFLAGS@
CPPFLAGS ?= @CPPFLAGS@
CLDFLAGS += @CLDFLAGS@ CLDFLAGS += @CLDFLAGS@
ELDFLAGS += @ELDFLAGS@ ELDFLAGS += @ELDFLAGS@
LDDEPS += @LDDEPS@ LDDEPS += @LDDEPS@
@ -412,7 +413,7 @@ DEFS+=-D_FILE_OFFSET_BITS=64
%.o: %.c $(DEPS) %.o: %.c $(DEPS)
@echo " [CC] $(<F)" @echo " [CC] $(<F)"
@mkdir -p $(@D) @mkdir -p $(@D)
$(Q) $(CC) $(DEPFLAGS) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(WCFLAGS) $(CFLAGS) $(CFLAGS_$@) $< -o $@ $(Q) $(CC) $(DEPFLAGS) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(WCFLAGS) $(CFLAGS) $(CFLAGS_$@) $(CPPFLAGS) $< -o $@
%.o: %.cpp $(DEPS) %.o: %.cpp $(DEPS)
@echo " [CXX] $(<F)" @echo " [CXX] $(<F)"
@ -422,7 +423,7 @@ DEFS+=-D_FILE_OFFSET_BITS=64
%.pot: %.c $(DEPS) %.pot: %.c $(DEPS)
@echo " [CC] $@" @echo " [CC] $@"
@mkdir -p $(@D) @mkdir -p $(@D)
$(Q) $(CC) -E $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) -include $(top_builddir)/po/pogen.h $(DEFS) $(WFLAGS) $(CFLAGS) $< >$@ $(Q) $(CC) -E $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) -include $(top_builddir)/po/pogen.h $(DEFS) $(WFLAGS) $(CFLAGS) $(CPPFLAGS) $< >$@
%.so: %.o %.so: %.o
@echo " [CC] $(<F)" @echo " [CC] $(<F)"

5
make.tmpl.in
View File

@ -63,6 +63,7 @@ STATIC_LIBS = $(PTHREAD_LIBS)
DEFS += @DEFS@ DEFS += @DEFS@
# FIXME set this only where it's needed, not globally? # FIXME set this only where it's needed, not globally?
CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@ CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@
CPPFLAGS ?= @CPPFLAGS@
LDFLAGS ?= @LDFLAGS@ LDFLAGS ?= @LDFLAGS@
CLDFLAGS += @CLDFLAGS@ CLDFLAGS += @CLDFLAGS@
ELDFLAGS += @ELDFLAGS@ ELDFLAGS += @ELDFLAGS@
@ -477,7 +478,7 @@ DEFS+=-D_FILE_OFFSET_BITS=64
%.o: %.c $(DEPS) %.o: %.c $(DEPS)
@echo " [CC] $(<F)" @echo " [CC] $(<F)"
@mkdir -p $(@D) @mkdir -p $(@D)
$(Q) $(CC) $(DEPFLAGS) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(WCFLAGS) $(CFLAGS) $(CFLAGS_$@) $< -o $@ $(Q) $(CC) $(DEPFLAGS) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(WCFLAGS) $(CFLAGS) $(CFLAGS_$@) $(CPPFLAGS) $< -o $@
%.o: %.cpp $(DEPS) %.o: %.cpp $(DEPS)
@echo " [CXX] $(<F)" @echo " [CXX] $(<F)"
@ -487,7 +488,7 @@ DEFS+=-D_FILE_OFFSET_BITS=64
%.pot: %.c $(DEPS) %.pot: %.c $(DEPS)
@echo " [CC] $(<F)" @echo " [CC] $(<F)"
@mkdir -p $(@D) @mkdir -p $(@D)
$(Q) $(CC) -E $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) -include $(top_builddir)/po/pogen.h $(DEFS) $(WFLAGS) $(CFLAGS) $< >$@ $(Q) $(CC) -E $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) -include $(top_builddir)/po/pogen.h $(DEFS) $(WFLAGS) $(CFLAGS) $(CPPFLAGS) $< >$@
%.so: %.o %.so: %.o
@echo " [CC] $(<F)" @echo " [CC] $(<F)"

2
tools/Makefile.in
View File

@ -133,7 +133,7 @@ man-generator.c: $(srcdir)/command.c
man-generator: man-generator.o man-generator: man-generator.o
@echo " [CC] $@" @echo " [CC] $@"
$(Q) $(CC) $(CFLAGS) -o $@ $(<F) $(Q) $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(<F)
lvm.static: $(OBJECTS) lvm-static.o $(LVMINTERNAL_LIBS) lvm.static: $(OBJECTS) lvm-static.o $(LVMINTERNAL_LIBS)
@echo " [CC] $@" @echo " [CC] $@"