diff options
| author | ade <ade@FreeBSD.org> | 2003-06-27 06:58:32 +0800 |
|---|---|---|
| committer | ade <ade@FreeBSD.org> | 2003-06-27 06:58:32 +0800 |
| commit | 9487d820b3247d8654d99544f8144188dcec810a (patch) | |
| tree | 740462af7ed8e371913ea7f6b12533a99dd524ac /net-mgmt/net-snmp | |
| parent | dfe03c1be7cf9f1612091e1e697a7e74f7002416 (diff) | |
| download | freebsd-ports-gnome-9487d820b3247d8654d99544f8144188dcec810a.tar.gz freebsd-ports-gnome-9487d820b3247d8654d99544f8144188dcec810a.tar.zst freebsd-ports-gnome-9487d820b3247d8654d99544f8144188dcec810a.zip | |
libtool uber-patch
* kill devel/libtool and move to devel/libtool13, upgrading to 1.3.5
* upgrade repo-copied devel/libtool14 to 1.4.3
* break out libltdl into its own separate port
* move to version-numbered binaries/scripts (ie: there is *no* 'libtool'
any more -- USE_LIBTOOL and USE_LIBTOOL_VER are your friends)
Approved by: portmgr (kris) - for the bsd.port.mk hooks
Tested by: bento 4-exp builds (repeatedly)
Diffstat (limited to 'net-mgmt/net-snmp')
| -rw-r--r-- | net-mgmt/net-snmp/Makefile | 4 | ||||
| -rw-r--r-- | net-mgmt/net-snmp/files/patch-aclocal.m4 | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile index cd631c8b6a3a..b9570ee4d32c 100644 --- a/net-mgmt/net-snmp/Makefile +++ b/net-mgmt/net-snmp/Makefile @@ -101,7 +101,9 @@ SHLIB_VERSION= 5 PLIST_SUB+= shlib=${SHLIB_VERSION} post-patch: - @${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ + @${REINPLACE_CMD} \ + -e 's|%%LTCONFIG%%|${LIBTOOL_SHAREDIR}/ltconfig${LIBTOOL_VERSION}|g' \ + -e 's|%%LTMAIN%%|${LIBTOOL_SHAREDIR}/ltmain.sh|g' \ ${WRKSRC}/aclocal.m4 post-configure: diff --git a/net-mgmt/net-snmp/files/patch-aclocal.m4 b/net-mgmt/net-snmp/files/patch-aclocal.m4 index c466d9e1f68c..eb2e519aa7f0 100644 --- a/net-mgmt/net-snmp/files/patch-aclocal.m4 +++ b/net-mgmt/net-snmp/files/patch-aclocal.m4 @@ -12,8 +12,8 @@ +LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ +LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \ +DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \ -+${CONFIG_SHELL-/bin/sh} %%LOCALBASE%%/share/libtool/ltconfig --no-reexec \ -+$libtool_flags --no-verify --disable-ltlibs --release-ignore %%LOCALBASE%%/share/libtool/ltmain.sh $lt_target \ ++${CONFIG_SHELL-/bin/sh} %%LTCONFIG%% --no-reexec \ ++$libtool_flags --no-verify --disable-ltlibs --release-ignore %%LTMAIN%% $lt_target \ +|| AC_MSG_ERROR([libtool configure failed]) + +# Reload cache, that may have been modified by ltconfig @@ -21,7 +21,7 @@ + # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+LIBTOOL_DEPS="--disable-ltlibs --release-ignore %%LOCALBASE%%/share/libtool/ltmain.sh" ++LIBTOOL_DEPS="--disable-ltlibs --release-ignore %%LTMAIN%%" # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -42,7 +42,7 @@ # which needs '.lib'). libext=a -ltmain="$ac_aux_dir/ltmain.sh" -+ltmain="--disable-ltlibs --release-ignore %%LOCALBASE%%/share/libtool/ltmain.sh" ++ltmain="--disable-ltlibs --release-ignore %%LTMAIN%%" ofile="$default_ofile" with_gnu_ld="$lt_cv_prog_gnu_ld" need_locks="$enable_libtool_lock" |