From 49607cf603f332e0fa429fb30cbab6d5bb67c52c Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Thu, 26 Apr 2012 09:08:22 -0500 Subject: [PATCH] [libpng15] Moved -lssp_nonshared to a comment in scripts/makefile.freebsd --- ANNOUNCE | 2 +- CHANGES | 2 +- scripts/makefile.freebsd | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index b48345c9e..bfae1c36e 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -34,7 +34,7 @@ Version 1.5.11 [April 26, 2012] Enable png_set_check_for_invalid_index() for both read and write. Removed #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED in pngpriv.h around declaration of png_handle_unknown(). - Added -lssp_nonshared to scripts/makefile.freebsd + Added -lssp_nonshared in a comment in scripts/makefile.freebsd Send comments/corrections/commendations to png-mng-implement at lists.sf.net: (subscription required; visit diff --git a/CHANGES b/CHANGES index 3ca199f45..1a3c171d9 100644 --- a/CHANGES +++ b/CHANGES @@ -3862,7 +3862,7 @@ Version 1.5.11 [April 26, 2012] Enable png_set_check_for_invalid_index() for both read and write. Removed #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED in pngpriv.h around declaration of png_handle_unknown(). - Added -lssp_nonshared to scripts/makefile.freebsd + Added -lssp_nonshared in a comment in scripts/makefile.freebsd Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/scripts/makefile.freebsd b/scripts/makefile.freebsd index 612e0247d..c440dc59c 100644 --- a/scripts/makefile.freebsd +++ b/scripts/makefile.freebsd @@ -26,8 +26,8 @@ SYMLINKS= libpng/png.h ${INCSDIR}/../png.h \ libpng/pngconf.h ${INCSDIR}/../pngconf.h \ libpng/pnglibconf.h ${INCSDIR}/../pnglibconf.h -# LDADD+= -lm -lz # for OSVERSION < 800000 -LDADD+= -lm -lz -lssp_nonshared +LDADD+= -lm -lz +#LDADD+= -lm -lz -lssp_nonshared # for OSVERSION >= 800000 ? DPADD+= ${LIBM} ${LIBZ}