diff options
| author | tv <tv@pkgsrc.org> | 2004-10-14 19:04:56 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2004-10-14 19:04:56 +0000 |
| commit | ef4829b3e0bbe134501b8d0210f1b726e593ffb5 (patch) | |
| tree | 6bb9696210dd6fd3d48d5612715bf05a53e3f4f1 /devel/libtool-base | |
| parent | 2a239730026bdbc170994996572035dc7a049bc5 (diff) | |
| download | pkgsrc-ef4829b3e0bbe134501b8d0210f1b726e593ffb5.tar.gz | |
Update libtool* packages to account for libltdl split, and simplify by
moving some common things into Makefile.common.
Diffstat (limited to 'devel/libtool-base')
| -rw-r--r-- | devel/libtool-base/Makefile | 48 | ||||
| -rw-r--r-- | devel/libtool-base/PLIST | 4 |
2 files changed, 12 insertions, 40 deletions
diff --git a/devel/libtool-base/Makefile b/devel/libtool-base/Makefile index e55a996c03f..ca62ebc6425 100644 --- a/devel/libtool-base/Makefile +++ b/devel/libtool-base/Makefile @@ -1,57 +1,32 @@ -# $NetBSD: Makefile,v 1.43 2004/10/12 04:41:39 tv Exp $ +# $NetBSD: Makefile,v 1.44 2004/10/14 19:04:56 tv Exp $ # -PKGNAME= ${DISTNAME:C/-/-base-/} -PKGREVISION= 4 +.include "../../devel/libtool/Makefile.common" + +PKGNAME= ${DISTNAME:S/-/-base-/} +PKGREVISION= 5 SVR4_PKGNAME= ltoob COMMENT= Generic shared library support script (the script itself) CONFLICTS+= libtool<=1.3.5nb11 -# We are going to want libtool to find the same versions of the C, C++, -# and Fortran compilers. -# -USE_LANGUAGES= c c++ fortran - -.include "../../devel/libtool/Makefile.common" - TEST_TARGET= check -.include "../../mk/bsd.prefs.mk" - .if ${OPSYS} == "NetBSD" . if !exists(/usr/libexec/ld.so) && !exists(/usr/libexec/ld.elf_so) CONFIGURE_ARGS+= --disable-shared BUILD_SHLIBTOOL= NO . endif -.else -CONFIGURE_ARGS+= --enable-ltdl-install .endif +CONFIGURE_ARGS+= --disable-ltdl-install +BUILD_SHLIBTOOL?= YES -CONFIGURE_ARGS+= --with-tags=CXX,F77,GCJ - -# The configure script persists in trying to find the path to ld, which -# always ends up in ${BUILDLINK_DIR}. Prevent it from caring. -# -CONFIGURE_ENV+= lt_cv_path_LD=${LD:Q} - -# The configure script persists in trying to find the path to sed or gsed, -# which breaks when SED is nbsed. Tell it explicitly to use the sed -# named by ${SED}. +# We are going to want libtool to find the same versions of the C, C++, +# and Fortran compilers. # -CONFIGURE_ENV+= SED=${SED:Q} -CONFIGURE_ENV+= lt_cv_path_SED=${SED:Q} - -# The configure script doesn't seem to be working out the need for -p -# or -B, so tell it -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= lt_cv_path_NM="nm -p" -.elif ${OPSYS} == "IRIX" -CONFIGURE_ENV+= lt_cv_path_NM="nm -B" -.endif - -BUILD_SHLIBTOOL?= YES +USE_LANGUAGES= c c++ fortran +CONFIGURE_ARGS+= --with-tags=CXX,F77,GCJ .PHONY: fix-libtool fix-libtool: @@ -77,5 +52,4 @@ post-install: ${INSTALL_SCRIPT} ${WRKSRC}/shlibtool ${PREFIX}/bin/shlibtool .endif -.include "../../devel/dlcompat/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libtool-base/PLIST b/devel/libtool-base/PLIST index c50e593b06b..7d03f53ac90 100644 --- a/devel/libtool-base/PLIST +++ b/devel/libtool-base/PLIST @@ -1,9 +1,7 @@ -@comment $NetBSD: PLIST,v 1.7 2004/09/22 08:09:28 jlam Exp $ +@comment $NetBSD: PLIST,v 1.8 2004/10/14 19:04:56 tv Exp $ bin/libtool bin/libtoolize ${SHLIBTOOL}bin/shlibtool -include/ltdl.h -lib/libltdl.la share/aclocal/libtool.m4 share/aclocal/ltdl.m4 share/libtool/config.guess |