Allow objects of the form libfoo_pic.a to be linked into shared objects as

well as the normal shared objects. This means that the new toolchain, that
links in libgcc_pic.a, will build proper shared objects again.

Bump to nb5 and make this the required version.

Fixes pkg/15120 from Matthias Scheler <tron@colwyn.zhadum.de>
This commit is contained in:
skrll 2002-01-04 15:20:25 +00:00
parent 6b26900bab
commit 350f63106d
4 changed files with 22 additions and 5 deletions

View file

@ -1,9 +1,9 @@
# $NetBSD: Makefile.common,v 1.15 2001/10/26 07:47:42 skrll Exp $
# $NetBSD: Makefile.common,v 1.16 2002/01/04 15:20:28 skrll Exp $
#
DISTNAME= libtool-ml-20010614
PKGPFX= ${DISTNAME:C/ml-/1.4./}
PKGREV= nb4
PKGREV= nb5
WRKSRC= ${WRKDIR}/libtool-ml
CATEGORIES= devel pkgtools
MASTER_SITES= ${MASTER_SITE_LOCAL}

View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.11 2001/10/26 10:58:02 skrll Exp $
$NetBSD: distinfo,v 1.12 2002/01/04 15:20:28 skrll Exp $
SHA1 (libtool-ml-20010614.tar.gz) = ff746666737e420592c3017d65bf4c47f1430dac
Size (libtool-ml-20010614.tar.gz) = 784246 bytes
@ -7,5 +7,6 @@ SHA1 (patch-aa) = c085c1dd5a3f3f56bfa279076724fc13311d83bb
SHA1 (patch-ab) = 61419b5d6f69c64e4c21e628e1230ee8d17a63dd
SHA1 (patch-ac) = 61196acaa12edee0b1209b2ba7c6414453bfa438
SHA1 (patch-ad) = 6aab76688d0f55648e35adc45a3492ba9c87acfb
SHA1 (patch-ae) = 9ee61238e4bd84687f0788be600dad9e5cf676fb
SHA1 (patch-ag) = 93c0ed94970c69f1a4af9ccec31463f2e3adc670
SHA1 (patch-ao) = 4e115e9d6ddde556205dc786cde471bfee5a5e9e

View file

@ -0,0 +1,16 @@
$NetBSD: patch-ae,v 1.4 2002/01/04 15:20:29 skrll Exp $
--- configure.orig Thu Jun 14 05:06:29 2001
+++ configure
@@ -1533,9 +1533,9 @@
netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
+ lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$$'
else
- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
+ lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+(\.so|_pic\.a)$$'
fi
;;

View file

@ -1,4 +1,4 @@
# $NetBSD: bsd.pkg.mk,v 1.888 2002/01/04 12:25:43 agc Exp $
# $NetBSD: bsd.pkg.mk,v 1.889 2002/01/04 15:20:25 skrll Exp $
#
# This file is in the public domain.
#
@ -263,7 +263,7 @@ LIBS+= -L${LOCALBASE}/lib -lintl
CONFIGURE_ENV+= LIBS="${LIBS}"
.endif
LIBTOOL_REQD= 1.4.20010614nb4
LIBTOOL_REQD= 1.4.20010614nb5
.if defined(USE_LIBTOOL)
LIBTOOL= ${LOCALBASE}/bin/libtool
. if defined(USE_LTDL)