Wed Sep 14 16:35:51 2011 UTC ()
Don't add -z text unconditionally to ld on SunOS. This make
-mimpure-text work again, which is needed for several packages that use
assembly optimizations.


(hans)
diff -r1.82 -r1.83 pkgsrc/devel/libtool/distinfo
diff -r1.70 -r1.71 pkgsrc/devel/libtool/patches/patch-ab
cvs diff -r1.82 -r1.83 pkgsrc/devel/libtool/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/libtool/distinfo 2011/05/14 16:49:45 1.82
+++ pkgsrc/devel/libtool/distinfo 2011/09/14 16:35:51 1.83
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.82 2011/05/14 16:49:45 bsiegert Exp $ 1$NetBSD: distinfo,v 1.83 2011/09/14 16:35:51 hans Exp $
2 2
3SHA1 (libtool-2.2.6b.tar.gz) = 5afa73c8ef9ebe64bbb438a0f8779c9036e43c55 3SHA1 (libtool-2.2.6b.tar.gz) = 5afa73c8ef9ebe64bbb438a0f8779c9036e43c55
4RMD160 (libtool-2.2.6b.tar.gz) = 02d8c1460946a1a0054b3ccb6b54d2404b53c2ef 4RMD160 (libtool-2.2.6b.tar.gz) = 02d8c1460946a1a0054b3ccb6b54d2404b53c2ef
5Size (libtool-2.2.6b.tar.gz) = 2347317 bytes 5Size (libtool-2.2.6b.tar.gz) = 2347317 bytes
6SHA1 (patch-aa) = 84e916bf868ada2ebeffe940f03537fadd751751 6SHA1 (patch-aa) = 84e916bf868ada2ebeffe940f03537fadd751751
7SHA1 (patch-ab) = 82af69aabcf095bc6eebbaf36ff04e9bd430c48b 7SHA1 (patch-ab) = 8f5408a1eb1bf16cdb90dbe0cf5f6d4853e32f2b
8SHA1 (patch-ac) = d4d6987ea14180891737a3defa37689d7c35853e 8SHA1 (patch-ac) = d4d6987ea14180891737a3defa37689d7c35853e
9SHA1 (patch-ad) = 8bc1435f5b271453b95b766f2d7fe999da5084d3 9SHA1 (patch-ad) = 8bc1435f5b271453b95b766f2d7fe999da5084d3
cvs diff -r1.70 -r1.71 pkgsrc/devel/libtool/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/devel/libtool/patches/Attic/patch-ab 2011/05/14 16:49:45 1.70
+++ pkgsrc/devel/libtool/patches/Attic/patch-ab 2011/09/14 16:35:51 1.71
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: patch-ab,v 1.70 2011/05/14 16:49:45 bsiegert Exp $ 1$NetBSD: patch-ab,v 1.71 2011/09/14 16:35:51 hans Exp $
2 2
3The last two chunks work around bugs in ksh on NetBSD. 3The last two chunks work around bugs in ksh on NetBSD.
4The problem manifests with wl and no_builtin_flag containing newlines. 4The problem manifests with wl and no_builtin_flag containing newlines.
5 5
6--- configure.orig 2011-04-14 15:39:05.000000000 +0000 6--- configure.orig 2009-11-16 14:14:55.000000000 +0100
7+++ configure 7+++ configure 2011-09-08 17:53:38.830895810 +0200
8@@ -5293,13 +5293,20 @@ else 8@@ -5293,13 +5293,20 @@ else
9 lt_cv_sys_max_cmd_len=8192; 9 lt_cv_sys_max_cmd_len=8192;
10 ;; 10 ;;
11  11
12+ mint*) 12+ mint*)
13+ # On MiNT we can support fairly large cmd lengths, but it takes 13+ # On MiNT we can support fairly large cmd lengths, but it takes
14+ # a while to run the tests, so let's restrict it to something 14+ # a while to run the tests, so let's restrict it to something
15+ # reasonable. 15+ # reasonable.
16+ lt_cv_sys_max_cmd_len=8192; 16+ lt_cv_sys_max_cmd_len=8192;
17+ ;; 17+ ;;
18+ 18+
19 amigaos*) 19 amigaos*)
20 # On AmigaOS with pdksh, this test takes hours, literally. 20 # On AmigaOS with pdksh, this test takes hours, literally.
@@ -173,26 +173,38 @@ The problem manifests with wl and no_bui @@ -173,26 +173,38 @@ The problem manifests with wl and no_bui
173+ 173+
174 netbsd*) 174 netbsd*)
175 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then 175 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
176 archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out 176 archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
177@@ -9450,6 +9517,8 @@ rm -f core conftest.err conftest.$ac_obj 177@@ -9450,6 +9517,8 @@ rm -f core conftest.err conftest.$ac_obj
178 ;; 178 ;;
179  179
180 *nto* | *qnx*) 180 *nto* | *qnx*)
181+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 181+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
182+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 182+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
183 ;; 183 ;;
184  184
185 openbsd*) 185 openbsd*)
 186@@ -9522,9 +9591,9 @@ rm -f core conftest.err conftest.$ac_obj
 187 no_undefined_flag=' -z defs'
 188 if test "$GCC" = yes; then
 189 wlarc='${wl}'
 190- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 191+ archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 192 archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
 193- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 194+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 195 else
 196 case `$CC -V 2>&1` in
 197 *"Compilers 5.0"*)
186@@ -10064,6 +10133,7 @@ beos*) 198@@ -10064,6 +10133,7 @@ beos*)
187 bsdi[45]*) 199 bsdi[45]*)
188 version_type=linux 200 version_type=linux
189 need_version=no 201 need_version=no
190+ need_lib_prefix=no 202+ need_lib_prefix=no
191 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' 203 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
192 soname_spec='${libname}${release}${shared_ext}$major' 204 soname_spec='${libname}${release}${shared_ext}$major'
193 finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' 205 finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
194@@ -10165,9 +10235,7 @@ freebsd1*) 206@@ -10165,9 +10235,7 @@ freebsd1*)
195 dynamic_linker=no 207 dynamic_linker=no
196 ;; 208 ;;
197  209
198-freebsd* | dragonfly*) 210-freebsd* | dragonfly*)
@@ -746,26 +758,38 @@ The problem manifests with wl and no_bui @@ -746,26 +758,38 @@ The problem manifests with wl and no_bui
746+ 758+
747 netbsd*) 759 netbsd*)
748 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then 760 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
749 archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out 761 archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
750@@ -17183,6 +17438,8 @@ rm -f core conftest.err conftest.$ac_obj 762@@ -17183,6 +17438,8 @@ rm -f core conftest.err conftest.$ac_obj
751 ;; 763 ;;
752  764
753 *nto* | *qnx*) 765 *nto* | *qnx*)
754+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 766+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
755+ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 767+ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
756 ;; 768 ;;
757  769
758 openbsd*) 770 openbsd*)
 771@@ -17255,9 +17512,9 @@ rm -f core conftest.err conftest.$ac_obj
 772 no_undefined_flag_F77=' -z defs'
 773 if test "$GCC" = yes; then
 774 wlarc='${wl}'
 775- archive_cmds_F77='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 776+ archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 777 archive_expsym_cmds_F77='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
 778- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 779+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 780 else
 781 case `$CC -V 2>&1` in
 782 *"Compilers 5.0"*)
759@@ -17644,6 +17901,7 @@ beos*) 783@@ -17644,6 +17901,7 @@ beos*)
760 bsdi[45]*) 784 bsdi[45]*)
761 version_type=linux 785 version_type=linux
762 need_version=no 786 need_version=no
763+ need_lib_prefix=no 787+ need_lib_prefix=no
764 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' 788 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
765 soname_spec='${libname}${release}${shared_ext}$major' 789 soname_spec='${libname}${release}${shared_ext}$major'
766 finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' 790 finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
767@@ -17744,9 +18002,7 @@ freebsd1*) 791@@ -17744,9 +18002,7 @@ freebsd1*)
768 dynamic_linker=no 792 dynamic_linker=no
769 ;; 793 ;;
770  794
771-freebsd* | dragonfly*) 795-freebsd* | dragonfly*)
@@ -1013,26 +1037,38 @@ The problem manifests with wl and no_bui @@ -1013,26 +1037,38 @@ The problem manifests with wl and no_bui
1013+ 1037+
1014 netbsd*) 1038 netbsd*)
1015 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then 1039 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
1016 archive_cmds_FC='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out 1040 archive_cmds_FC='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
1017@@ -19988,6 +20330,8 @@ rm -f core conftest.err conftest.$ac_obj 1041@@ -19988,6 +20330,8 @@ rm -f core conftest.err conftest.$ac_obj
1018 ;; 1042 ;;
1019  1043
1020 *nto* | *qnx*) 1044 *nto* | *qnx*)
1021+ archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 1045+ archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
1022+ archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 1046+ archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
1023 ;; 1047 ;;
1024  1048
1025 openbsd*) 1049 openbsd*)
 1050@@ -20060,9 +20404,9 @@ rm -f core conftest.err conftest.$ac_obj
 1051 no_undefined_flag_FC=' -z defs'
 1052 if test "$GCC" = yes; then
 1053 wlarc='${wl}'
 1054- archive_cmds_FC='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 1055+ archive_cmds_FC='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 1056 archive_expsym_cmds_FC='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
 1057- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 1058+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 1059 else
 1060 case `$CC -V 2>&1` in
 1061 *"Compilers 5.0"*)
1026@@ -20449,6 +20793,7 @@ beos*) 1062@@ -20449,6 +20793,7 @@ beos*)
1027 bsdi[45]*) 1063 bsdi[45]*)
1028 version_type=linux 1064 version_type=linux
1029 need_version=no 1065 need_version=no
1030+ need_lib_prefix=no 1066+ need_lib_prefix=no
1031 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' 1067 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
1032 soname_spec='${libname}${release}${shared_ext}$major' 1068 soname_spec='${libname}${release}${shared_ext}$major'
1033 finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' 1069 finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
1034@@ -20549,9 +20894,7 @@ freebsd1*) 1070@@ -20549,9 +20894,7 @@ freebsd1*)
1035 dynamic_linker=no 1071 dynamic_linker=no
1036 ;; 1072 ;;
1037  1073
1038-freebsd* | dragonfly*) 1074-freebsd* | dragonfly*)
@@ -1280,26 +1316,38 @@ The problem manifests with wl and no_bui @@ -1280,26 +1316,38 @@ The problem manifests with wl and no_bui
1280+ 1316+
1281 netbsd*) 1317 netbsd*)
1282 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then 1318 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
1283 archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out 1319 archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
1284@@ -22545,6 +22974,8 @@ rm -f core conftest.err conftest.$ac_obj 1320@@ -22545,6 +22974,8 @@ rm -f core conftest.err conftest.$ac_obj
1285 ;; 1321 ;;
1286  1322
1287 *nto* | *qnx*) 1323 *nto* | *qnx*)
1288+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 1324+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
1289+ archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 1325+ archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
1290 ;; 1326 ;;
1291  1327
1292 openbsd*) 1328 openbsd*)
 1329@@ -22617,9 +23048,9 @@ rm -f core conftest.err conftest.$ac_obj
 1330 no_undefined_flag_GCJ=' -z defs'
 1331 if test "$GCC" = yes; then
 1332 wlarc='${wl}'
 1333- archive_cmds_GCJ='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 1334+ archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 1335 archive_expsym_cmds_GCJ='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
 1336- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 1337+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 1338 else
 1339 case `$CC -V 2>&1` in
 1340 *"Compilers 5.0"*)
1293@@ -23115,7 +23546,10 @@ for cc_temp in $compiler""; do 1341@@ -23115,7 +23546,10 @@ for cc_temp in $compiler""; do
1294 *) break;; 1342 *) break;;
1295 esac 1343 esac
1296 done 1344 done
1297-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` 1345-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
1298+# Return the actual command name, not our pkgsrc wrapper name because several 1346+# Return the actual command name, not our pkgsrc wrapper name because several
1299+# decisions are made only based on compiler names 1347+# decisions are made only based on compiler names
1300+if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi 1348+if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi
1301+cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` 1349+cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
1302  1350
1303 lt_cv_prog_compiler_c_o_RC=yes 1351 lt_cv_prog_compiler_c_o_RC=yes
1304  1352
1305@@ -24296,6 +24730,9 @@ LTCC='$LTCC' 1353@@ -24296,6 +24730,9 @@ LTCC='$LTCC'