aboutsummaryrefslogtreecommitdiff
path: root/x11-drivers/xf86-video-cirrus
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 /x11-drivers/xf86-video-cirrus
parent5c818b158c5b9479669f8322b4da8c48f5c30ef9 (diff)
downloadports-aad09bc5e23eb75a7a865a8b0002fbc6e13d4659.tar.gz
ports-aad09bc5e23eb75a7a865a8b0002fbc6e13d4659.zip
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-drivers/xf86-video-cirrus')
-rw-r--r--x11-drivers/xf86-video-cirrus/Makefile2
-rw-r--r--x11-drivers/xf86-video-cirrus/pkg-plist3
2 files changed, 1 insertions, 4 deletions
diff --git a/x11-drivers/xf86-video-cirrus/Makefile b/x11-drivers/xf86-video-cirrus/Makefile
index 854ab4718a20..a2a0db68bf08 100644
--- a/x11-drivers/xf86-video-cirrus/Makefile
+++ b/x11-drivers/xf86-video-cirrus/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-cirrus
PORTVERSION= 1.5.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-cirrus/pkg-plist b/x11-drivers/xf86-video-cirrus/pkg-plist
index b47e0b8d149b..386a9bbcb73a 100644
--- a/x11-drivers/xf86-video-cirrus/pkg-plist
+++ b/x11-drivers/xf86-video-cirrus/pkg-plist
@@ -1,8 +1,5 @@
-lib/xorg/modules/drivers/cirrus_alpine.la
lib/xorg/modules/drivers/cirrus_alpine.so
-lib/xorg/modules/drivers/cirrus_drv.la
lib/xorg/modules/drivers/cirrus_drv.so
-lib/xorg/modules/drivers/cirrus_laguna.la
lib/xorg/modules/drivers/cirrus_laguna.so
man/man4/cirrus.4x.gz
@dirrmtry lib/xorg/modules/drivers