| 1 |
commit: 6df30c1c432832ceee6eed94f2ed263499b52035 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 17 21:15:15 2017 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 17 21:15:35 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6df30c1c |
| 7 |
|
| 8 |
sys-fs/udev: drop dependency on chrpath |
| 9 |
|
| 10 |
Setting linked-udev-shared=false makes this unnecessary. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.6_p16, Repoman-2.3.2_p84 |
| 13 |
|
| 14 |
sys-fs/udev/udev-234.ebuild | 10 ---------- |
| 15 |
sys-fs/udev/udev-9999.ebuild | 10 ---------- |
| 16 |
2 files changed, 20 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-fs/udev/udev-234.ebuild b/sys-fs/udev/udev-234.ebuild |
| 19 |
index 4c503363030..b7834ccec24 100644 |
| 20 |
--- a/sys-fs/udev/udev-234.ebuild |
| 21 |
+++ b/sys-fs/udev/udev-234.ebuild |
| 22 |
@@ -41,7 +41,6 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.27.1[${MULTILIB_USEDEP}] |
| 23 |
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
| 24 |
)" |
| 25 |
DEPEND="${COMMON_DEPEND} |
| 26 |
- app-admin/chrpath |
| 27 |
dev-util/gperf |
| 28 |
>=dev-util/intltool-0.50 |
| 29 |
>=dev-util/meson-0.40.0 |
| 30 |
@@ -170,16 +169,10 @@ multilib_src_compile() { |
| 31 |
eninja "${targets[@]}" |
| 32 |
} |
| 33 |
|
| 34 |
-# meson uses an private python script for this |
| 35 |
-strip_rpath() { |
| 36 |
- chrpath -d "$@" || die |
| 37 |
-} |
| 38 |
- |
| 39 |
multilib_src_install() { |
| 40 |
local libudev=$(readlink src/libudev/libudev.so.1) |
| 41 |
|
| 42 |
into / |
| 43 |
- strip_rpath src/libudev/${libudev} |
| 44 |
dolib.so src/libudev/{${libudev},libudev.so.1,libudev.so} |
| 45 |
|
| 46 |
insinto "/usr/$(get_libdir)/pkgconfig" |
| 47 |
@@ -187,15 +180,12 @@ multilib_src_install() { |
| 48 |
|
| 49 |
if multilib_is_native_abi; then |
| 50 |
into / |
| 51 |
- strip_rpath udevadm |
| 52 |
dobin udevadm |
| 53 |
|
| 54 |
exeinto /lib/systemd |
| 55 |
- strip_rpath systemd-udevd |
| 56 |
doexe systemd-udevd |
| 57 |
|
| 58 |
exeinto /lib/udev |
| 59 |
- strip_rpath src/udev/{ata_id,cdrom_id,collect,mtd_probe,scsi_id,v4l_id} |
| 60 |
doexe src/udev/{ata_id,cdrom_id,collect,mtd_probe,scsi_id,v4l_id} |
| 61 |
|
| 62 |
rm rules/99-systemd.rules || die |
| 63 |
|
| 64 |
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild |
| 65 |
index 4c503363030..b7834ccec24 100644 |
| 66 |
--- a/sys-fs/udev/udev-9999.ebuild |
| 67 |
+++ b/sys-fs/udev/udev-9999.ebuild |
| 68 |
@@ -41,7 +41,6 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.27.1[${MULTILIB_USEDEP}] |
| 69 |
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
| 70 |
)" |
| 71 |
DEPEND="${COMMON_DEPEND} |
| 72 |
- app-admin/chrpath |
| 73 |
dev-util/gperf |
| 74 |
>=dev-util/intltool-0.50 |
| 75 |
>=dev-util/meson-0.40.0 |
| 76 |
@@ -170,16 +169,10 @@ multilib_src_compile() { |
| 77 |
eninja "${targets[@]}" |
| 78 |
} |
| 79 |
|
| 80 |
-# meson uses an private python script for this |
| 81 |
-strip_rpath() { |
| 82 |
- chrpath -d "$@" || die |
| 83 |
-} |
| 84 |
- |
| 85 |
multilib_src_install() { |
| 86 |
local libudev=$(readlink src/libudev/libudev.so.1) |
| 87 |
|
| 88 |
into / |
| 89 |
- strip_rpath src/libudev/${libudev} |
| 90 |
dolib.so src/libudev/{${libudev},libudev.so.1,libudev.so} |
| 91 |
|
| 92 |
insinto "/usr/$(get_libdir)/pkgconfig" |
| 93 |
@@ -187,15 +180,12 @@ multilib_src_install() { |
| 94 |
|
| 95 |
if multilib_is_native_abi; then |
| 96 |
into / |
| 97 |
- strip_rpath udevadm |
| 98 |
dobin udevadm |
| 99 |
|
| 100 |
exeinto /lib/systemd |
| 101 |
- strip_rpath systemd-udevd |
| 102 |
doexe systemd-udevd |
| 103 |
|
| 104 |
exeinto /lib/udev |
| 105 |
- strip_rpath src/udev/{ata_id,cdrom_id,collect,mtd_probe,scsi_id,v4l_id} |
| 106 |
doexe src/udev/{ata_id,cdrom_id,collect,mtd_probe,scsi_id,v4l_id} |
| 107 |
|
| 108 |
rm rules/99-systemd.rules || die |
Archives