| 1 |
commit: f0ba17f4d1ad4caadae0e10f23fbbf904a6db953 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 17 20:30:58 2017 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 17 20:31:06 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0ba17f4 |
| 7 |
|
| 8 |
sys-fs/udev: use chrpath instead of patchelf |
| 9 |
|
| 10 |
patchelf does not work on ARM. |
| 11 |
|
| 12 |
Bug: https://github.com/NixOS/patchelf/issues/8 |
| 13 |
Package-Manager: Portage-2.3.6_p16, Repoman-2.3.2_p84 |
| 14 |
|
| 15 |
sys-fs/udev/udev-234.ebuild | 7 ++----- |
| 16 |
sys-fs/udev/udev-9999.ebuild | 7 ++----- |
| 17 |
2 files changed, 4 insertions(+), 10 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sys-fs/udev/udev-234.ebuild b/sys-fs/udev/udev-234.ebuild |
| 20 |
index a0c39c43d08..4c503363030 100644 |
| 21 |
--- a/sys-fs/udev/udev-234.ebuild |
| 22 |
+++ b/sys-fs/udev/udev-234.ebuild |
| 23 |
@@ -41,11 +41,11 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.27.1[${MULTILIB_USEDEP}] |
| 24 |
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
| 25 |
)" |
| 26 |
DEPEND="${COMMON_DEPEND} |
| 27 |
+ app-admin/chrpath |
| 28 |
dev-util/gperf |
| 29 |
>=dev-util/intltool-0.50 |
| 30 |
>=dev-util/meson-0.40.0 |
| 31 |
dev-util/ninja |
| 32 |
- >=dev-util/patchelf-0.9 |
| 33 |
>=sys-apps/coreutils-8.16 |
| 34 |
virtual/os-headers |
| 35 |
virtual/pkgconfig |
| 36 |
@@ -172,10 +172,7 @@ multilib_src_compile() { |
| 37 |
|
| 38 |
# meson uses an private python script for this |
| 39 |
strip_rpath() { |
| 40 |
- local x |
| 41 |
- for x; do |
| 42 |
- patchelf --remove-rpath "${x}" || die |
| 43 |
- done |
| 44 |
+ chrpath -d "$@" || die |
| 45 |
} |
| 46 |
|
| 47 |
multilib_src_install() { |
| 48 |
|
| 49 |
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild |
| 50 |
index a0c39c43d08..4c503363030 100644 |
| 51 |
--- a/sys-fs/udev/udev-9999.ebuild |
| 52 |
+++ b/sys-fs/udev/udev-9999.ebuild |
| 53 |
@@ -41,11 +41,11 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.27.1[${MULTILIB_USEDEP}] |
| 54 |
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
| 55 |
)" |
| 56 |
DEPEND="${COMMON_DEPEND} |
| 57 |
+ app-admin/chrpath |
| 58 |
dev-util/gperf |
| 59 |
>=dev-util/intltool-0.50 |
| 60 |
>=dev-util/meson-0.40.0 |
| 61 |
dev-util/ninja |
| 62 |
- >=dev-util/patchelf-0.9 |
| 63 |
>=sys-apps/coreutils-8.16 |
| 64 |
virtual/os-headers |
| 65 |
virtual/pkgconfig |
| 66 |
@@ -172,10 +172,7 @@ multilib_src_compile() { |
| 67 |
|
| 68 |
# meson uses an private python script for this |
| 69 |
strip_rpath() { |
| 70 |
- local x |
| 71 |
- for x; do |
| 72 |
- patchelf --remove-rpath "${x}" || die |
| 73 |
- done |
| 74 |
+ chrpath -d "$@" || die |
| 75 |
} |
| 76 |
|
| 77 |
multilib_src_install() { |
Archives