Mon Dec 18 15:06:27 2017 UTC ()
blt: Use GCC for linking on SunOS, fixes SSP.


(jperkin)
diff -r1.14 -r1.15 pkgsrc/x11/blt/distinfo
diff -r1.6 -r1.7 pkgsrc/x11/blt/patches/patch-ae
cvs diff -r1.14 -r1.15 pkgsrc/x11/blt/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/blt/distinfo 2015/11/04 03:28:26 1.14
+++ pkgsrc/x11/blt/distinfo 2017/12/18 15:06:26 1.15
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: distinfo,v 1.14 2015/11/04 03:28:26 agc Exp $ 1$NetBSD: distinfo,v 1.15 2017/12/18 15:06:26 jperkin Exp $
2 2
3SHA1 (BLT2.4z.tar.gz) = 29f719aa762f1762dbf4a3b0e60dc5356118ba2f 3SHA1 (BLT2.4z.tar.gz) = 29f719aa762f1762dbf4a3b0e60dc5356118ba2f
4RMD160 (BLT2.4z.tar.gz) = d54d9fdb6c61391c191afab4701716d18a3d928b 4RMD160 (BLT2.4z.tar.gz) = d54d9fdb6c61391c191afab4701716d18a3d928b
5SHA512 (BLT2.4z.tar.gz) = 6e59cc03c92b452ec3114675124c2095ed4206e7b9750452764f2b21b8c82dfc376a376f0fbc721c5d0e4b56734866cdc653f3d9888a5b36b0a7500da5f8942a 5SHA512 (BLT2.4z.tar.gz) = 6e59cc03c92b452ec3114675124c2095ed4206e7b9750452764f2b21b8c82dfc376a376f0fbc721c5d0e4b56734866cdc653f3d9888a5b36b0a7500da5f8942a
6Size (BLT2.4z.tar.gz) = 2200973 bytes 6Size (BLT2.4z.tar.gz) = 2200973 bytes
7SHA1 (blt2.4z-patch-2) = abc287e23e4c08d3a771332499aee03ad3a56266 7SHA1 (blt2.4z-patch-2) = abc287e23e4c08d3a771332499aee03ad3a56266
8RMD160 (blt2.4z-patch-2) = a9120e301e0a906b414e978cf3d5a3062d668cf0 8RMD160 (blt2.4z-patch-2) = a9120e301e0a906b414e978cf3d5a3062d668cf0
9SHA512 (blt2.4z-patch-2) = 2fc4e6833be7a6820c4c545d683a5949eccb34582044178be9115f37af4f281101854949e16c1671030f6957bb7a5a7d48a50b5b013b80ac522dfa7034804813 9SHA512 (blt2.4z-patch-2) = 2fc4e6833be7a6820c4c545d683a5949eccb34582044178be9115f37af4f281101854949e16c1671030f6957bb7a5a7d48a50b5b013b80ac522dfa7034804813
10Size (blt2.4z-patch-2) = 28594 bytes 10Size (blt2.4z-patch-2) = 28594 bytes
11SHA1 (patch-aa) = 6a28cc2405adcc6037865f174bb48d81909c83d6 11SHA1 (patch-aa) = 6a28cc2405adcc6037865f174bb48d81909c83d6
12SHA1 (patch-ab) = da9479d5de1053c45753eef611eae2764909f0ec 12SHA1 (patch-ab) = da9479d5de1053c45753eef611eae2764909f0ec
13SHA1 (patch-ac) = 696f90010831522f46d67052abc0c6068197cfd9 13SHA1 (patch-ac) = 696f90010831522f46d67052abc0c6068197cfd9
14SHA1 (patch-ad) = cc2579223a5a8a764d797fa16a146999cd4a796d 14SHA1 (patch-ad) = cc2579223a5a8a764d797fa16a146999cd4a796d
15SHA1 (patch-ae) = f2689eb585f19d05e9dfe6164f96d6fc9dbc77ad 15SHA1 (patch-ae) = 12da4ffe7ccb272650e58301aaf72bbc43404762
16SHA1 (patch-af) = b82641d4aad426fbe9a6781fa828d8aa81f71253 16SHA1 (patch-af) = b82641d4aad426fbe9a6781fa828d8aa81f71253
17SHA1 (patch-src_bltNsUtil.h) = 949647e6ca4a4890a51917c268289384da98b7ca 17SHA1 (patch-src_bltNsUtil.h) = 949647e6ca4a4890a51917c268289384da98b7ca
18SHA1 (patch-src_tkButton.c) = 39132933914ee8d52389f5be72cbc02b21e7216e 18SHA1 (patch-src_tkButton.c) = 39132933914ee8d52389f5be72cbc02b21e7216e
cvs diff -r1.6 -r1.7 pkgsrc/x11/blt/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/x11/blt/patches/patch-ae 2005/10/07 17:39:26 1.6
+++ pkgsrc/x11/blt/patches/patch-ae 2017/12/18 15:06:26 1.7
@@ -1,37 +1,49 @@ @@ -1,37 +1,49 @@
1$NetBSD: patch-ae,v 1.6 2005/10/07 17:39:26 perry Exp $ 1$NetBSD: patch-ae,v 1.7 2017/12/18 15:06:26 jperkin Exp $
2 2
3--- configure.orig 2002-10-04 01:33:59.000000000 -0400 3--- configure.orig 2002-10-04 05:33:59.000000000 +0000
4+++ configure 2005-10-07 13:33:26.000000000 -0400 4+++ configure
5@@ -3384,8 +3384,8 @@ 5@@ -3384,8 +3384,8 @@ case $target in
6 TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}" 6 TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
7 ;; 7 ;;
8 *) 8 *)
9- TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}" 9- TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}"
10- TK_LIB_NAME="tk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}" 10- TK_LIB_NAME="tk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}"
11+ TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}" 11+ TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
12+ TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}" 12+ TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
13 ;; 13 ;;
14 esac 14 esac
15  15
16@@ -4072,7 +4072,8 @@ 16@@ -4072,7 +4072,8 @@ fi
17 EXTRA_LIB_SPECS="-ldl" 17 EXTRA_LIB_SPECS="-ldl"
18 ;; 18 ;;
19  19
20- *-netbsd*|*-freebsd*|*-openbsd*) 20- *-netbsd*|*-freebsd*|*-openbsd*)
21+ *-netbsd*|*-freebsd*|*-openbsd*|*-dragonfly*) 21+ *-netbsd*|*-freebsd*|*-openbsd*|*-dragonfly*)
22+ EXTRA_LIB_SPECS="$PTHREAD_LDFLAGS" 22+ EXTRA_LIB_SPECS="$PTHREAD_LDFLAGS"
23 # Not available on all versions: check for include file. 23 # Not available on all versions: check for include file.
24 ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` 24 ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
25 echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 25 echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
26@@ -4109,9 +4110,10 @@ 26@@ -4109,9 +4110,10 @@ test_ok=no
27 fi 27 fi
28  28
29 if test "$test_ok" = yes; then 29 if test "$test_ok" = yes; then
30+ LDFLAGS="-L${prefix}/lib -L${X11BASE}/lib -Wl,-R${prefix}/lib -Wl,-R${X11BASE}/lib" 30+ LDFLAGS="-L${prefix}/lib -L${X11BASE}/lib -Wl,-R${prefix}/lib -Wl,-R${X11BASE}/lib"
31 SHLIB_CFLAGS="-fpic" 31 SHLIB_CFLAGS="-fpic"
32 SHLIB_LD="ld" 32 SHLIB_LD="ld"
33- SHLIB_LD_FLAGS="-Bshareable -x" 33- SHLIB_LD_FLAGS="-Bshareable -x"
34+ SHLIB_LD_FLAGS="-Bshareable -x -R${prefix}/lib -R${X11BASE}/lib" 34+ SHLIB_LD_FLAGS="-Bshareable -x -R${prefix}/lib -R${X11BASE}/lib"
35 fi 35 fi
36 ;; 36 ;;
37  37
 38@@ -4181,9 +4183,9 @@ fi
 39 *-solaris2*)
 40
 41 SHLIB_CFLAGS="-KPIC"
 42- if test "${blt_with_gnu_ld}" = "yes" -a "$blt_have_gcc" = "yes" ; then
 43+ if test "$blt_have_gcc" = "yes" ; then
 44 SHLIB_LD="gcc"
 45- SHLIB_LD_FLAGS='-rdynamic -shared -Wl,-E -Wl,-soname,$@'
 46+ SHLIB_LD_FLAGS='-shared -Wl,-soname,$@'
 47 LD_RUN_PATH="-Wl,-rpath,${loader_run_path}"
 48 else
 49 SHLIB_LD="/usr/ccs/bin/ld"