mirror of
https://git.freebsd.org/ports.git
synced 2025-05-13 07:41:50 -04:00
0b59b92764
During configure of security/p5-Crypt-GCrypt a test program is compiled and run to test libgcrypt. This program segfaults when perl5 is built with the THREADS option. Libgcrypt links with libgpg-error which has an init function which calls into libintl (gettext) which calls pthread functions before libthr is initialised. The compiler command line is provided by perl and it includes both -pthread and -lpthread. Patch perl to remove -lpthread. With -pthread the compiler will pass -lpthread to the linker such that it is initialised early. Discovered by the exp-run for gettext 0.22. While here also remove -lc unconditionally and remove the code that replaced it with -lc_r for old version of FreeBSD because the version test is incorrect (missing a dot). The -pthread flag already tells the compiler to use -lc_r on those old versions. PR: 272210
47 lines
1.3 KiB
Bash
47 lines
1.3 KiB
Bash
Remove libs that are not here on FreeBSD.
|
|
|
|
--- hints/freebsd.sh.orig 2020-12-18 09:58:48 UTC
|
|
+++ hints/freebsd.sh
|
|
@@ -88,8 +88,6 @@ case "$osvers" in
|
|
esac
|
|
libswanted=`echo $libswanted | sed 's/ malloc / /'`
|
|
libswanted=`echo $libswanted | sed 's/ bind / /'`
|
|
- # iconv gone in Perl 5.8.1, but if someone compiles 5.8.0 or earlier.
|
|
- libswanted=`echo $libswanted | sed 's/ iconv / /'`
|
|
d_setregid='define'
|
|
d_setreuid='define'
|
|
d_setegid='define'
|
|
@@ -102,8 +100,13 @@ case "$osvers" in
|
|
;;
|
|
esac
|
|
libswanted=`echo $libswanted | sed 's/ malloc / /'`
|
|
+ libswanted=`echo $libswanted | sed 's/ bind / /'`
|
|
;;
|
|
esac
|
|
+libswanted=`echo $libswanted | sed 's/ c / /'`
|
|
+# Use -pthread so the compiler adds -lpthread at the right place on the
|
|
+# linker command line so its init functions run early.
|
|
+libswanted=`echo $libswanted | sed 's/ pthread / /'`
|
|
|
|
case "$osvers" in
|
|
10.*)
|
|
@@ -269,19 +272,6 @@ EOM
|
|
|
|
esac
|
|
|
|
- case "$osvers" in
|
|
- [1-4]*)
|
|
- set `echo X "$libswanted "| sed -e 's/ c / c_r /'`
|
|
- shift
|
|
- libswanted="$*"
|
|
- ;;
|
|
- *)
|
|
- set `echo X "$libswanted "| sed -e 's/ c //'`
|
|
- shift
|
|
- libswanted="$*"
|
|
- ;;
|
|
- esac
|
|
-
|
|
# Configure will probably pick the wrong libc to use for nm scan.
|
|
# The safest quick-fix is just to not use nm at all...
|
|
usenm=false
|