diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-07-09 17:43:11 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-07-09 17:43:11 +0000 |
| commit | 9e5632dd661f75b5801706e55659a4da501e49b5 (patch) | |
| tree | 1a0770d8cc1771f94f7777b9a986bb87029c35d9 /Mk | |
| parent | Allow to install and use 3rd party packages in X11BASE. (diff) | |
Apply a big libtool patch to allow porters to use the libtool installed by
the libtoolX ports instead of the one included with each port. Ports that
set USE_LIBTOOL_VER=X will now use the ports version of libtool instead of
the included version. To restore previous behavior, use the new macro,
USE_INC_LIBTOOL_VER. Both macros accept the same argument: a libtool version.
For example, to use the ports version of libtool-1.5, add the following to
your Makefile:
USE_LIBTOOL_VER= 15
To use the included version of libtool with extra hacks provided by
libtool-1.5, add the following to your Makefile:
USE_INC_LIBTOOL_VER= 15
With this change, ports that had to add additional libtool hacks to prevent
.la files from being installed or to fix certain threading issues can now
delete those hacks (after appropriate testing, of course).
PR: 63944
Based on work by:eik and marcus
Approved by: ade (autotools maintainer)
Tested by: kris on pointyhat
Bound to be hidden problems: You bet
Notes
Notes:
svn path=/head/; revision=113296
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.autotools.mk | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/Mk/bsd.autotools.mk b/Mk/bsd.autotools.mk index c0db71d4d128..e5d105c37cca 100644 --- a/Mk/bsd.autotools.mk +++ b/Mk/bsd.autotools.mk @@ -266,6 +266,9 @@ LIB_DEPENDS+= ltdl.4:${PORTSDIR}/devel/libltdl15 .if defined(USE_LIBTOOL_VER) GNU_CONFIGURE?= yes WANT_LIBTOOL_VER?= ${USE_LIBTOOL_VER} +.elif defined(USE_INC_LIBTOOL_VER) +GNU_CONFIGURE?= yes +WANT_LIBTOOL_VER?= ${USE_INC_LIBTOOL_VER} .endif # Note that there aren't any non-versioned libtools, so we can skip @@ -384,7 +387,7 @@ run-autotools: # .if !target(patch-autotools) patch-autotools: -. if defined(USE_LIBTOOL_VER) +. if defined(USE_INC_LIBTOOL_VER) @(cd ${PATCH_WRKSRC}; \ for file in ${LIBTOOLFILES}; do \ ${CP} $$file $$file.tmp; \ @@ -393,6 +396,16 @@ patch-autotools: $$file.tmp > $$file; \ ${RM} $$file.tmp; \ done); +. elif defined(USE_LIBTOOL_VER) + @(cd ${PATCH_WRKSRC}; \ + for file in ${LIBTOOLFILES}; do \ + ${CP} $$file $$file.tmp; \ + ${SED} -e "s^\$$ac_aux_dir/ltconfig^${LTCONFIG}^g" \ + -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \ + -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \ + $$file.tmp > $$file; \ + ${RM} $$file.tmp; \ + done); . else @${DO_NADA} . endif |