CVS commit: pkgsrc/print/cups

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu May 25 12:11:55 UTC 2017

Modified Files:
        pkgsrc/print/cups: distinfo
        pkgsrc/print/cups/patches: patch-config-scripts_cups-compiler.m4

Log Message:
Test for PIE by linking rather than just compiling, as on at least SunOS
it is dependent on linker features.


To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 pkgsrc/print/cups/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/print/cups/patches/patch-config-scripts_cups-compiler.m4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/print/cups/distinfo
diff -u pkgsrc/print/cups/distinfo:1.121 pkgsrc/print/cups/distinfo:1.122
--- pkgsrc/print/cups/distinfo:1.121    Sat Apr  8 07:27:09 2017
+++ pkgsrc/print/cups/distinfo  Thu May 25 12:11:55 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.121 2017/04/08 07:27:09 adam Exp $
+$NetBSD: distinfo,v 1.122 2017/05/25 12:11:55 jperkin Exp $
 
 SHA1 (cups-2.2.3-source.tar.gz) = 149e9ded0744b7545630c62b6a347e747928e0f7
 RMD160 (cups-2.2.3-source.tar.gz) = 3eb91fbd20bee081e08af64ddfa23a45f2bfa7b2
@@ -9,7 +9,7 @@ SHA1 (patch-af) = 6ae6ae6006387db69bf7c1
 SHA1 (patch-ai) = 2c1ca67ea6f6c1dedb4c8ff97736f328a2b9a7c6
 SHA1 (patch-at) = ef6303936daf0826dc4725f5369bfb1add832b1f
 SHA1 (patch-conf_Makefile) = bb8313e493c02959edfe1e53f50b9f16ce6f42e0
-SHA1 (patch-config-scripts_cups-compiler.m4) = 5984c94c154ac732d97c0af26fc4099a7889096f
+SHA1 (patch-config-scripts_cups-compiler.m4) = 6b825d05163a91ee3092a68a3b0abc173a378026
 SHA1 (patch-config-scripts_cups-directories.m4) = 1daa2b6237d3675665f273678271b7b522905c8d
 SHA1 (patch-config-scripts_cups-gssapi.m4) = 0f7e4c35473e6117d2fe103750eda820b6fade55
 SHA1 (patch-config-scripts_cups-manpages.m4) = cc920bf46555aab5610e91de4ca1f69916f5b79a

Index: pkgsrc/print/cups/patches/patch-config-scripts_cups-compiler.m4
diff -u pkgsrc/print/cups/patches/patch-config-scripts_cups-compiler.m4:1.2 pkgsrc/print/cups/patches/patch-config-scripts_cups-compiler.m4:1.3
--- pkgsrc/print/cups/patches/patch-config-scripts_cups-compiler.m4:1.2 Wed Dec  2 21:14:16 2015
+++ pkgsrc/print/cups/patches/patch-config-scripts_cups-compiler.m4     Thu May 25 12:11:55 2017
@@ -1,11 +1,13 @@
-$NetBSD: patch-config-scripts_cups-compiler.m4,v 1.2 2015/12/02 21:14:16 leot Exp $
+$NetBSD: patch-config-scripts_cups-compiler.m4,v 1.3 2017/05/25 12:11:55 jperkin 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       2015-06-23 14:48:53.000000000 +0000
+PIE needs to be tested with linking.
+
+--- config-scripts/cups-compiler.m4.orig       2017-03-28 18:26:53.000000000 +0000
 +++ config-scripts/cups-compiler.m4
-@@ -113,12 +113,13 @@ if test -n "$GCC"; then
+@@ -111,12 +111,13 @@ if test -n "$GCC"; then
        AC_MSG_CHECKING(whether compiler supports -fstack-protector)
        OLDCFLAGS="$CFLAGS"
        CFLAGS="$CFLAGS -fstack-protector"
@@ -20,3 +22,21 @@ linking with undefined reference to `__s
                fi
                AC_MSG_RESULT(yes),
                AC_MSG_RESULT(no))
+@@ -133,7 +134,7 @@ if test -n "$GCC"; then
+               case "$uname" in
+                       Darwin*)
+                               CFLAGS="$CFLAGS -fPIE -Wl,-pie"
+-                              AC_TRY_COMPILE(,,[
++                              AC_TRY_LINK(,,[
+                                       PIEFLAGS="-fPIE -Wl,-pie"
+                                       AC_MSG_RESULT(yes)],
+                                       AC_MSG_RESULT(no))
+@@ -141,7 +142,7 @@ if test -n "$GCC"; then
+ 
+                       *)
+                               CFLAGS="$CFLAGS -fPIE -pie"
+-                              AC_TRY_COMPILE(,,[
++                              AC_TRY_LINK(,,[
+                                       PIEFLAGS="-fPIE -pie"
+                                       AC_MSG_RESULT(yes)],
+                                       AC_MSG_RESULT(no))