diff options
| -rw-r--r-- | devel/libtool/Makefile | 8 | ||||
| -rw-r--r-- | devel/libtool/patches/patch-aa | 12 | ||||
| -rw-r--r-- | devel/libtool/patches/patch-ab | 42 | ||||
| -rw-r--r-- | mk/bsd.pkg.mk | 6 |
4 files changed, 15 insertions, 53 deletions
diff --git a/devel/libtool/Makefile b/devel/libtool/Makefile index 1701b26804c..5ca449baff0 100644 --- a/devel/libtool/Makefile +++ b/devel/libtool/Makefile @@ -1,14 +1,18 @@ -# $NetBSD: Makefile,v 1.4 1998/08/20 15:16:48 tsarna Exp $ -# FreeBSD Id: Makefile,v 1.1.1.1 1998/05/07 15:58:20 vanilla Exp +# $NetBSD: Makefile,v 1.5 1998/10/02 14:49:33 tv Exp $ # DISTNAME= libtool-1.2 +# XXX should change back to libtool with next release; this differentiates +# libtool from pkg-customized libtool, the latter under the "libtool-1.2" name +PKGNAME= glibtool-1.2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MAINTAINER= tv@netbsd.org HOMEPAGE= http://www.profitpress.com/libtool/ +CONFLICTS= libtool-1.2 + GNU_CONFIGURE= yes CONFIGURE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ INSTALL_DATA="${INSTALL_DATA}" diff --git a/devel/libtool/patches/patch-aa b/devel/libtool/patches/patch-aa index a5d8835811f..7948395907b 100644 --- a/devel/libtool/patches/patch-aa +++ b/devel/libtool/patches/patch-aa @@ -1,13 +1,11 @@ -$NetBSD: patch-aa,v 1.4 1998/08/07 10:40:25 agc Exp $ - --- ltconfig.orig Fri Mar 20 03:00:29 1998 -+++ ltconfig Sun Jul 12 22:48:41 1998 ++++ ltconfig Sun Sep 27 11:47:30 1998 @@ -808,7 +808,11 @@ netbsd*) # Tested with NetBSD 1.2 ld - archive_cmds='$LD -Bshareable -o $lib$libobjs' -+ if [ -f /usr/lib/libc.so ]; then ++ if $CC -E - -dM </dev/null | grep -q __ELF__; then + archive_cmds='$LD -shared -o $lib$libobjs' # ELF + else + archive_cmds='$LD -Bshareable -o $lib$libobjs' # a.out @@ -15,18 +13,20 @@ $NetBSD: patch-aa,v 1.4 1998/08/07 10:40:25 agc Exp $ hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no -@@ -1181,8 +1185,13 @@ +@@ -1181,8 +1185,15 @@ netbsd* | openbsd*) version_type=sunos - library_names_spec='${libname}${release}.so.$versuffix' - finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir' -+ if [ -f /usr/lib/libc.so ]; then ++ if $CC -E - -dM </dev/null | grep -q __ELF__; then + library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so' + soname_spec='${libname}${release}.so.$major' ++ dynamic_linker='NetBSD ld.elf_so' + else + library_names_spec='${libname}${release}.so.$versuffix' + finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir' ++ dynamic_linker='NetBSD/OpenBSD (a.out) ld.so' + fi shlibpath_var=LD_LIBRARY_PATH ;; diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab deleted file mode 100644 index eb49fd6511e..00000000000 --- a/devel/libtool/patches/patch-ab +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-ab,v 1.6 1998/08/07 10:40:26 agc Exp $ - ---- ltmain.sh.orig Tue Jul 21 16:59:33 1998 -+++ ltmain.sh Tue Jul 21 17:02:42 1998 -@@ -144,6 +144,8 @@ - prev=execute_dlfiles - ;; - -+ --install-la) install_la="yes" ;; -+ - -*) - $echo "$modename: unrecognized option \`$arg'" 1>&2 - $echo "$help" 1>&2 -@@ -1841,10 +1843,12 @@ - IFS="$save_ifs" - fi - -+if test -n "$install_la"; then - # Install the pseudo-library for information purposes. - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - $show "$install_prog $file $destdir/$name" - $run eval "$install_prog $file $destdir/$name" || exit $? -+fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" -@@ -1912,6 +1916,7 @@ - exit 1 - fi - -+if test -n "$install_la"; then - finalize=yes - for lib in $link_against_libtool_libs; do - # Check to see that each library is installed. -@@ -1932,6 +1937,7 @@ - finalize=no - fi - done -+fi - - if test "$hardcode_action" = relink; then - if test "$finalize" = yes; then diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 9bc85e1b9bf..fd5313dc890 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.167 1998/09/23 13:09:32 agc Exp $ +# $NetBSD: bsd.pkg.mk,v 1.168 1998/10/02 14:49:33 tv Exp $ # # This file is in the public domain. # @@ -155,8 +155,8 @@ BUILD_DEPENDS+= ${PREFIX}/include/Xm/Xm.h:../../x11/lesstif .endif .endif .if defined(USE_LIBTOOL) -LIBTOOL= ${LOCALBASE}/bin/libtool -BUILD_DEPENDS+= ${LIBTOOL}:../../devel/libtool +LIBTOOL= ${LOCALBASE}/bin/pkglibtool +BUILD_DEPENDS+= ${LIBTOOL}:../../pkgtools/pkglibtool CONFIGURE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}" MAKE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}" .endif |