libtool: preserve -pthread in dependency_libs
libs built with libtool and -pthread drop the need for
-pthread in dependency_libs. This diff adds -pthread to
dependency_libs so any libs depending on it will link
with -pthread too.
This removes the need for hack to add -pthread to
dependency_libs in devel/glib2.
-Kurt
Index: Makefile
===
RCS file: /cvs/ports/devel/libtool/Makefile,v
retrieving revision 1.61
diff -u -r1.61 Makefile
--- Makefile14 Feb 2007 22:05:07 - 1.61
+++ Makefile15 Mar 2007 19:57:32 -
@@ -6,7 +6,7 @@
VERSION= 1.5.22
DISTNAME= libtool-${VERSION}
-PKGNAME-main= ${DISTNAME}p8
+PKGNAME-main= ${DISTNAME}p9
PKGNAME-ltdl= libltdl-${VERSION}p1
SHARED_LIBS= ltdl 4.3
MODGNU_SHARED_LIBS=ltdl '-no-undefined'
Index: patches/patch-ltmain_in
===
RCS file: /cvs/ports/devel/libtool/patches/patch-ltmain_in,v
retrieving revision 1.24
diff -u -r1.24 patch-ltmain_in
--- patches/patch-ltmain_in 23 Oct 2006 13:55:07 - 1.24
+++ patches/patch-ltmain_in 15 Mar 2007 19:57:32 -
@@ -1,7 +1,15 @@
$OpenBSD: patch-ltmain_in,v 1.24 2006/10/23 13:55:07 espie Exp $
ltmain.in.orig Sun Dec 18 22:43:52 2005
-+++ ltmain.in Sat Oct 21 16:07:13 2006
-@@ -2073,6 +2073,17 @@ EOF
+--- ltmain.in.orig Sun Dec 18 16:43:52 2005
ltmain.in Fri Feb 9 16:42:11 2007
+@@ -1604,6 +1604,7 @@ EOF
+ compiler_flags=$compiler_flags $arg
+ compile_command=$compile_command $arg
+ finalize_command=$finalize_command $arg
++ deplibs=$deplibs $arg
+ continue
+ ;;
+
+@@ -2073,6 +2074,17 @@ EOF
;;
esac
for pass in $passes; do
@@ -19,7 +27,15 @@
if test $linkmode,$pass = lib,link ||
test $linkmode,$pass = prog,scan; then
libs=$deplibs
-@@ -2334,20 +2345,20 @@ EOF
+@@ -2100,6 +2112,7 @@ EOF
+ finalize_deplibs=$deplib $finalize_deplibs
+ else
+ compiler_flags=$compiler_flags $deplib
++ test $linkmode = lib newdependency_libs=$deplib
$newdependency_libs
+ fi
+ continue
+ ;;
+@@ -2334,20 +2347,20 @@ EOF
# It is a libtool convenience library, so add in its objects.
convenience=$convenience $ladir/$objdir/$old_library
old_convenience=$old_convenience $ladir/$objdir/$old_library
@@ -50,7 +66,7 @@
continue
fi # $pass = conv
-@@ -2542,7 +2553,7 @@ EOF
+@@ -2542,7 +2555,7 @@ EOF
{ test $use_static_libs = no || test -z $old_library; }; then
if test $installed = no; then
notinst_deplibs=$notinst_deplibs $lib
@@ -59,7 +75,7 @@
fi
# This is a shared library
-@@ -2741,7 +2752,7 @@ EOF
+@@ -2741,7 +2754,7 @@ EOF
add_dir=
add=
# Finalize command for both is simple: just hardcode it.
@@ -68,7 +84,7 @@
add=$libdir/$linklib
elif test $hardcode_minus_L = yes; then
add_dir=-L$libdir
-@@ -3359,6 +3370,20 @@ EOF
+@@ -3359,6 +3372,20 @@ EOF
major=
versuffix=
verstring=
@@ -89,7 +105,7 @@
fi
# Check to see if the archive will have undefined symbols.
-@@ -6257,40 +6282,6 @@ relink_command=\$relink_command\
+@@ -6257,40 +6284,6 @@ relink_command=\$relink_command\
# Exit here if they wanted silent mode.
test $show = : exit $EXIT_SUCCESS
libtool: preserve -pthread in dependency_libs
Probably too late in the cycle to commit this, but
anyway...
libs built with libtool and -pthread drop the need for
-pthread in dependency_libs. This diff adds -pthread to
dependency_libs so any libs depending on it will link
with -pthread too.
-Kurt
Index: Makefile
===
RCS file: /cvs/ports/devel/libtool/Makefile,v
retrieving revision 1.60
diff -u -r1.60 Makefile
--- Makefile21 Nov 2006 11:31:39 - 1.60
+++ Makefile9 Feb 2007 22:51:38 -
@@ -6,7 +6,7 @@
VERSION= 1.5.22
DISTNAME= libtool-${VERSION}
-PKGNAME-main= ${DISTNAME}p7
+PKGNAME-main= ${DISTNAME}p8
PKGNAME-ltdl= libltdl-${VERSION}p1
SHARED_LIBS= ltdl 4.3
MODGNU_SHARED_LIBS=ltdl '-no-undefined'
Index: patches/patch-ltmain_in
===
RCS file: /cvs/ports/devel/libtool/patches/patch-ltmain_in,v
retrieving revision 1.24
diff -u -r1.24 patch-ltmain_in
--- patches/patch-ltmain_in 23 Oct 2006 13:55:07 - 1.24
+++ patches/patch-ltmain_in 9 Feb 2007 22:51:38 -
@@ -1,7 +1,15 @@
$OpenBSD: patch-ltmain_in,v 1.24 2006/10/23 13:55:07 espie Exp $
ltmain.in.orig Sun Dec 18 22:43:52 2005
-+++ ltmain.in Sat Oct 21 16:07:13 2006
-@@ -2073,6 +2073,17 @@ EOF
+--- ltmain.in.orig Sun Dec 18 16:43:52 2005
ltmain.in Fri Feb 9 16:42:11 2007
+@@ -1604,6 +1604,7 @@ EOF
+ compiler_flags=$compiler_flags $arg
+ compile_command=$compile_command $arg
+ finalize_command=$finalize_command $arg
++ deplibs=$deplibs $arg
+ continue
+ ;;
+
+@@ -2073,6 +2074,17 @@ EOF
;;
esac
for pass in $passes; do
@@ -19,7 +27,15 @@
if test $linkmode,$pass = lib,link ||
test $linkmode,$pass = prog,scan; then
libs=$deplibs
-@@ -2334,20 +2345,20 @@ EOF
+@@ -2100,6 +2112,7 @@ EOF
+ finalize_deplibs=$deplib $finalize_deplibs
+ else
+ compiler_flags=$compiler_flags $deplib
++ test $linkmode = lib newdependency_libs=$deplib
$newdependency_libs
+ fi
+ continue
+ ;;
+@@ -2334,20 +2347,20 @@ EOF
# It is a libtool convenience library, so add in its objects.
convenience=$convenience $ladir/$objdir/$old_library
old_convenience=$old_convenience $ladir/$objdir/$old_library
@@ -50,7 +66,7 @@
continue
fi # $pass = conv
-@@ -2542,7 +2553,7 @@ EOF
+@@ -2542,7 +2555,7 @@ EOF
{ test $use_static_libs = no || test -z $old_library; }; then
if test $installed = no; then
notinst_deplibs=$notinst_deplibs $lib
@@ -59,7 +75,7 @@
fi
# This is a shared library
-@@ -2741,7 +2752,7 @@ EOF
+@@ -2741,7 +2754,7 @@ EOF
add_dir=
add=
# Finalize command for both is simple: just hardcode it.
@@ -68,7 +84,7 @@
add=$libdir/$linklib
elif test $hardcode_minus_L = yes; then
add_dir=-L$libdir
-@@ -3359,6 +3370,20 @@ EOF
+@@ -3359,6 +3372,20 @@ EOF
major=
versuffix=
verstring=
@@ -89,7 +105,7 @@
fi
# Check to see if the archive will have undefined symbols.
-@@ -6257,40 +6282,6 @@ relink_command=\$relink_command\
+@@ -6257,40 +6284,6 @@ relink_command=\$relink_command\
# Exit here if they wanted silent mode.
test $show = : exit $EXIT_SUCCESS
