diff options
| author | hans <hans@pkgsrc.org> | 2011-11-29 15:46:24 +0000 |
|---|---|---|
| committer | hans <hans@pkgsrc.org> | 2011-11-29 15:46:24 +0000 |
| commit | f682d7d2769fd8c4c40f14d2c40cdb11180bee73 (patch) | |
| tree | 43a9b6cd9cb48845df1144a15df0e37a9c6c48a1 /print/cups | |
| parent | 17bc30c04029f8433e5aaa6bb3930a804d4f29ff (diff) | |
| download | pkgsrc-f682d7d2769fd8c4c40f14d2c40cdb11180bee73.tar.gz | |
Fix build with -fstack-protector.
Diffstat (limited to 'print/cups')
| -rw-r--r-- | print/cups/distinfo | 5 | ||||
| -rw-r--r-- | print/cups/patches/patch-ah | 6 | ||||
| -rw-r--r-- | print/cups/patches/patch-ppdc_Makefile | 13 |
3 files changed, 20 insertions, 4 deletions
diff --git a/print/cups/distinfo b/print/cups/distinfo index 1b107581d64..3130f335014 100644 --- a/print/cups/distinfo +++ b/print/cups/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.87 2011/11/14 01:23:26 sbd Exp $ +$NetBSD: distinfo,v 1.88 2011/11/29 15:46:24 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) = c4dae009ac5d2dec52fec609bfa38f282fb8e75c +SHA1 (patch-ah) = 23b049987e27d1ff096b6e18cbf9e70d002356d4 SHA1 (patch-ai) = 13725f3b4e0016acf5ead79cadb9626d1f2ce58e SHA1 (patch-an) = 231c871e31db279e8aeafba71506f93330e0a971 SHA1 (patch-ao) = 7fe50080b9a6fd4dac186020f9351ef6000373c7 @@ -17,4 +17,5 @@ SHA1 (patch-au) = 6d9b086f2e043bc87d07e3657e46e8cf2fbfeb59 SHA1 (patch-conf_Makefile) = 9bb4106e9fecaed2ba9bb67b7989f2ac9a9494fc SHA1 (patch-config-scripts_cups-gssapi.m4) = a3505afd30f0864e3022d8f65c810b9614d82cf4 SHA1 (patch-filter_image-gif.c) = 2269cbf7e42ec80ba91c27eda4871884775f4b7a +SHA1 (patch-ppdc_Makefile) = 7dcc34217557a4c6f42064b61abf593bd7620b60 SHA1 (patch-scheduler_dirsvc.c) = 62c6b47522a60b9f8042421e4a9d25a5dfa47c47 diff --git a/print/cups/patches/patch-ah b/print/cups/patches/patch-ah index 7450672c59d..eae6e99aa30 100644 --- a/print/cups/patches/patch-ah +++ b/print/cups/patches/patch-ah @@ -1,16 +1,18 @@ -$NetBSD: patch-ah,v 1.18 2011/10/04 14:11:15 hans Exp $ +$NetBSD: patch-ah,v 1.19 2011/11/29 15:46:25 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' --- config-scripts/cups-compiler.m4.orig 2009-05-17 00:13:47.000000000 +0000 +++ config-scripts/cups-compiler.m4 -@@ -140,7 +140,7 @@ if test -n "$GCC"; then +@@ -140,8 +140,9 @@ if test -n "$GCC"; then AC_MSG_CHECKING(if GCC supports -fstack-protector) OLDCFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fstack-protector" - AC_TRY_LINK(,, + AC_TRY_LINK(, [return 0;], OPTIM="$OPTIM -fstack-protector" ++ LIBS="$LIBS -lssp_nonshared" AC_MSG_RESULT(yes), AC_MSG_RESULT(no)) + CFLAGS="$OLDCFLAGS" diff --git a/print/cups/patches/patch-ppdc_Makefile b/print/cups/patches/patch-ppdc_Makefile new file mode 100644 index 00000000000..e09d599c19e --- /dev/null +++ b/print/cups/patches/patch-ppdc_Makefile @@ -0,0 +1,13 @@ +$NetBSD: patch-ppdc_Makefile,v 1.1 2011/11/29 15:46:25 hans Exp $ + +--- ppdc/Makefile.orig 2011-01-06 23:21:05.000000000 +0100 ++++ ppdc/Makefile 2011-11-13 15:51:42.867152712 +0100 +@@ -378,7 +378,7 @@ libcupsppdc_s.a: $(LIBOBJS) ../cups/$(LI + libcupsppdc.la: $(LIBOBJS) ../cups/$(LIBCUPS) + echo Linking $@... + $(CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \ +- -version-info 1:0 $(LINKCUPS) ++ -version-info 1:0 $(COMMONLIBS) + + + # |