Ensure CPPFLAGS makes it to the compiler

Gbp-Pq: Name 0005-Ensure-CPPFLAGS-makes-it-to-the-compiler.patch

diff --git a/lib/Makefile b/lib/Makefile
index fcc0d099d57ba5dcd7342bb89906dba91166bff7..b0f8289e239fcdb962eca78305755a76dabb297c 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -23,9 +23,8 @@ PREFIX ?= /usr/local
 LIBDIR ?= $(PREFIX)/lib
 INCLUDEDIR=$(PREFIX)/include
 
-CPPFLAGS+= -I. -I./common -DXXH_NAMESPACE=ZSTD_
-CFLAGS  ?= -O3
-CFLAGS  += -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow -Wstrict-aliasing=1 \
+CPPFLAGS += -I. -I./common -DXXH_NAMESPACE=ZSTD_
+CFLAGS  += -O3 -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow -Wstrict-aliasing=1 \
            -Wswitch-enum -Wdeclaration-after-statement -Wstrict-prototypes -Wundef \
            -Wpointer-arith
 CFLAGS  += $(MOREFLAGS)
@@ -67,17 +66,17 @@ all: lib
 libzstd.a: ARFLAGS = rcs
 libzstd.a: $(ZSTD_FILES)
        @echo compiling static library
-       @$(CC) $(FLAGS) -c $^
-       @$(AR) $(ARFLAGS) $@ *.o
+       $(CC) $(FLAGS) -c $^
+       $(AR) $(ARFLAGS) $@ *.o
 
 $(LIBZSTD): LDFLAGS += -shared -fPIC -fvisibility=hidden
 $(LIBZSTD): $(ZSTD_FILES)
        @echo compiling dynamic library $(LIBVER)
 ifneq (,$(filter Windows%,$(OS)))
-       @$(CC) $(FLAGS) -DZSTD_DLL_EXPORT=1 -shared $^ -o dll\libzstd.dll
+       $(CC) $(FLAGS) -DZSTD_DLL_EXPORT=1 -shared $^ -o dll\libzstd.dll
        dlltool -D dll\libzstd.dll -d dll\libzstd.def -l dll\libzstd.lib
 else
-       @$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
+       $(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
        @echo creating versioned links
        @ln -sf $@ libzstd.$(SHARED_EXT_MAJOR)
        @ln -sf $@ libzstd.$(SHARED_EXT)

diff --git a/programs/Makefile b/programs/Makefile
index 2b89ddb577c16b139ebc5208950ecf1a241663c7..3bc5d8201b7f4850336269b7d87863c3dcf5878c 100644 (file)
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -27,9 +27,8 @@ else
 ALIGN_LOOP =
 endif
 
-CPPFLAGS+= -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(ZSTDDIR)/dictBuilder
-CFLAGS  ?= -O3
-CFLAGS  += -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow -Wstrict-aliasing=1 \
+CPPFLAGS += -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(ZSTDDIR)/dictBuilder
+CFLAGS  += -O3 -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow -Wstrict-aliasing=1 \
           -Wswitch-enum -Wdeclaration-after-statement -Wstrict-prototypes -Wundef \
           -Wpointer-arith
 CFLAGS  += $(MOREFLAGS)

diff --git a/tests/Makefile b/tests/Makefile
index e0f82adfe054c09daece69078bf43f5eeb3f2648..7051e715ffbb1df0cbe2771499d9c71d1138aafb 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -28,9 +28,8 @@ PYTHON ?= python3
 TESTARTEFACT := versionsTest namespaceTest
 
 
-CPPFLAGS= -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(ZSTDDIR)/dictBuilder -I$(PRGDIR)
-CFLAGS ?= -O3
-CFLAGS += -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow -Wstrict-aliasing=1 \
+CPPFLAGS += -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(ZSTDDIR)/dictBuilder -I$(PRGDIR)
+CFLAGS += -O3 -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow -Wstrict-aliasing=1 \
           -Wswitch-enum -Wdeclaration-after-statement -Wstrict-prototypes -Wundef
 CFLAGS += $(MOREFLAGS)
 FLAGS   = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)