mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-12 03:00:28 +00:00
da8e6d4792
gdm to lock up when started. Special thanks goes to Glenn Johnson <gjohnson@srrc.ars.usda.gov> for tracking this down. Apparently, newer versions of libtool have code to prevent -lc_r from being passed to the linker on _all_ versions of FreeBSD. Since ${PTHREAD_LIBS} is set to -lc_r for 5.x, this causes massive problems with threaded applications.
52 lines
1.3 KiB
Bash
52 lines
1.3 KiB
Bash
--- ltmain.sh.orig Fri Apr 25 15:18:44 2003
|
|
+++ ltmain.sh Sun May 11 02:27:13 2003
|
|
@@ -1061,7 +1061,7 @@
|
|
esac
|
|
elif test "X$arg" = "X-lc_r"; then
|
|
case $host in
|
|
- *-*-openbsd* | *-*-freebsd*)
|
|
+ *-*-openbsd* | *-*-freebsd4*)
|
|
# Do not include libc_r directly, use -pthread flag.
|
|
continue
|
|
;;
|
|
@@ -1071,8 +1071,16 @@
|
|
continue
|
|
;;
|
|
|
|
+ -pthread)
|
|
+ compile_command="$compile_command -pthread"
|
|
+ finalize_command="$finalize_command -pthread"
|
|
+ compiler_flags="$compiler_flags -pthread"
|
|
+ continue
|
|
+ ;;
|
|
+
|
|
-module)
|
|
module=yes
|
|
+ build_old_libs=no
|
|
continue
|
|
;;
|
|
|
|
@@ -2471,6 +2479,9 @@
|
|
*-*-openbsd* | *-*-freebsd*)
|
|
# Do not include libc due to us having libc/libc_r.
|
|
;;
|
|
+ *-*-freebsd*)
|
|
+ # FreeBSD doesn't need this...
|
|
+ ;;
|
|
*)
|
|
# Add libc to deplibs on all other systems if necessary.
|
|
if test $build_libtool_need_lc = "yes"; then
|
|
@@ -4280,10 +4291,12 @@
|
|
fi
|
|
|
|
# Install the pseudo-library for information purposes.
|
|
+ if /usr/bin/false; then
|
|
name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
|
|
instname="$dir/$name"i
|
|
$show "$install_prog $instname $destdir/$name"
|
|
$run eval "$install_prog $instname $destdir/$name" || exit $?
|
|
+ fi
|
|
|
|
# Maybe install the static library, too.
|
|
test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
|