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 /palm | |
| 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 'palm')
| -rw-r--r-- | palm/gnome-pilot-conduits/Makefile | 2 | ||||
| -rw-r--r-- | palm/gnome-pilot/Makefile | 2 | ||||
| -rw-r--r-- | palm/gnomepilot-conduits2/Makefile | 2 | ||||
| -rw-r--r-- | palm/gnomepilot2/Makefile | 2 | ||||
| -rw-r--r-- | palm/rapip/Makefile | 2 | ||||
| -rw-r--r-- | palm/synce-gnomevfs/Makefile | 2 | ||||
| -rw-r--r-- | palm/synce-gvfs/Makefile | 2 | ||||
| -rw-r--r-- | palm/synce-kde/Makefile | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/palm/gnome-pilot-conduits/Makefile b/palm/gnome-pilot-conduits/Makefile index 88d1521d198e..c8b1201dcae7 100644 --- a/palm/gnome-pilot-conduits/Makefile +++ b/palm/gnome-pilot-conduits/Makefile @@ -24,7 +24,7 @@ USE_GMAKE= yes USE_X_PREFIX= yes USE_BISON= yes USE_GNOME= gnomeprefix gnomehack libgnome -USE_LIBTOOL_VER=13 +USE_INC_LIBTOOL_VER=13 USE_REINPLACE= yes CONFIGURE_ARGS= --with-pisock=${LOCALBASE} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile index 500a2e075f98..67ff100be790 100644 --- a/palm/gnome-pilot/Makefile +++ b/palm/gnome-pilot/Makefile @@ -24,7 +24,7 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack gnomehier gnomepanel -USE_LIBTOOL_VER=13 +USE_INC_LIBTOOL_VER=13 INSTALLS_SHLIB= yes CONFIGURE_ARGS= --with-pisock=${LOCALBASE} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/palm/gnomepilot-conduits2/Makefile b/palm/gnomepilot-conduits2/Makefile index 88d1521d198e..c8b1201dcae7 100644 --- a/palm/gnomepilot-conduits2/Makefile +++ b/palm/gnomepilot-conduits2/Makefile @@ -24,7 +24,7 @@ USE_GMAKE= yes USE_X_PREFIX= yes USE_BISON= yes USE_GNOME= gnomeprefix gnomehack libgnome -USE_LIBTOOL_VER=13 +USE_INC_LIBTOOL_VER=13 USE_REINPLACE= yes CONFIGURE_ARGS= --with-pisock=${LOCALBASE} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/palm/gnomepilot2/Makefile b/palm/gnomepilot2/Makefile index 500a2e075f98..67ff100be790 100644 --- a/palm/gnomepilot2/Makefile +++ b/palm/gnomepilot2/Makefile @@ -24,7 +24,7 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack gnomehier gnomepanel -USE_LIBTOOL_VER=13 +USE_INC_LIBTOOL_VER=13 INSTALLS_SHLIB= yes CONFIGURE_ARGS= --with-pisock=${LOCALBASE} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/palm/rapip/Makefile b/palm/rapip/Makefile index 0feffad9cf2c..56308f1567d4 100644 --- a/palm/rapip/Makefile +++ b/palm/rapip/Makefile @@ -22,7 +22,7 @@ RUN_DEPENDS+= synce-serial-start:${PORTSDIR}/palm/synce-serial \ USE_KDELIBS_VER=3 USE_GMAKE= yes GNU_CONFIGURE= yes -USE_LIBTOOL_VER=13 +USE_INC_LIBTOOL_VER=13 CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} .include <bsd.port.mk> diff --git a/palm/synce-gnomevfs/Makefile b/palm/synce-gnomevfs/Makefile index d554244fa717..7e674b17cf21 100644 --- a/palm/synce-gnomevfs/Makefile +++ b/palm/synce-gnomevfs/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= rapi.2:${PORTSDIR}/palm/synce-librapi2 USE_GNOME= gnomeprefix gnometarget gnomevfs2 USE_X_PREFIX= yes -USE_LIBTOOL_VER=13 +USE_INC_LIBTOOL_VER=13 CONFIGURE_ARGS+= --with-librapi=${LOCALBASE} INSTALLS_SHLIB= yes diff --git a/palm/synce-gvfs/Makefile b/palm/synce-gvfs/Makefile index d554244fa717..7e674b17cf21 100644 --- a/palm/synce-gvfs/Makefile +++ b/palm/synce-gvfs/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= rapi.2:${PORTSDIR}/palm/synce-librapi2 USE_GNOME= gnomeprefix gnometarget gnomevfs2 USE_X_PREFIX= yes -USE_LIBTOOL_VER=13 +USE_INC_LIBTOOL_VER=13 CONFIGURE_ARGS+= --with-librapi=${LOCALBASE} INSTALLS_SHLIB= yes diff --git a/palm/synce-kde/Makefile b/palm/synce-kde/Makefile index 0feffad9cf2c..56308f1567d4 100644 --- a/palm/synce-kde/Makefile +++ b/palm/synce-kde/Makefile @@ -22,7 +22,7 @@ RUN_DEPENDS+= synce-serial-start:${PORTSDIR}/palm/synce-serial \ USE_KDELIBS_VER=3 USE_GMAKE= yes GNU_CONFIGURE= yes -USE_LIBTOOL_VER=13 +USE_INC_LIBTOOL_VER=13 CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} .include <bsd.port.mk> |