diff options
| author | skrll <skrll@pkgsrc.org> | 2002-01-04 15:20:25 +0000 |
|---|---|---|
| committer | skrll <skrll@pkgsrc.org> | 2002-01-04 15:20:25 +0000 |
| commit | 350f63106de9b8d40e6fd5eef0490b7d4cbfad21 (patch) | |
| tree | eaf51ee4f8e8dd05a5f8c64c051422bcac50c931 | |
| parent | 6b26900bab3ba102f9647792ae8ddd2f5805dc88 (diff) | |
| download | pkgsrc-350f63106de9b8d40e6fd5eef0490b7d4cbfad21.tar.gz | |
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>
| -rw-r--r-- | devel/libtool/Makefile.common | 4 | ||||
| -rw-r--r-- | devel/libtool/distinfo | 3 | ||||
| -rw-r--r-- | devel/libtool/patches/patch-ae | 16 | ||||
| -rw-r--r-- | mk/bsd.pkg.mk | 4 |
4 files changed, 22 insertions, 5 deletions
diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common index ce50c0bdffc..9424a788484 100644 --- a/devel/libtool/Makefile.common +++ b/devel/libtool/Makefile.common @@ -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} diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo index 3099cf6f499..2992efa2ee0 100644 --- a/devel/libtool/distinfo +++ b/devel/libtool/distinfo @@ -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 diff --git a/devel/libtool/patches/patch-ae b/devel/libtool/patches/patch-ae new file mode 100644 index 00000000000..edc4a076ce9 --- /dev/null +++ b/devel/libtool/patches/patch-ae @@ -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 + ;; + diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 2b3ffb16c52..4abb8817d88 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -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) |