[gentoo-commits] proj/gcc-config:master commit in: /

["Mike Frysinger" <vapier@gentoo.org>]

commit:     12a60e3fea8fe751f26d3153fbd940fad085038f
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 19 01:03:14 2012 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Nov 19 01:03:14 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gcc-config.git;a=commit;h=12a60e3f

gcc-config: clean up libgcj pc files better

We need to clean up libgcj when switching to versions that do not have
gcj support enabled.  We should also clean up all broken symlinks that
might be orphaned due to the unmerging of older versions.

URL: http://bugs.gentoo.org/430932
Reported-by: Arfrever Frehtes Taifersar Arahesis <arfrever.fta <AT> gmail.com>
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 gcc-config |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/gcc-config b/gcc-config
index 0445335..0406f95 100755
--- a/gcc-config
+++ b/gcc-config
@@ -422,14 +422,19 @@ switch_profile() {
 		ln -sf ${CC_COMP} "${GCC_ENV_D}/.NATIVE"
 
 		# Relocate random crap
-		if [[ -e ${ROOT}/usr/${GENTOO_LIBDIR}/pkgconfig/libgcj-${CC_COMP_VERSION}.pc ]] ; then
-			local mver=${CC_COMP_VERSION:0:3}
-			for x in "" "-${mver}" ; do
-				x="${ROOT}/usr/lib/pkgconfig/libgcj${x}.pc"
+		local pkgconfdir="${ROOT}/usr/${GENTOO_LIBDIR}/pkgconfig"
+		local mver=${CC_COMP_VERSION:0:3}
+		for x in "" "-${mver}" ; do
+			x="${pkgconfdir}/libgcj${x}.pc"
+			if [[ -e ${pkgconfdir}/libgcj-${CC_COMP_VERSION}.pc ]] ; then
+				ln -sf libgcj-${CC_COMP_VERSION}.pc "${x}"
+			else
+				# Maybe we selected a version that lacks gcj support.
 				rm -f "${x}"
-				ln -s libgcj-${CC_COMP_VERSION}.pc "${x}"
-			done
-		fi
+			fi
+		done
+		# Clean out anything left over from older versions. #430932
+		find "${pkgconfdir}"/libgcj*.pc -xtype l -delete 2>/dev/null
 
 		handle_split_usr
 		: $(( envd_changed += $? ))