From: Mike Gilbert <floppym@gentoo.org>
Date: Mon, 17 Jul 2017 20:30:58 +0000 (-0400)
Subject: sys-fs/udev: use chrpath instead of patchelf
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f0ba17f4d1ad4caadae0e10f23fbbf904a6db953;p=gentoo.git

sys-fs/udev: use chrpath instead of patchelf

patchelf does not work on ARM.

Bug: https://github.com/NixOS/patchelf/issues/8
Package-Manager: Portage-2.3.6_p16, Repoman-2.3.2_p84
---

diff --git a/sys-fs/udev/udev-234.ebuild b/sys-fs/udev/udev-234.ebuild
index a0c39c43d084..4c5033630304 100644
--- a/sys-fs/udev/udev-234.ebuild
+++ b/sys-fs/udev/udev-234.ebuild
@@ -41,11 +41,11 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.27.1[${MULTILIB_USEDEP}]
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
 	)"
 DEPEND="${COMMON_DEPEND}
+	app-admin/chrpath
 	dev-util/gperf
 	>=dev-util/intltool-0.50
 	>=dev-util/meson-0.40.0
 	dev-util/ninja
-	>=dev-util/patchelf-0.9
 	>=sys-apps/coreutils-8.16
 	virtual/os-headers
 	virtual/pkgconfig
@@ -172,10 +172,7 @@ multilib_src_compile() {
 
 # meson uses an private python script for this
 strip_rpath() {
-	local x
-	for x; do
-		patchelf --remove-rpath "${x}" || die
-	done
+	chrpath -d "$@" || die
 }
 
 multilib_src_install() {
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index a0c39c43d084..4c5033630304 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -41,11 +41,11 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.27.1[${MULTILIB_USEDEP}]
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
 	)"
 DEPEND="${COMMON_DEPEND}
+	app-admin/chrpath
 	dev-util/gperf
 	>=dev-util/intltool-0.50
 	>=dev-util/meson-0.40.0
 	dev-util/ninja
-	>=dev-util/patchelf-0.9
 	>=sys-apps/coreutils-8.16
 	virtual/os-headers
 	virtual/pkgconfig
@@ -172,10 +172,7 @@ multilib_src_compile() {
 
 # meson uses an private python script for this
 strip_rpath() {
-	local x
-	for x; do
-		patchelf --remove-rpath "${x}" || die
-	done
+	chrpath -d "$@" || die
 }
 
 multilib_src_install() {