diff options
| author | hans <hans@pkgsrc.org> | 2011-12-02 14:14:58 +0000 |
|---|---|---|
| committer | hans <hans@pkgsrc.org> | 2011-12-02 14:14:58 +0000 |
| commit | f24775d7a7b1959c0f99aad3bcc72ccc2723e119 (patch) | |
| tree | 60dfabc15da2d6cc5817d40cb9a1698d4d8c3a34 /print/cups | |
| parent | 8bf41f9df473f601b3cc83c27762c918de999235 (diff) | |
| download | pkgsrc-f24775d7a7b1959c0f99aad3bcc72ccc2723e119.tar.gz | |
Limit ssp fix to SunOS.
Diffstat (limited to 'print/cups')
| -rw-r--r-- | print/cups/Makefile | 6 | ||||
| -rw-r--r-- | print/cups/distinfo | 4 | ||||
| -rw-r--r-- | print/cups/patches/patch-ah | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/print/cups/Makefile b/print/cups/Makefile index f98d144eaa0..e7f6c751844 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.185 2011/11/14 01:23:26 sbd Exp $ +# $NetBSD: Makefile,v 1.186 2011/12/02 14:14:58 hans Exp $ # # The CUPS author is very good about taking back changes into the main # CUPS distribution. The correct place to send patches or bug-fixes is: @@ -69,6 +69,10 @@ CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q} .include "../../mk/bsd.prefs.mk" .include "options.mk" +.if ${OPSYS} == "SunOS" +CONFIGURE_ENV+= LIBS_SSP=-lssp_nonshared +.endif + PLIST_VARS+= notmac .if ${OPSYS} != "Darwin" PLIST.notmac= yes diff --git a/print/cups/distinfo b/print/cups/distinfo index 3130f335014..cb27213f90b 100644 --- a/print/cups/distinfo +++ b/print/cups/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.88 2011/11/29 15:46:24 hans Exp $ +$NetBSD: distinfo,v 1.89 2011/12/02 14:14:58 hans Exp $ SHA1 (cups-1.5.0-source.tar.bz2) = 628f549867751e373fc20c7558fec422f9eb942b RMD160 (cups-1.5.0-source.tar.bz2) = e7be9b6b44428561609c59abaea8fa31a11aefff @@ -8,7 +8,7 @@ SHA1 (patch-ad) = a8d6610c4057ae98d98435ba577606e3c2bfb4b9 SHA1 (patch-ae) = 7806067b36fa1c98763cf51a14941665f590b816 SHA1 (patch-af) = 025f198dd491a55ffc460d03d3ad23a100fe5271 SHA1 (patch-ag) = 680c1c7fb44d8153b5825252d2e297a5196ca98e -SHA1 (patch-ah) = 23b049987e27d1ff096b6e18cbf9e70d002356d4 +SHA1 (patch-ah) = 27d9b92a2f1ae116162b4f24d9aab3a955d52052 SHA1 (patch-ai) = 13725f3b4e0016acf5ead79cadb9626d1f2ce58e SHA1 (patch-an) = 231c871e31db279e8aeafba71506f93330e0a971 SHA1 (patch-ao) = 7fe50080b9a6fd4dac186020f9351ef6000373c7 diff --git a/print/cups/patches/patch-ah b/print/cups/patches/patch-ah index eae6e99aa30..b11185737e0 100644 --- a/print/cups/patches/patch-ah +++ b/print/cups/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD: patch-ah,v 1.19 2011/11/29 15:46:25 hans Exp $ +$NetBSD: patch-ah,v 1.20 2011/12/02 14:14:58 hans Exp $ Some builds of gcc seem to support this for compiling but then fail during linking with undefined reference to `__stack_chk_fail_local' @@ -12,7 +12,7 @@ linking with undefined reference to `__stack_chk_fail_local' - AC_TRY_LINK(,, + AC_TRY_LINK(, [return 0;], OPTIM="$OPTIM -fstack-protector" -+ LIBS="$LIBS -lssp_nonshared" ++ LIBS="$LIBS $LIBS_SSP" AC_MSG_RESULT(yes), AC_MSG_RESULT(no)) CFLAGS="$OLDCFLAGS" |