Wed Mar 3 14:22:23 2010 UTC ()
Make the configure check for -fstack-protector be a little more robust.
This fixes the build on NetBSD-5 with gcc-4.4.1.


(dmcmahill)
diff -r1.65 -r1.66 pkgsrc/print/cups/distinfo
diff -r0 -r1.16 pkgsrc/print/cups/patches/patch-ah
cvs diff -r1.65 -r1.66 pkgsrc/print/cups/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/print/cups/Attic/distinfo 2009/11/16 17:12:54 1.65
+++ pkgsrc/print/cups/Attic/distinfo 2010/03/03 14:22:23 1.66
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1$NetBSD: distinfo,v 1.65 2009/11/16 17:12:54 plunky Exp $ 1$NetBSD: distinfo,v 1.66 2010/03/03 14:22:23 dmcmahill Exp $
2 2
3SHA1 (cups-1.3.11/cups-1.3.11-source.tar.bz2) = df5cfb64fb608fc128acadde670dc30af49bdb18 3SHA1 (cups-1.3.11/cups-1.3.11-source.tar.bz2) = df5cfb64fb608fc128acadde670dc30af49bdb18
4RMD160 (cups-1.3.11/cups-1.3.11-source.tar.bz2) = a0646f2ba29fbd39d211ea5c3fdbd24a00f66a78 4RMD160 (cups-1.3.11/cups-1.3.11-source.tar.bz2) = a0646f2ba29fbd39d211ea5c3fdbd24a00f66a78
5Size (cups-1.3.11/cups-1.3.11-source.tar.bz2) = 3799393 bytes 5Size (cups-1.3.11/cups-1.3.11-source.tar.bz2) = 3799393 bytes
6SHA1 (patch-aa) = 51ff6e66f881e445adca768d4cf2f6bd18fc36dd 6SHA1 (patch-aa) = 51ff6e66f881e445adca768d4cf2f6bd18fc36dd
7SHA1 (patch-ab) = 0b8c6662b836775c693da7ebc613ca7a5594840a 7SHA1 (patch-ab) = 0b8c6662b836775c693da7ebc613ca7a5594840a
8SHA1 (patch-ac) = 02fab706563f7ba01d66530f9462759689c09f04 8SHA1 (patch-ac) = 02fab706563f7ba01d66530f9462759689c09f04
9SHA1 (patch-ad) = 6695c344453495cd960460733a80d50654786c60 9SHA1 (patch-ad) = 6695c344453495cd960460733a80d50654786c60
10SHA1 (patch-ae) = 4b2c1e8821856ba69d6af72a5b96a7b88c346656 10SHA1 (patch-ae) = 4b2c1e8821856ba69d6af72a5b96a7b88c346656
11SHA1 (patch-af) = 5445e6b5ced9dee71f48208369728e9d298dd0bb 11SHA1 (patch-af) = 5445e6b5ced9dee71f48208369728e9d298dd0bb
12SHA1 (patch-ag) = ac35b637aeea8b2e5798c6a779f2ad6ae9e41dca 12SHA1 (patch-ag) = ac35b637aeea8b2e5798c6a779f2ad6ae9e41dca
 13SHA1 (patch-ah) = 9478622e6040cbf166fd5b68279beaee3a2d4164
13SHA1 (patch-an) = 9c11292459b0839ae15920d7cc65469247f30800 14SHA1 (patch-an) = 9c11292459b0839ae15920d7cc65469247f30800
14SHA1 (patch-ao) = c9f93c7d69d934677a605197959a162dfb1658eb 15SHA1 (patch-ao) = c9f93c7d69d934677a605197959a162dfb1658eb
15SHA1 (patch-at) = eea32b989402c353f5f1644348c1042a3d4ddfa1 16SHA1 (patch-at) = eea32b989402c353f5f1644348c1042a3d4ddfa1
File Added: pkgsrc/print/cups/patches/Attic/patch-ah
$NetBSD: patch-ah,v 1.16 2010/03/03 14:22:23 dmcmahill Exp $

Some builds of gcc seem to support this for compiling but then fail during
linking with undefined reference to `__stack_chk_fail_local'

--- config-scripts/cups-compiler.m4.orig	2008-06-16 17:41:11.000000000 +0000
+++ config-scripts/cups-compiler.m4
@@ -109,7 +109,7 @@ if test -n "$GCC"; then
 	AC_MSG_CHECKING(if GCC supports -fstack-protector)
 	OLDCFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS -fstack-protector"
-	AC_TRY_COMPILE(,,
+	AC_TRY_LINK(, [return 0;],
 		OPTIM="$OPTIM -fstack-protector"
 		AC_MSG_RESULT(yes),
 		AC_MSG_RESULT(no))