Add backwards compat ldso symlink for arm hardfp targets #417287 by Raúl Porcel.

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

7 files changed, 111 insertions, 25 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 37e102abbea0..7c9ff42ce475 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.855 2012/06/01 17:49:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.856 2012/06/01 18:03:35 vapier Exp $
+
+  01 Jun 2012; Mike Frysinger <vapier@gentoo.org> glibc-2.14.1-r2.ebuild,
+  glibc-2.14.1-r3.ebuild, glibc-2.14.ebuild, glibc-2.15-r1.ebuild,
+  glibc-2.15-r2.ebuild:
+  Add backwards compat ldso symlink for arm hardfp targets #417287 by Raúl
+  Porcel.
 
   01 Jun 2012; Mike Frysinger <vapier@gentoo.org> files/eblits/common.eblit,
   files/eblits/src_install.eblit, glibc-2.10.1-r1.ebuild, glibc-2.11.3.ebuild,
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 130077df7ade..8f97a01dbe58 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -61,30 +61,30 @@ EBUILD glibc-2.12.1-r3.ebuild 8447 RMD160 2ecf4a48cbe826b7738e4449319cee712d188b
 EBUILD glibc-2.12.2.ebuild 8446 RMD160 58ebb20836b8d3ed2405b5283dfcae21dff091a7 SHA1 ec2d75eebffdef79caf3bcc192968b0e6c89c36e SHA256 bf8ad578e93d6dd986c387bc19490cff4844aeafcb23601dd8b47da772fda7c2
 EBUILD glibc-2.13-r2.ebuild 8372 RMD160 7caf21b2be9e16697eb58c339ec364f18750049a SHA1 c52184236fa62aa579057e7434b82582ceadd07f SHA256 45a1ee9911739f368d697f2c5e77f63515e644bddb998ea655516f98d1ffd700
 EBUILD glibc-2.13-r4.ebuild 8362 RMD160 139504792489984254fa188001e72aecb7a147a2 SHA1 e006923ad9ea9750111e272fac7fcc437359fa30 SHA256 f9a2555c25b045b73894f4d2ba9057a39c34cfdff11e951b94ed0032f1f0b5d1
-EBUILD glibc-2.14.1-r2.ebuild 8672 RMD160 df1598546720271a5b1ff54e63567c1245f1b281 SHA1 ebbadc668845daa0efc015aed106b08195dd7c56 SHA256 b90f1630f13b56215d85f2f1ea0e2fae3b3e83edee7e7c8ec409ad0edd2d3c25
-EBUILD glibc-2.14.1-r3.ebuild 8669 RMD160 e150a303bd62ac1381e790b456e029ca6634c28e SHA1 817095da9d9c0c67afd7b13e199f4eb2af1b2edc SHA256 434cb8421de5164f4422c5bfc5b0480dfebfa4045394dae19a9bec498ac7c511
-EBUILD glibc-2.14.ebuild 8566 RMD160 a6c9bbcaeb91fdf0eb9610c21fdab0a89cf9b498 SHA1 0efbe1e69cd29140a1226736f7bf76cf3f732b2b SHA256 0a8adbab4acd23aaa909718b212f3ff77dca4c165fb39689121ef8e0d2a3d801
-EBUILD glibc-2.15-r1.ebuild 8300 RMD160 0a5e03b0f4f50c2163436a128cd228346c58198b SHA1 f4ecdd3545a9deb31c50c568c0f1be6d36bc2047 SHA256 f5d26d9f7cb01b19f1530a7ee677d036f7a7cd9cc7b93070b7c2429a88ccb5b3
-EBUILD glibc-2.15-r2.ebuild 7924 RMD160 160394a42eac8b7738798b0a244c3d7bcdb9ff88 SHA1 099755ce1f77451dbbf00d436490eb754a78e741 SHA256 e4821e90d388cfb3b88d27a99df064915afbcc395d9d754d6be1e061e6d0be70
+EBUILD glibc-2.14.1-r2.ebuild 9246 RMD160 91cd8bf98c6cdf1f0f13ac30f8bf1bbc9474d680 SHA1 086c4daecda38309e7c9b4d54ba1265c7b6cf2b8 SHA256 3016f69e405e9d39b8c3183ff6b847b8e85201bb2425215e8dfff0ed44360727
+EBUILD glibc-2.14.1-r3.ebuild 9242 RMD160 795025a6a05f040df2c8594923615b18628bc350 SHA1 685af8320c955c79e4034649be7bd4a72a2b0da0 SHA256 bc300fa99ed55db6848e2e13cbba3e213e6d364a1de3aa9240283c9cc372fbb1
+EBUILD glibc-2.14.ebuild 9139 RMD160 a771736f1b00eca5cefa611c75d9b07963014cf6 SHA1 cbc837304c9b079d632762bd1e0bf580ffacc6f7 SHA256 1ae1d0a8839b7140ad6fa0475321ce8fb74cfbabdb9f82019ca4c1b02df0273a
+EBUILD glibc-2.15-r1.ebuild 8873 RMD160 4138b2957525d2f4e4f9eb99e15cc069f2f12321 SHA1 cf30902da02b2a364b448e1388551fd626b65e07 SHA256 9b76d4eb0924d0ac1e20ec2c42016a14d1ec398d4331443e1d1858fa5bd297c6
+EBUILD glibc-2.15-r2.ebuild 8497 RMD160 dfa06b1778c472b903fd79ddc012f06c84dd9a9b SHA1 824685b8a900818935027c0935282912a2d45e5e SHA256 59a9618855ae2d3bf7465b2598ea95e36e0e2f8bac316eb479f4ee4aed62c3d6
 EBUILD glibc-2.9_p20081201-r3.ebuild 7507 RMD160 fc91f594faae9d5165b44b568fafa17a6725b561 SHA1 67e61b0ff933b89a6816aa1c74442aaf52079a96 SHA256 ab906aa4ca3804f4fbc120ab01a6deef4d93fcf1b56924caf29a5c4ea486e93b
 EBUILD glibc-9999.ebuild 8184 RMD160 d786e7bc387db116765554a70435cb37262bd4b8 SHA1 48787dd5ad473b79c0167a578fc4ceb2d1c1d701 SHA256 35a03ff0e25dfc213dff31fca3debc88c60f92f1f0596941164ccd622b94ff9f
-MISC ChangeLog 44361 RMD160 67aa1855be52811ce418d1d44077e91786c77dd6 SHA1 74d979595dbfa9fcf1a76a87797573f6532e9a59 SHA256 488e9cd2e790c5f7842e56b229c72ac1302cddb50607d6691662d08d57b28257
+MISC ChangeLog 44613 RMD160 c910b49b14d2be39c22ae4fe7dbe674a1367d191 SHA1 21eee8426c8703de486ef189982501d4b4ebaca9 SHA256 20f8d424ad04c721b40c29c6b55e139a0d3e6d26479d204a137d099b1df7bfe0
 MISC ChangeLog-2007 108587 RMD160 cab72e91dbf79869f246537d0d99870a836cc61d SHA1 ab2825c549e4bfe385f7b3d477b594f2317c3b37 SHA256 bd7e842bcda0f9e8375963d71dbb1604e1e8ef89484f3e205afde631eeec2c17
 MISC metadata.xml 276 RMD160 532073ae23585e45260005f9cb7faff78a2f34d4 SHA1 840d8831dbc1a441fe86d812f874961026b5fd66 SHA256 b6767fa81e801d5bb20ba7c96f91674159dddcdedb23e49fb24e93c3a879fd04
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPyQCpAAoJELEHsLL7fEFW+GEQAKoaQB66MsT065pvD48hi2Kp
-m403Tx2HLXBy3vNjqnXv8wtglU5sWjAn7oj7W1Gwp27PZwdgTb9d9/6Hi44MiV68
-APDDCjSP7njcWxa/1PLNO3LepQolVwYMIETqqh1LDnqNP2qvGEkcj8dInvmbKE0G
-Qx+1dnc1A5aE3k/MHYODo6bH32UhhsA3FhWfsdhOFAi7OrtiQpWXQ7WRKQB5/hoe
-Wm8Mqd5UCoetHf9J+TgVUeiMepct3S7nRT+8A1tQkTslwRbtJR8AwdK/p4D3gOY7
-Z1ZWymiOFxaIkcjTMPfIQznMkWJJuDCiE/DHa7fU2YJ25ps9dxOzgimOEIxTjTah
-cpJ0gOwbN5A+CZ9M3GjhpQDCPHjS+rzLguCa9uA7kulh5N+e4pHBYVbmuujplfhv
-f0Vbw3N8XoyKVaUHPR1BM5lGrTTilY+XaA1bZf3UxvJlxBWRZOxp2Klo9m7YWXnG
-9bkUp5xMkBOWKZdFTE1clh3msVL1/g21KBi6tbRfGsqRulpLScpEO6J1M3PjkW1L
-1jvSZevV+ifW19u272kNDQiKHLHa9oqjOfzdves6PGRm80UsVeTMKUs4VzmMHnTV
-Dd/aqEqJA5eU6DD0ui+SsZ5ySANqfR9yXIveQuRsuvce5gzT4Tt6svRlDrj2K7DG
-tjWcyA+6jvvJKcfFIwnM
-=oA1t
+iQIcBAEBAgAGBQJPyQP+AAoJELEHsLL7fEFWRAgP+wbqXUCJ8XNBj1X+PWMo9vJf
+DYejxq8rCVrqC/pLcA/iqIV6ThlGhpKaEq7+U9stwp5sUNyY1v1CAeO5A/YE6UHc
+o3njVLtrvWpAxVp9vBICSa93as2tem0yp2y/fsWK/0vjZvykP6q7yOaNdfy05usn
+tHMKo6mNkvTNyk473f7yFpNyEnwjz9jzCwg1TC+FbnuyuTUbnc4ARhqA6L/HCRui
+RCWgxIe+3aEUq3quBCgi+zdGp6sj208GWAGmUgYNP1ALE6RATjDcAOTEchyA42xj
+efFsxrzldU1I5wvsnvCpL6CCXLladnsMfdpnPVMWyxqTOhpxHlHnIo0m/ngAR0bn
+s9V8pPB26w1ZVoSF3ft+Mo4FS/IsOB76IRn0uOjjaQ8zXE/Xftjj5iCYVmKdcVGK
+wSrmMX8AbDmgneUEbQE6atflT5KoC12Ff1aY/F6hO0BIA+tcC9PMLGrFcWQI/+XW
++DLfokuDdA/7/Azf1mfQuvJ4rzcxW5ZAOK4pQiWjBRquc69q0J/vzfshVkrN1aAG
+Fb75/MbCO8XW78m5G56lZyUB/F3gt60uvnD747pXYoBU3dYKf5slhUKaKG6P4C4G
+jbSPQhMRE3GO6yfmRceF28X/ESZfzXc/HUCoh3Gp2dALdp0eabcPCHdogtOZy5Sf
+LF5Ikf1IM8d7QTFYzeiH
+=PQOP
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.14.1-r2.ebuild b/sys-libs/glibc/glibc-2.14.1-r2.ebuild
index 5c23ad0cfeeb..4ac5838e2f63 100644
--- a/sys-libs/glibc/glibc-2.14.1-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.14.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.1-r2.ebuild,v 1.9 2012/06/01 17:49:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.1-r2.ebuild,v 1.10 2012/06/01 18:03:35 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -233,6 +233,22 @@ eblit-src_unpack-post() {
 	fi
 }
 
+eblit-pkg_preinst-post() {
+	if [[ ${CTARGET} == arm* ]] ; then
+		# Backwards compat support for renaming hardfp ldsos #417287
+		local oldso='/lib/ld-linux.so.3'
+		local nldso='/lib/ld-linux-armhf.so.3'
+		if [[ -e ${D}${nldso} ]] ; then
+			if scanelf -qRyi "${ROOT}$(alt_prefix)"/*bin/ | grep -s "^${oldso}" ; then
+				ewarn "Symlinking old ldso (${oldso}) to new ldso (${nldso})."
+				ewarn "Please rebuild all packages using this old ldso as compat"
+				ewarn "support will be dropped in the future."
+				ln -s "${nldso##*/}" "${D}$(alt_prefix)${oldso}"
+			fi
+		fi
+	fi
+}
+
 maint_pkg_create() {
 	local base="/usr/local/src/gnu/glibc/glibc-${PV:0:1}_${PV:2:1}"
 	cd ${base}
diff --git a/sys-libs/glibc/glibc-2.14.1-r3.ebuild b/sys-libs/glibc/glibc-2.14.1-r3.ebuild
index b5cdddfc0779..4bf7f56e583a 100644
--- a/sys-libs/glibc/glibc-2.14.1-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.14.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.1-r3.ebuild,v 1.17 2012/06/01 17:49:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.1-r3.ebuild,v 1.18 2012/06/01 18:03:35 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -233,6 +233,22 @@ eblit-src_unpack-post() {
 	fi
 }
 
+eblit-pkg_preinst-post() {
+	if [[ ${CTARGET} == arm* ]] ; then
+		# Backwards compat support for renaming hardfp ldsos #417287
+		local oldso='/lib/ld-linux.so.3'
+		local nldso='/lib/ld-linux-armhf.so.3'
+		if [[ -e ${D}${nldso} ]] ; then
+			if scanelf -qRyi "${ROOT}$(alt_prefix)"/*bin/ | grep -s "^${oldso}" ; then
+				ewarn "Symlinking old ldso (${oldso}) to new ldso (${nldso})."
+				ewarn "Please rebuild all packages using this old ldso as compat"
+				ewarn "support will be dropped in the future."
+				ln -s "${nldso##*/}" "${D}$(alt_prefix)${oldso}"
+			fi
+		fi
+	fi
+}
+
 maint_pkg_create() {
 	local base="/usr/local/src/gnu/glibc/glibc-${PV:0:1}_${PV:2:1}"
 	cd ${base}
diff --git a/sys-libs/glibc/glibc-2.14.ebuild b/sys-libs/glibc/glibc-2.14.ebuild
index 31e6da29f259..71615c9b9c36 100644
--- a/sys-libs/glibc/glibc-2.14.ebuild
+++ b/sys-libs/glibc/glibc-2.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.ebuild,v 1.16 2012/06/01 17:49:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.14.ebuild,v 1.17 2012/06/01 18:03:35 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib
 
@@ -229,6 +229,22 @@ eblit-src_unpack-post() {
 	fi
 }
 
+eblit-pkg_preinst-post() {
+	if [[ ${CTARGET} == arm* ]] ; then
+		# Backwards compat support for renaming hardfp ldsos #417287
+		local oldso='/lib/ld-linux.so.3'
+		local nldso='/lib/ld-linux-armhf.so.3'
+		if [[ -e ${D}${nldso} ]] ; then
+			if scanelf -qRyi "${ROOT}$(alt_prefix)"/*bin/ | grep -s "^${oldso}" ; then
+				ewarn "Symlinking old ldso (${oldso}) to new ldso (${nldso})."
+				ewarn "Please rebuild all packages using this old ldso as compat"
+				ewarn "support will be dropped in the future."
+				ln -s "${nldso##*/}" "${D}$(alt_prefix)${oldso}"
+			fi
+		fi
+	fi
+}
+
 maint_pkg_create() {
 	local base="/usr/local/src/gnu/glibc/glibc-${PV:0:1}_${PV:2:1}"
 	cd ${base}
diff --git a/sys-libs/glibc/glibc-2.15-r1.ebuild b/sys-libs/glibc/glibc-2.15-r1.ebuild
index 7ce646d61aba..bb97601b98e2 100644
--- a/sys-libs/glibc/glibc-2.15-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.15-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15-r1.ebuild,v 1.8 2012/06/01 17:49:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15-r1.ebuild,v 1.9 2012/06/01 18:03:35 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib unpacker
 
@@ -220,6 +220,22 @@ eblit-src_unpack-post() {
 	fi
 }
 
+eblit-pkg_preinst-post() {
+	if [[ ${CTARGET} == arm* ]] ; then
+		# Backwards compat support for renaming hardfp ldsos #417287
+		local oldso='/lib/ld-linux.so.3'
+		local nldso='/lib/ld-linux-armhf.so.3'
+		if [[ -e ${D}${nldso} ]] ; then
+			if scanelf -qRyi "${ROOT}$(alt_prefix)"/*bin/ | grep -s "^${oldso}" ; then
+				ewarn "Symlinking old ldso (${oldso}) to new ldso (${nldso})."
+				ewarn "Please rebuild all packages using this old ldso as compat"
+				ewarn "support will be dropped in the future."
+				ln -s "${nldso##*/}" "${D}$(alt_prefix)${oldso}"
+			fi
+		fi
+	fi
+}
+
 maint_pkg_create() {
 	local base="/usr/local/src/gnu/glibc/glibc-${PV:0:1}_${PV:2:1}"
 	cd ${base}
diff --git a/sys-libs/glibc/glibc-2.15-r2.ebuild b/sys-libs/glibc/glibc-2.15-r2.ebuild
index 96e7387d8a0b..31c23dee18ec 100644
--- a/sys-libs/glibc/glibc-2.15-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.15-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15-r2.ebuild,v 1.3 2012/06/01 17:49:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15-r2.ebuild,v 1.4 2012/06/01 18:03:35 vapier Exp $
 
 inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib unpacker
 
@@ -216,6 +216,22 @@ eblit-src_unpack-post() {
 	fi
 }
 
+eblit-pkg_preinst-post() {
+	if [[ ${CTARGET} == arm* ]] ; then
+		# Backwards compat support for renaming hardfp ldsos #417287
+		local oldso='/lib/ld-linux.so.3'
+		local nldso='/lib/ld-linux-armhf.so.3'
+		if [[ -e ${D}${nldso} ]] ; then
+			if scanelf -qRyi "${ROOT}$(alt_prefix)"/*bin/ | grep -s "^${oldso}" ; then
+				ewarn "Symlinking old ldso (${oldso}) to new ldso (${nldso})."
+				ewarn "Please rebuild all packages using this old ldso as compat"
+				ewarn "support will be dropped in the future."
+				ln -s "${nldso##*/}" "${D}$(alt_prefix)${oldso}"
+			fi
+		fi
+	fi
+}
+
 maint_pkg_create() {
 	local base="/usr/local/src/gnu/glibc/glibc-${PV:0:1}_${PV:2:1}"
 	cd ${base}