From a9b02399ac4acbe593424d96e0905b01b427446b Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Tue, 21 Mar 2017 20:12:09 -0500 Subject: [PATCH] [libpng17] Added missing "$(CPPFLAGS)" to the compile line for c.pic.o in makefile.linux and makefile.solaris-x86 (Cosmin). --- ANNOUNCE | 8 ++++++-- CHANGES | 6 +++++- scripts/makefile.linux | 2 +- scripts/makefile.solaris-x86 | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index f8c62d3d5..829446b14 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.7.0beta87 - December 31, 2016 +Libpng 1.7.0beta87 - 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. @@ -1423,8 +1423,12 @@ Version 1.7.0beta86 [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.7.0beta87 [December 31, 2016] +Version 1.7.0beta87 [March 22, 2017] Fixed arm/aarch64 detection in CMakeLists.txt (Gianfranco Costamagna). + The contrib/examples/pngtopng.c recovery code was in the wrong "if" + branches; the comments were correct. + 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 b8551507b..a41efb70f 100644 --- a/CHANGES +++ b/CHANGES @@ -5723,8 +5723,12 @@ Version 1.7.0beta86 [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.7.0beta87 [December 31, 2016] +Version 1.7.0beta87 [March 22, 2017] Fixed arm/aarch64 detection in CMakeLists.txt (Gianfranco Costamagna). + The contrib/examples/pngtopng.c recovery code was in the wrong "if" + branches; the comments were correct. + 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 6debfabf6..1301d140c 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 baf134c30..58065034e 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