summaryrefslogtreecommitdiff
path: root/ports-mgmt
diff options
context:
space:
mode:
authorTijl Coosemans <tijl@FreeBSD.org>2014-04-23 13:25:16 +0000
committerTijl Coosemans <tijl@FreeBSD.org>2014-04-23 13:25:16 +0000
commitaad09bc5e23eb75a7a865a8b0002fbc6e13d4659 (patch)
tree69c07cdc4812f0f8be0cc44c38513f540c058778 /ports-mgmt
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 'ports-mgmt')
-rw-r--r--ports-mgmt/pkg-devel/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/ports-mgmt/pkg-devel/Makefile b/ports-mgmt/pkg-devel/Makefile
index 98e964afb1e2..90ddce5b7290 100644
--- a/ports-mgmt/pkg-devel/Makefile
+++ b/ports-mgmt/pkg-devel/Makefile
@@ -21,7 +21,7 @@ NO_CCACHE= yes
WITH_DEBUG= yes
CFLAGS+= -O0 -g
USE_LDCONFIG= yes
-USES= tar:xz libtool
+USES= libtool tar:xz
GNU_CONFIGURE= yes
# Use a submake as 'deinstall install' needs to reevaluate PKG_CMD
@@ -92,7 +92,6 @@ PKG_BIN= ${WRKSRC}/src/pkg-static
.endif
post-install:
- @${RM} -f ${STAGEDIR}${PREFIX}/lib/*.la
@${MV} ${STAGEDIR}${PREFIX}/lib/libpkg_static.a \
${STAGEDIR}${PREFIX}/lib/libpkg.a
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpkg.so.2