diff options
author | riastradh <riastradh> | 2013-05-10 00:15:02 +0000 |
---|---|---|
committer | riastradh <riastradh> | 2013-05-10 00:15:02 +0000 |
commit | ad760a70db741bd7a8db60d4aa8a3010a8063f10 (patch) | |
tree | c65120ade06d64cb183271af7cd744ccea343f45 | |
parent | 243939963518f5050b28298119eb40e762fb1767 (diff) | |
download | pkgsrc-ad760a70db741bd7a8db60d4aa8a3010a8063f10.tar.gz |
Fix pathnames and NM in libtool for cross-compilation.
Forgot to commit this alongside the recent cross-libtool changes.
ok agc
-rw-r--r-- | devel/libtool/Makefile.common | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common index d63af65230d..d2251849a62 100644 --- a/devel/libtool/Makefile.common +++ b/devel/libtool/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.79 2013/04/12 13:44:08 joerg Exp $ +# $NetBSD: Makefile.common,v 1.80 2013/05/10 00:15:02 riastradh Exp $ # used by devel/libltdl/Makefile # used by devel/libtool-base/Makefile # used by devel/libtool-info/Makefile @@ -41,8 +41,8 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= yes -DISTINFO_FILE= ${.CURDIR}/../libtool/distinfo -PATCHDIR= ${.CURDIR}/../libtool/patches +DISTINFO_FILE= ${.CURDIR}/../../devel/libtool/distinfo +PATCHDIR= ${.CURDIR}/../../devel/libtool/patches AUTOMAKE_OVERRIDE= NO @@ -60,12 +60,15 @@ CONFIGURE_ENV+= lt_cv_path_LD=${LD: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 +# or -B, so tell it. For cross-compilation, force it to use the normal +# NM and not the one in ${BUILDLINK_DIR}. # .if ${OPSYS} == "SunOS" || ${OPSYS} == "HPUX" CONFIGURE_ENV+= lt_cv_path_NM="nm -p" .elif ${OPSYS} == "IRIX" || ${OPSYS} == "OSF1" CONFIGURE_ENV+= lt_cv_path_NM="nm -B" +.else +CONFIGURE_ENV+= lt_cv_path_NM=${NM:Q} .endif CONFIGURE_ENV+= RANLIB=${RANLIB:Q} |