diff options
| author | tijl <tijl@FreeBSD.org> | 2014-04-23 21:25:16 +0800 |
|---|---|---|
| committer | tijl <tijl@FreeBSD.org> | 2014-04-23 21:25:16 +0800 |
| commit | 55e5c34e31b90aa95311b10bd4a3072f2163ebfe (patch) | |
| tree | 69c07cdc4812f0f8be0cc44c38513f540c058778 /x11-drivers/xf86-input-keyboard | |
| parent | 0c15193d405451f0e1452ba981c8efb1df1447dd (diff) | |
| download | freebsd-ports-gnome-55e5c34e31b90aa95311b10bd4a3072f2163ebfe.tar.gz freebsd-ports-gnome-55e5c34e31b90aa95311b10bd4a3072f2163ebfe.tar.zst freebsd-ports-gnome-55e5c34e31b90aa95311b10bd4a3072f2163ebfe.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)
Diffstat (limited to 'x11-drivers/xf86-input-keyboard')
| -rw-r--r-- | x11-drivers/xf86-input-keyboard/Makefile | 2 | ||||
| -rw-r--r-- | x11-drivers/xf86-input-keyboard/pkg-plist | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/x11-drivers/xf86-input-keyboard/Makefile b/x11-drivers/xf86-input-keyboard/Makefile index 3518e1752747..346ac4d17aaa 100644 --- a/x11-drivers/xf86-input-keyboard/Makefile +++ b/x11-drivers/xf86-input-keyboard/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-input-keyboard PORTVERSION= 1.8.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-input-keyboard/pkg-plist b/x11-drivers/xf86-input-keyboard/pkg-plist index a2281aefc6f9..26a84c9a47a2 100644 --- a/x11-drivers/xf86-input-keyboard/pkg-plist +++ b/x11-drivers/xf86-input-keyboard/pkg-plist @@ -1,4 +1,3 @@ -lib/xorg/modules/input/kbd_drv.la lib/xorg/modules/input/kbd_drv.so man/man4/kbd.4x.gz @dirrmtry lib/xorg/modules/input |