media-libs/jbigkit: fix CFLAGS/CPPFLAGS setup #518150

diff --git a/media-libs/jbigkit/files/jbigkit-2.1-build.patch b/media-libs/jbigkit/files/jbigkit-2.1-build.patch
index 4d0ebd3813420a26cde816f687ffdcb271d9171f..a7bc7ae761deb78a853ea69d17b61c5dc844ef44 100644 (file)
--- a/media-libs/jbigkit/files/jbigkit-2.1-build.patch
+++ b/media-libs/jbigkit/files/jbigkit-2.1-build.patch
@@ -13,7 +13,7 @@ This patch has been mailed to upstream. No reply at this time. Status unknown.
  
  # Options for the compiler: A high optimization level is suggested
 -CFLAGS = -g -O -W -Wall -ansi -pedantic # --coverage
-+CFLAGS += -W -Wall -ansi -pedantic # --coverage
++override CFLAGS += -W -Wall -ansi -pedantic # --coverage
  
 -all: libjbig.a libjbig85.a tstcodec tstcodec85
 +ifeq ($(shell uname),Darwin)
@@ -81,7 +81,7 @@ This patch has been mailed to upstream. No reply at this time. Status unknown.
  
  # Options for the compiler: A high optimization level is suggested
 -CFLAGS = -O2 -W -Wno-unused-result
-+CFLAGS += -W
++override CFLAGS += -W
  # CFLAGS = -O -g -W -Wall -Wno-unused-result -ansi -pedantic # -DDEBUG
  
  export CC CFLAGS
@@ -106,8 +106,8 @@ This patch has been mailed to upstream. No reply at this time. Status unknown.
  # Options for the compiler
 -CFLAGS = -g -O -W -Wall -Wno-unused-result -ansi -pedantic # --coverage
 -CPPFLAGS = -I../libjbig 
-+CFLAGS += -W -Wall -Wno-unused-result -ansi -pedantic # --coverage
-+CPPFLAGS += -I../libjbig 
++override CFLAGS += -W -Wall -Wno-unused-result -ansi -pedantic # --coverage
++override CPPFLAGS += -I../libjbig
  
  .SUFFIXES: .1 .5 .txt $(SUFFIXES)
  .PHONY: txt test test82 test85 clean