sys-fs/udev: Fixed installation of libudev.so (bug #598988).

Thanks to floppym for reviewing the ebuild patches and creating the
pkgconfig fix he also sent upstream.

Package-Manager: portage-2.3.2
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
This commit is contained in:
Lars Wendler
2016-11-05 14:51:43 +01:00
parent c0a74c15fb
commit 248f71f973
2 changed files with 59 additions and 2 deletions

View File

@@ -0,0 +1,50 @@
From a36dad95c447a5cf65f9e3b66c86e906e7f05890 Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
Date: Sat, 5 Nov 2016 09:17:34 -0400
Subject: [PATCH] Adjust pkgconfig files to point at rootlibdir
The .so symlinks got moved to rootlibdir in 082210c7.
---
Makefile.am | 1 +
src/libsystemd/libsystemd.pc.in | 2 +-
src/libudev/libudev.pc.in | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index f2d8bf5..73144b1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6054,6 +6054,7 @@ EXTRA_DIST += \
# ------------------------------------------------------------------------------
substitutions = \
+ '|rootlibdir=$(rootlibdir)|' \
'|rootlibexecdir=$(rootlibexecdir)|' \
'|rootbindir=$(rootbindir)|' \
'|bindir=$(bindir)|' \
diff --git a/src/libsystemd/libsystemd.pc.in b/src/libsystemd/libsystemd.pc.in
index e8f7950..7e6d499 100644
--- a/src/libsystemd/libsystemd.pc.in
+++ b/src/libsystemd/libsystemd.pc.in
@@ -7,7 +7,7 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
-libdir=@libdir@
+libdir=@rootlibdir@
includedir=@includedir@
Name: systemd
diff --git a/src/libudev/libudev.pc.in b/src/libudev/libudev.pc.in
index a0f3f52..770c922 100644
--- a/src/libudev/libudev.pc.in
+++ b/src/libudev/libudev.pc.in
@@ -7,7 +7,7 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
-libdir=@libdir@
+libdir=@rootlibdir@
includedir=@includedir@
Name: libudev

View File

@@ -122,6 +122,8 @@ src_prepare() {
# stub out the am_path_libcrypt function
echo 'AC_DEFUN([AM_PATH_LIBGCRYPT],[:])' > m4/gcrypt.m4
eapply "${FILESDIR}/systemd-${PV}-pkgconfig.patch"
# apply user patches
eapply_user
@@ -244,9 +246,9 @@ multilib_src_install() {
local pkgconfiglib_DATA="src/libudev/libudev.pc"
local targets=(
install-libLTLIBRARIES
install-includeHEADERS
install-rootbinPROGRAMS
install-rootlibLTLIBRARIES
install-rootlibexecPROGRAMS
install-udevlibexecPROGRAMS
install-dist_udevconfDATA
@@ -272,8 +274,13 @@ multilib_src_install() {
)
emake -j1 DESTDIR="${D}" "${targets[@]}"
doman man/{udev.conf.5,systemd.link.5,udev.7,systemd-udevd.service.8,udevadm.8}
# Compatibility symlink for software that looks for libudev.so
# without using pkg-config
dosym ../../$(get_libdir)/libudev.so.1 \
/usr/$(get_libdir)/libudev.so
else
local rootlib_LTLIBRARIES="libudev.la"
local lib_LTLIBRARIES="libudev.la"
local pkgconfiglib_DATA="src/libudev/libudev.pc"
local include_HEADERS="src/libudev/libudev.h"