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-drivers/xf86-video-ati | |
| 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-drivers/xf86-video-ati')
| -rw-r--r-- | x11-drivers/xf86-video-ati/Makefile | 4 | ||||
| -rw-r--r-- | x11-drivers/xf86-video-ati/pkg-plist | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile index be942d399d45..6bf515860539 100644 --- a/x11-drivers/xf86-video-ati/Makefile +++ b/x11-drivers/xf86-video-ati/Makefile @@ -16,12 +16,12 @@ USE_XORG= xf86driproto xineramaproto xf86miscproto glproto .if ${OSVERSION} < 1000051 || !defined(WITH_NEW_XORG) ATI_VERSION= 6.14.6 -ATI_REVISION= 2 +ATI_REVISION= 3 CONFIGURE_ARGS+=--disable-kms PLIST_SUB+= OLD="" .else ATI_VERSION= 7.2.0 -ATI_REVISION= 2 +ATI_REVISION= 3 CONFIGURE_ARGS+=--disable-udev CONFIGURE_ARGS+=--disable-glamor EXTRA_PATCHES+= ${FILESDIR}/extra-src__radeon_kms.c diff --git a/x11-drivers/xf86-video-ati/pkg-plist b/x11-drivers/xf86-video-ati/pkg-plist index a244776f38d1..f64d9df88ad3 100644 --- a/x11-drivers/xf86-video-ati/pkg-plist +++ b/x11-drivers/xf86-video-ati/pkg-plist @@ -1,12 +1,7 @@ -lib/xorg/modules/drivers/ati_drv.la lib/xorg/modules/drivers/ati_drv.so -lib/xorg/modules/drivers/radeon_drv.la lib/xorg/modules/drivers/radeon_drv.so -%%OLD%%lib/xorg/modules/multimedia/theatre200_drv.la %%OLD%%lib/xorg/modules/multimedia/theatre200_drv.so -%%OLD%%lib/xorg/modules/multimedia/theatre_detect_drv.la %%OLD%%lib/xorg/modules/multimedia/theatre_detect_drv.so -%%OLD%%lib/xorg/modules/multimedia/theatre_drv.la %%OLD%%lib/xorg/modules/multimedia/theatre_drv.so man/man4/ati.4x.gz man/man4/radeon.4x.gz |