diff options
| author | Tijl Coosemans <tijl@FreeBSD.org> | 2014-04-23 13:25:16 +0000 |
|---|---|---|
| committer | Tijl Coosemans <tijl@FreeBSD.org> | 2014-04-23 13:25:16 +0000 |
| commit | aad09bc5e23eb75a7a865a8b0002fbc6e13d4659 (patch) | |
| tree | 69c07cdc4812f0f8be0cc44c38513f540c058778 /x11/libxklavier | |
| parent | - Update to 20140423 snapshot (diff) | |
When linking a library libA with a library libB using libtool, if libB.la
exists, libtool will add all libraries libB.la refers to (dependency_libs
field) to the linker command line and store them in the dependency_libs
field of libA.la. So everything that subsequently links with libA will also
link to these extra libraries. This causes too much overlinking.
This commit modifies Mk/Uses/libtool.mk so it empties the dependency_libs
field in .la libraries during staging. However, because .la libraries have
very limited use when dependency_libs is empty it makes sense to completely
remove them during staging.
So with this commit USES=libtool is modified to remove .la libraries and a
new form (USES=libtool:keepla) is introduced in case they need to be kept
(dependency_libs is still emptied).
PORTREVISION is bumped on all ports with USES=libtool that install .la
libraries. Most ports are also changed to add :keepla because .la
libraries have to be kept around as long as there are dependent ports with
.la libraries that refer to them in their dependency_libs field. In most
cases :keepla can be removed again as soon as all dependent ports that
install .la libraries have some form of USES=libtool added to their
Makefile.
PR: ports/188759
Exp-run: bdrewery
Approved by: portmgr (bdrewery)
Notes
Notes:
svn path=/head/; revision=351936
Diffstat (limited to 'x11/libxklavier')
| -rw-r--r-- | x11/libxklavier/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile index 2d1602d77ade..677e6c4c264e 100644 --- a/x11/libxklavier/Makefile +++ b/x11/libxklavier/Makefile @@ -4,7 +4,7 @@ PORTNAME= libxklavier PORTVERSION= 5.0 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= x11 gnome MASTER_SITES= GNOME @@ -16,7 +16,7 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso- RUN_DEPENDS= xkbcomp:${PORTSDIR}/x11/xkbcomp \ ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes -USES= libtool pathfix gmake pkgconfig tar:bzip2 +USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2 USE_XORG= x11 xi xkbfile USE_GNOME= libxml2 glib20 USE_LDCONFIG= yes |