summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2017-03-21 20:00:33 -0500
committerGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2017-03-21 20:00:33 -0500
commit3e878e3f8dac475c2e4ef8b929565e86f37c1803 (patch)
tree76d7339f6a7df8dc452b8c6aed96a967f28f74b5
parent0b21dc3efe0c97c9afc6c9e984f0682ccafe4e2e (diff)
downloadlibpng-3e878e3f8dac475c2e4ef8b929565e86f37c1803.tar.gz
[libpng15] Added missing "$(CPPFLAGS)" to the compile line for c.pic.o in
makefile.linux and makefile.solaris-x86 (Cosmin).
-rw-r--r--ANNOUNCE6
-rw-r--r--CHANGES4
-rw-r--r--scripts/makefile.linux2
-rw-r--r--scripts/makefile.solaris-x862
4 files changed, 9 insertions, 5 deletions
diff --git a/ANNOUNCE b/ANNOUNCE
index 5da64c9d3..9b14d8cf9 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
-Libpng 1.5.29beta01 - March 1, 2017
+Libpng 1.5.29beta01 - March 22, 2017
This is not intended to be a public release. It will be replaced
within a few weeks by a public version or by another test version.
@@ -26,9 +26,11 @@ Other information:
Changes since the last public release (1.5.28):
-version 1.5.29beta01 [March 1, 2017]
+version 1.5.29beta01 [March 22, 2017]
Suppress clang warnings about implicit sign changes in png.c
Avoid potential overflow of shift operations in png_do_expand() (Aaron Boxer).
+ Added missing "$(CPPFLAGS)" to the compile line for c.pic.o in
+ makefile.linux and makefile.solaris-x86 (Cosmin).
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
diff --git a/CHANGES b/CHANGES
index 81174c700..e4001d9e7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4531,9 +4531,11 @@ version 1.5.28 [December 29, 2016]
Fixed a potential null pointer dereference in png_set_text_2() (bug report
and patch by Patrick Keshishian, CVE-2016-10087).
-version 1.5.29beta01 [March 1, 2017]
+version 1.5.29beta01 [March 22, 2017]
Suppress clang warnings about implicit sign changes in png.c
Avoid potential overflow of shift operations in png_do_expand() (Aaron Boxer).
+ Added missing "$(CPPFLAGS)" to the compile line for c.pic.o in
+ makefile.linux and makefile.solaris-x86 (Cosmin).
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index 3df26d9e6..615f4e194 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -92,7 +92,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
.c.pic.o:
- $(CC) -c $(CFLAGS) -fPIC -o $@ $*.c
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) -fPIC -o $@ $*.c
all: libpng.a $(LIBSO) pngtest pngtest-static libpng.pc libpng-config
diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86
index b5742320c..1bb10e606 100644
--- a/scripts/makefile.solaris-x86
+++ b/scripts/makefile.solaris-x86
@@ -83,7 +83,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
.c.pic.o:
- $(CC) -c $(CFLAGS) -fPIC -o $@ $*.c
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) -fPIC -o $@ $*.c
all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config