diff options
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/dlcompat/Makefile | 5 | ||||
| -rw-r--r-- | devel/gettext-lib/Makefile | 18 | ||||
| -rw-r--r-- | devel/libtool-base/Makefile | 35 |
3 files changed, 13 insertions, 45 deletions
diff --git a/devel/dlcompat/Makefile b/devel/dlcompat/Makefile index f8091ecc542..19180a22859 100644 --- a/devel/dlcompat/Makefile +++ b/devel/dlcompat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2002/11/20 10:37:17 schmonz Exp $ +# $NetBSD: Makefile,v 1.6 2002/12/22 19:04:07 jlam Exp $ # DISTNAME= dlcompat-20021117 @@ -9,10 +9,9 @@ MAINTAINER= schmonz@netbsd.org HOMEPAGE= http://fink.sourceforge.net/ COMMENT= Library for dlopen() emulation on Darwin -# dlcompat is needed to bootstrap buildlink2 on Darwin (via bash). -USE_BUILDLINK2= no ONLY_FOR_PLATFORM= Darwin-*-* +USE_BUILDLINK2= # defined GNU_CONFIGURE= # defined .include "../../mk/bsd.pkg.mk" diff --git a/devel/gettext-lib/Makefile b/devel/gettext-lib/Makefile index 83123715e17..4dbc5cd4c60 100644 --- a/devel/gettext-lib/Makefile +++ b/devel/gettext-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2002/12/02 11:26:44 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2002/12/22 19:04:08 jlam Exp $ # FreeBSD Id: Makefile,v 1.1.1.1 1998/08/09 15:13:33 kuriyama Exp # @@ -13,17 +13,14 @@ HOMEPAGE= http://www.gnu.org/software/gettext/gettext.html COMMENT= tools for providing messages in different languages, libintl only CONFLICTS= gettext<=0.10.35 -DEPENDS+= libiconv-[0-9]*:../../converters/libiconv -# gettext-lib is needed to bootstrap shell/bash2, which is needed to -# bootstrap buildlink2. -# -USE_BUILDLINK2= no - -GNU_CONFIGURE= yes -USE_LIBTOOL= yes +USE_BUILDLINK2= # defined +USE_LIBTOOL= # defined LIBTOOL_OVERRIDE= ${WRKSRC}/libtool + +GNU_CONFIGURE= # defined CONFIGURE_ARGS+= --with-included-gettext + CONFIG_GUESS_OVERRIDE= ${WRKSRC}/config.guess CONFIG_SUB_OVERRIDE= ${WRKSRC}/config.sub CONFIGURE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" @@ -33,6 +30,5 @@ ALL_TARGET= all-yes INSTALL_TARGET= install-exec BUILD_DIRS= ${WRKSRC}/intl +.include "../../converters/libiconv/buildlink2.mk" .include "../../mk/bsd.pkg.mk" - -LDFLAGS:= ${LDFLAGS:N-L${LOCALBASE}/lib*} diff --git a/devel/libtool-base/Makefile b/devel/libtool-base/Makefile index df234247742..1daf2ce11a9 100644 --- a/devel/libtool-base/Makefile +++ b/devel/libtool-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2002/11/21 00:50:03 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2002/12/22 19:04:08 jlam Exp $ # .include "../libtool/Makefile.common" @@ -10,8 +10,6 @@ COMMENT= Generic shared library support script (the script itself) CONFLICTS+= libtool<=1.3.5nb11 -USE_BUILDLINK2= no # needed for bootstrapping buildlink2 - test: build cd ${WRKSRC} && ${MAKE} check @@ -23,40 +21,15 @@ DEPENDS+= c++rt0>=1.0:../../sysutils/c++rt0 .endif .if ${OPSYS} == "NetBSD" -.if !exists(/usr/libexec/ld.so) && !exists(/usr/libexec/ld.elf_so) +. if !exists(/usr/libexec/ld.so) && !exists(/usr/libexec/ld.elf_so) CONFIGURE_ARGS= --disable-shared -.endif +. endif .else CONFIGURE_ARGS= --enable-ltdl-install .endif .if !empty(MACHINE_PLATFORM:MDarwin-*-*) -DLCOMPATDIR= ${WRKDIR}/.dlcompat -DEPENDS+= dlcompat>=20020606:../../devel/dlcompat -EVAL_PREFIX+= DLCOMPAT_PREFIX=dlcompat -DLCOMPAT_PREFIX_DEFAULT= ${LOCALBASE} - -pre-configure: dlcompat-buildlink -dlcompat-buildlink: - cd ${DLCOMPAT_PREFIX}; \ - for file in include/dlfcn.h lib/libdl.*; do \ - if [ -f "$${file}" ]; then \ - ${MKDIR} ${DLCOMPATDIR}/`${DIRNAME} $${file}`; \ - ${LN} -sf ${DLCOMPAT_PREFIX}/$${file} \ - ${DLCOMPATDIR}/$${file}; \ - fi; \ - done +. include "../../devel/dlcompat/buildlink2.mk" .endif .include "../../mk/bsd.pkg.mk" - -.if !empty(MACHINE_PLATFORM:MDarwin-*-*) -CPPFLAGS:= -I${DLCOMPATDIR}/include ${CPPFLAGS} -CFLAGS:= -I${DLCOMPATDIR}/include ${CFLAGS} -LDFLAGS= -L${DLCOMPATDIR}/lib -. if ${_USE_RPATH} == "yes" -LDFLAGS+= -Wl,-R${DLCOMPAT_PREFIX}/lib -. endif -.else -LDFLAGS= # empty -.endif |