[patch] gcc-2.95.3-r9.ebuild.diff

gcc-2.95.3-r9.ebuild.diff (text/plain), 2.19 KB, created by Harald van Dijk (RETIRED) on 2006-03-01 15:43:26 UTC

--- gcc-2.95.3-r9.ebuild
+++ gcc-2.95.3-r9.ebuild
@@ -50,7 +50,7 @@
 IUSE="static nls build multislot nocxx fortran"
 
 if use multislot ; then
-	SLOT="${CTARGET}-${GCC_CONFIG_VER}"
+	SLOT="${CTARGET}-${GCC_RELEASE_VER}"
 elif [[ ${CTARGET} != ${CHOST} ]] ; then
 	SLOT="${CTARGET}-${GCC_BRANCH_VER}"
 else
@@ -215,6 +215,11 @@
 			if [[ ${CHOST} == ${CTARGET} ]] && [[ -f ${CTARGET}-${x} ]] ; then
 				[[ ! -f ${x} ]] && mv ${CTARGET}-${x} ${x}
 				ln -sf ${x} ${CTARGET}-${x}
+
+				dosym ${BINPATH}/${CTARGET}-${x} \
+					/usr/bin/${CTARGET}-${x}-${GCC_RELEASE_VER}
+				dosym ${BINPATH}/${CTARGET}-${x} \
+					/usr/bin/${x}-${GCC_RELEASE_VER}
 			fi
 		done
 	fi
@@ -259,9 +264,47 @@
 	fi
 	has noman ${FEATURES} && rm -r "${D}"/${DATAPATH}/man
 	has noinfo ${FEATURES} && rm -r "${D}"/${DATAPATH}/info
+
+	local conf="${D}/etc/eselect/compiler/${CTARGET}-${GCC_RELEASE_VER}.conf"
+	dodir /etc/eselect/compiler
+	cat >"${conf}" <<EOF
+[global]
+	version=${CTARGET}-${GCC_RELEASE_VER}
+	binpath=${BINPATH}
+	manpath=${DATAPATH}/man
+	infopath=${DATAPATH}/info
+	alias_cc=gcc
+	stdcxx_incdir=${STDCXX_INCDIR##*/}
+	bin_prefix=${CTARGET}
+EOF
+	[[ -x ${D}/${BINPATH}/${CTARGET}-g77 ]] \
+	 && echo "	alias_gfortran=g77" >> "${conf}"
+	cat >>"${conf}" <<EOF
+
+[vanilla]
+	ctarget=${CTARGET}
+	ldpath=${LIBPATH}
+EOF
 }
 
 pkg_postinst() {
 	[[ ${ROOT} != "/" ]] && return 0
-	gcc-config --use-portage-chost ${CTARGET}-${GCC_RELEASE_VER}
+
+	local curr_config curr_config_ver
+	if has_version 'app-admin/eselect-compiler' ; then
+		curr_config=$(env -i eselect compiler show ${CTARGET} 2>&1)
+		curr_config_ver=$(echo ${curr_config} | cut -f1 -d/ | awk -F - '{ print $5 }')
+	else
+		curr_config=$(env -i gcc-config -c ${CTARGET} 2>&1)
+		curr_config_ver=$(env -i gcc-config -S ${curr_config} | awk '{ print $2 }')
+	fi
+	local curr_branch_ver=$(get_version_component_range 1-2 ${curr_config_ver})
+	if [[ ${curr_branch_ver} == ${GCC_BRANCH_VER} ]] ||
+	   ( use multislot && [[ ${curr_config_ver} == ${GCC_RELEASE_VER} ]] ); then
+		if has_version 'app-admin/eselect-compiler' ; then
+			eselect compiler set ${CTARGET}-${GCC_RELEASE_VER}/vanilla
+		else
+			gcc-config --use-portage-chost ${CTARGET}-${GCC_RELEASE_VER}
+		fi
+	fi
 }