Minor fixes:
- do not link -lresolv, even though this will be gone from -current. - ld.so path is just /usr/lib, no /lib on OpenBSD.
This commit is contained in:
espie
parent
b41f2a260d
commit
0b604e89ee
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.45 2005/12/12 15:15:16 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.46 2005/12/16 23:03:35 espie Exp $
|
||||
# $FreeBSD: Makefile,v 1.2 1998/09/23 16:15:53 vanilla Exp $
|
||||
|
||||
COMMENT= "generic shared library support script"
|
||||
@ -6,7 +6,7 @@ COMMENT-ltdl= "GNU libtool system independent dlopen wrapper"
|
||||
|
||||
VERSION= 1.5.20
|
||||
DISTNAME= libtool-${VERSION}
|
||||
PKGNAME= ${DISTNAME}p2
|
||||
PKGNAME= ${DISTNAME}p3
|
||||
PKGNAME-ltdl= libltdl-${VERSION}p1
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= ${MASTER_SITE_GNU:=libtool/}
|
||||
|
||||
11
devel/libtool/patches/patch-configure
Normal file
11
devel/libtool/patches/patch-configure
Normal file
@ -0,0 +1,11 @@
|
||||
$OpenBSD: patch-configure,v 1.1 2005/12/16 23:03:35 espie Exp $
|
||||
--- configure.orig Thu Dec 15 19:34:34 2005
|
||||
+++ configure Thu Dec 15 19:34:56 2005
|
||||
@@ -8646,6 +8646,7 @@ nto-qnx*)
|
||||
|
||||
openbsd*)
|
||||
version_type=sunos
|
||||
+ sys_lib_dlsearch_path_spec="/usr/lib"
|
||||
need_lib_prefix=no
|
||||
# Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
|
||||
case $host_os in
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-libltdl_ltmain_sh,v 1.14 2005/12/12 15:15:16 espie Exp $
|
||||
$OpenBSD: patch-libltdl_ltmain_sh,v 1.15 2005/12/16 23:03:35 espie Exp $
|
||||
--- libltdl/ltmain.sh.orig Wed Aug 31 20:55:39 2005
|
||||
+++ libltdl/ltmain.sh Wed Dec 7 09:44:14 2005
|
||||
+++ libltdl/ltmain.sh Thu Dec 15 19:10:15 2005
|
||||
@@ -352,6 +352,8 @@ func_extract_archives ()
|
||||
# Darwin sucks
|
||||
eval std_shrext=\"$shrext_cmds\"
|
||||
@ -57,7 +57,21 @@ $OpenBSD: patch-libltdl_ltmain_sh,v 1.14 2005/12/12 15:15:16 espie Exp $
|
||||
break
|
||||
;;
|
||||
esac
|
||||
@@ -1984,6 +2001,17 @@ EOF
|
||||
@@ -1503,6 +1520,13 @@ EOF
|
||||
continue
|
||||
;;
|
||||
esac
|
||||
+ elif test "X$arg" = "X-lresolv"; then
|
||||
+ case $host in
|
||||
+ *-*-openbsd*)
|
||||
+ # dummy library, no shared version
|
||||
+ continue
|
||||
+ ;;
|
||||
+ esac
|
||||
fi
|
||||
deplibs="$deplibs $arg"
|
||||
continue
|
||||
@@ -1984,6 +2008,17 @@ EOF
|
||||
;;
|
||||
esac
|
||||
for pass in $passes; do
|
||||
@ -75,7 +89,7 @@ $OpenBSD: patch-libltdl_ltmain_sh,v 1.14 2005/12/12 15:15:16 espie Exp $
|
||||
if test "$linkmode,$pass" = "lib,link" ||
|
||||
test "$linkmode,$pass" = "prog,scan"; then
|
||||
libs="$deplibs"
|
||||
@@ -2245,20 +2273,20 @@ EOF
|
||||
@@ -2245,20 +2280,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"
|
||||
@ -106,7 +120,7 @@ $OpenBSD: patch-libltdl_ltmain_sh,v 1.14 2005/12/12 15:15:16 espie Exp $
|
||||
continue
|
||||
fi # $pass = conv
|
||||
|
||||
@@ -2445,8 +2473,12 @@ EOF
|
||||
@@ -2445,8 +2480,12 @@ EOF
|
||||
fi
|
||||
|
||||
link_static=no # Whether the deplib will be linked statically
|
||||
@ -120,7 +134,7 @@ $OpenBSD: patch-libltdl_ltmain_sh,v 1.14 2005/12/12 15:15:16 espie Exp $
|
||||
if test "$installed" = no; then
|
||||
notinst_deplibs="$notinst_deplibs $lib"
|
||||
need_relink=yes
|
||||
@@ -2644,7 +2676,7 @@ EOF
|
||||
@@ -2644,7 +2683,7 @@ EOF
|
||||
add_dir=
|
||||
add=
|
||||
# Finalize command for both is simple: just hardcode it.
|
||||
@ -129,7 +143,7 @@ $OpenBSD: patch-libltdl_ltmain_sh,v 1.14 2005/12/12 15:15:16 espie Exp $
|
||||
add="$libdir/$linklib"
|
||||
elif test "$hardcode_minus_L" = yes; then
|
||||
add_dir="-L$libdir"
|
||||
@@ -5932,40 +5964,6 @@ relink_command=\"$relink_command\""
|
||||
@@ -5932,40 +5971,6 @@ relink_command=\"$relink_command\""
|
||||
# Exit here if they wanted silent mode.
|
||||
test "$show" = : && exit $EXIT_SUCCESS
|
||||
|
||||
@ -170,7 +184,7 @@ $OpenBSD: patch-libltdl_ltmain_sh,v 1.14 2005/12/12 15:15:16 espie Exp $
|
||||
exit $EXIT_SUCCESS
|
||||
;;
|
||||
|
||||
@@ -6516,12 +6514,11 @@ exit $?
|
||||
@@ -6516,12 +6521,11 @@ exit $?
|
||||
# configuration. But we'll never go from static-only to shared-only.
|
||||
|
||||
# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-ltmain_in,v 1.14 2005/12/12 15:15:16 espie Exp $
|
||||
$OpenBSD: patch-ltmain_in,v 1.15 2005/12/16 23:03:35 espie Exp $
|
||||
--- ltmain.in.orig Wed Aug 31 20:25:28 2005
|
||||
+++ ltmain.in Wed Dec 7 09:43:10 2005
|
||||
+++ ltmain.in Thu Dec 15 19:09:43 2005
|
||||
@@ -352,6 +352,8 @@ func_extract_archives ()
|
||||
# Darwin sucks
|
||||
eval std_shrext=\"$shrext_cmds\"
|
||||
@ -57,7 +57,21 @@ $OpenBSD: patch-ltmain_in,v 1.14 2005/12/12 15:15:16 espie Exp $
|
||||
break
|
||||
;;
|
||||
esac
|
||||
@@ -1984,6 +2001,17 @@ EOF
|
||||
@@ -1503,6 +1520,13 @@ EOF
|
||||
continue
|
||||
;;
|
||||
esac
|
||||
+ elif test "X$arg" = "X-lresolv"; then
|
||||
+ case $host in
|
||||
+ *-*-openbsd*)
|
||||
+ # dummy library, no shared version
|
||||
+ continue
|
||||
+ ;;
|
||||
+ esac
|
||||
fi
|
||||
deplibs="$deplibs $arg"
|
||||
continue
|
||||
@@ -1984,6 +2008,17 @@ EOF
|
||||
;;
|
||||
esac
|
||||
for pass in $passes; do
|
||||
@ -75,7 +89,7 @@ $OpenBSD: patch-ltmain_in,v 1.14 2005/12/12 15:15:16 espie Exp $
|
||||
if test "$linkmode,$pass" = "lib,link" ||
|
||||
test "$linkmode,$pass" = "prog,scan"; then
|
||||
libs="$deplibs"
|
||||
@@ -2245,20 +2273,20 @@ EOF
|
||||
@@ -2245,20 +2280,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"
|
||||
@ -106,7 +120,7 @@ $OpenBSD: patch-ltmain_in,v 1.14 2005/12/12 15:15:16 espie Exp $
|
||||
continue
|
||||
fi # $pass = conv
|
||||
|
||||
@@ -2445,8 +2473,12 @@ EOF
|
||||
@@ -2445,8 +2480,12 @@ EOF
|
||||
fi
|
||||
|
||||
link_static=no # Whether the deplib will be linked statically
|
||||
@ -120,7 +134,7 @@ $OpenBSD: patch-ltmain_in,v 1.14 2005/12/12 15:15:16 espie Exp $
|
||||
if test "$installed" = no; then
|
||||
notinst_deplibs="$notinst_deplibs $lib"
|
||||
need_relink=yes
|
||||
@@ -2644,7 +2676,7 @@ EOF
|
||||
@@ -2644,7 +2683,7 @@ EOF
|
||||
add_dir=
|
||||
add=
|
||||
# Finalize command for both is simple: just hardcode it.
|
||||
@ -129,7 +143,7 @@ $OpenBSD: patch-ltmain_in,v 1.14 2005/12/12 15:15:16 espie Exp $
|
||||
add="$libdir/$linklib"
|
||||
elif test "$hardcode_minus_L" = yes; then
|
||||
add_dir="-L$libdir"
|
||||
@@ -5932,40 +5964,6 @@ relink_command=\"$relink_command\""
|
||||
@@ -5932,40 +5971,6 @@ relink_command=\"$relink_command\""
|
||||
# Exit here if they wanted silent mode.
|
||||
test "$show" = : && exit $EXIT_SUCCESS
|
||||
|
||||
@ -170,7 +184,7 @@ $OpenBSD: patch-ltmain_in,v 1.14 2005/12/12 15:15:16 espie Exp $
|
||||
exit $EXIT_SUCCESS
|
||||
;;
|
||||
|
||||
@@ -6516,12 +6514,11 @@ exit $?
|
||||
@@ -6516,12 +6521,11 @@ exit $?
|
||||
# configuration. But we'll never go from static-only to shared-only.
|
||||
|
||||
# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user