CVS commit: pkgsrc/print/cups-base

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Jan 26 17:22:51 UTC 2018

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

Log Message:
cups-base: Let pkgsrc handle SSP, remove GCC hacks.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/cups-base/Makefile \
    pkgsrc/print/cups-base/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/print/cups-base/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-base/Makefile
diff -u pkgsrc/print/cups-base/Makefile:1.3 pkgsrc/print/cups-base/Makefile:1.4
--- pkgsrc/print/cups-base/Makefile:1.3 Sat Dec  2 20:02:35 2017
+++ pkgsrc/print/cups-base/Makefile     Fri Jan 26 17:22:51 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/12/02 20:02:35 leot Exp $
+# $NetBSD: Makefile,v 1.4 2018/01/26 17:22:51 jperkin Exp $
 
 .include "../../print/cups/Makefile.common"
 
@@ -53,12 +53,9 @@ CONFIGURE_ENV+=              DSOFLAGS=${LDFLAGS:M*:Q
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
-.if ${OPSYS} == "SunOS"
-LIBS_SSP=              -lssp_nonshared -lssp
-CONFIGURE_ENV+=                LIBS_SSP=${LIBS_SSP:M*:Q}
 # Explicitly disable epoll on illumos, it is provided for Linux compat only.
-CONFIGURE_ENV+=                ac_cv_func_epoll_create=no
-.endif
+CONFIGURE_ENV.SunOS+=  ac_cv_func_epoll_create=no
+
 LIBS+=                 ${BUILDLINK_LDADD.iconv}
 
 # Avoid the following error when compiling with clang.
Index: pkgsrc/print/cups-base/distinfo
diff -u pkgsrc/print/cups-base/distinfo:1.3 pkgsrc/print/cups-base/distinfo:1.4
--- pkgsrc/print/cups-base/distinfo:1.3 Tue Dec 19 08:23:53 2017
+++ pkgsrc/print/cups-base/distinfo     Fri Jan 26 17:22:51 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2017/12/19 08:23:53 adam Exp $
+$NetBSD: distinfo,v 1.4 2018/01/26 17:22:51 jperkin Exp $
 
 SHA1 (cups-2.2.6-source.tar.gz) = b5e3389fb9450bfed377c95c0230c029c053acc4
 RMD160 (cups-2.2.6-source.tar.gz) = 7f4689e9102916d4190ffbb958e58d447c0fa146
@@ -10,7 +10,7 @@ SHA1 (patch-ai) = 2c1ca67ea6f6c1dedb4c8f
 SHA1 (patch-at) = ef6303936daf0826dc4725f5369bfb1add832b1f
 SHA1 (patch-conf-cups-files.conf.in) = 327cc8b62e606389542870aa6619ade10377b044
 SHA1 (patch-conf_Makefile) = bb8313e493c02959edfe1e53f50b9f16ce6f42e0
-SHA1 (patch-config-scripts_cups-compiler.m4) = 6a717af7983f15606fbc703bb4e853b5084ec919
+SHA1 (patch-config-scripts_cups-compiler.m4) = 26f2ed2ef45d922f47e5e0ac87ccc278f35de7f3
 SHA1 (patch-config-scripts_cups-directories.m4) = 8a6c2f962dafdde20f913fac2e172ae9f8760c3e
 SHA1 (patch-config-scripts_cups-gssapi.m4) = ac2df3e82bc844630af8462a461c7efe1da4b354
 SHA1 (patch-config-scripts_cups-libtool.m4) = a6139fbbbee7038d11654c0a2387af21f48b7412

Index: pkgsrc/print/cups-base/patches/patch-config-scripts_cups-compiler.m4
diff -u pkgsrc/print/cups-base/patches/patch-config-scripts_cups-compiler.m4:1.1 pkgsrc/print/cups-base/patches/patch-config-scripts_cups-compiler.m4:1.2
--- pkgsrc/print/cups-base/patches/patch-config-scripts_cups-compiler.m4:1.1    Sun Nov 12 14:10:15 2017
+++ pkgsrc/print/cups-base/patches/patch-config-scripts_cups-compiler.m4        Fri Jan 26 17:22:51 2018
@@ -1,11 +1,9 @@
-$NetBSD: patch-config-scripts_cups-compiler.m4,v 1.1 2017/11/12 14:10:15 khorben Exp $
-
-Some builds of gcc seem to support this for compiling but then fail during
-linking with undefined reference to `__stack_chk_fail_local'
+$NetBSD: patch-config-scripts_cups-compiler.m4,v 1.2 2018/01/26 17:22:51 jperkin Exp $
 
+Disable SSP checks, leave pkgsrc to enable/disable it.
 PIE needs to be tested with linking.
 
---- config-scripts/cups-compiler.m4.orig       2017-06-30 15:44:38.000000000 +0000
+--- config-scripts/cups-compiler.m4.orig       2017-11-01 14:57:53.000000000 +0000
 +++ config-scripts/cups-compiler.m4
 @@ -115,12 +115,13 @@ if test -n "$GCC"; then
        AC_MSG_CHECKING(whether compiler supports -fstack-protector)
@@ -15,10 +13,12 @@ PIE needs to be tested with linking.
 +      AC_TRY_LINK(, [return 0;],
                if test "x$LSB_BUILD" = xy; then
                        # Can't use stack-protector with LSB binaries...
-                       OPTIM="$OPTIM -fno-stack-protector"
+-                      OPTIM="$OPTIM -fno-stack-protector"
++                      : OPTIM="$OPTIM -fno-stack-protector"
                else
-                       OPTIM="$OPTIM -fstack-protector"
-+                      LIBS="$LIBS $LIBS_SSP"
+-                      OPTIM="$OPTIM -fstack-protector"
++                      : OPTIM="$OPTIM -fstack-protector"
++                      : LIBS="$LIBS $LIBS_SSP"
                fi
                AC_MSG_RESULT(yes),
                AC_MSG_RESULT(no))