Skip to content

Commit

Permalink
perl 5.40 tweak
Browse files Browse the repository at this point in the history
  • Loading branch information
jrmarino committed Jun 19, 2024
1 parent 38da2e6 commit e15203c
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 47 deletions.
43 changes: 33 additions & 10 deletions bucket_29/perl-5.40/freebsd/patch-hints_freebsd.sh
Original file line number Diff line number Diff line change
@@ -1,24 +1,47 @@
Remove libs that are not here on FreeBSD.

--- hints/freebsd.sh.orig 2023-05-26 01:05:34 UTC
--- hints/freebsd.sh.orig 2020-12-18 09:58:48 UTC
+++ hints/freebsd.sh
@@ -88,6 +88,8 @@ case "$osvers" in
@@ -88,8 +88,6 @@ case "$osvers" in
esac
libswanted=`echo $libswanted | sed 's/ malloc / /'`
libswanted=`echo $libswanted | sed 's/ bind / /'`
+ libswanted=`echo $libswanted | sed 's/ dl / /'`
+ libswanted=`echo $libswanted | sed 's/ c / /'`
# iconv gone in Perl 5.8.1, but if someone compiles 5.8.0 or earlier.
libswanted=`echo $libswanted | sed 's/ iconv / /'`
- # 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'
@@ -102,6 +104,10 @@ case "$osvers" in
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 / /'`
+ libswanted=`echo $libswanted | sed 's/ dl / /'`
+ libswanted=`echo $libswanted | sed 's/ iconv / /'`
+ libswanted=`echo $libswanted | sed 's/ c / /'`
;;
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

This file was deleted.

This file was deleted.

0 comments on commit e15203c

Please sign in to comment.