diff options
| author | dmcmahill <dmcmahill> | 2010-03-03 14:22:23 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill> | 2010-03-03 14:22:23 +0000 |
| commit | 5e0d4dd27f8a7222f7354361432e9de56c5d1dc2 (patch) | |
| tree | a3bb06dd4c0828144186c8443ef59a48c5dd909c /print/cups | |
| parent | 0f3a225151d4ef2cc55c0b36e7cc80bbd20617c8 (diff) | |
| download | pkgsrc-5e0d4dd27f8a7222f7354361432e9de56c5d1dc2.tar.gz | |
Make the configure check for -fstack-protector be a little more robust.
This fixes the build on NetBSD-5 with gcc-4.4.1.
Diffstat (limited to 'print/cups')
| -rw-r--r-- | print/cups/distinfo | 3 | ||||
| -rw-r--r-- | print/cups/patches/patch-ah | 16 |
2 files changed, 18 insertions, 1 deletions
diff --git a/print/cups/distinfo b/print/cups/distinfo index aa8e42dbf87..0666027bf37 100644 --- a/print/cups/distinfo +++ b/print/cups/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.65 2009/11/16 17:12:54 plunky Exp $ +$NetBSD: distinfo,v 1.66 2010/03/03 14:22:23 dmcmahill Exp $ SHA1 (cups-1.3.11/cups-1.3.11-source.tar.bz2) = df5cfb64fb608fc128acadde670dc30af49bdb18 RMD160 (cups-1.3.11/cups-1.3.11-source.tar.bz2) = a0646f2ba29fbd39d211ea5c3fdbd24a00f66a78 @@ -10,6 +10,7 @@ SHA1 (patch-ad) = 6695c344453495cd960460733a80d50654786c60 SHA1 (patch-ae) = 4b2c1e8821856ba69d6af72a5b96a7b88c346656 SHA1 (patch-af) = 5445e6b5ced9dee71f48208369728e9d298dd0bb SHA1 (patch-ag) = ac35b637aeea8b2e5798c6a779f2ad6ae9e41dca +SHA1 (patch-ah) = 9478622e6040cbf166fd5b68279beaee3a2d4164 SHA1 (patch-an) = 9c11292459b0839ae15920d7cc65469247f30800 SHA1 (patch-ao) = c9f93c7d69d934677a605197959a162dfb1658eb SHA1 (patch-at) = eea32b989402c353f5f1644348c1042a3d4ddfa1 diff --git a/print/cups/patches/patch-ah b/print/cups/patches/patch-ah new file mode 100644 index 00000000000..c7cb2b79473 --- /dev/null +++ b/print/cups/patches/patch-ah @@ -0,0 +1,16 @@ +$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)) |