summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2005-10-05 09:08:08 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2005-10-05 09:08:08 +0000
commitc8e2844e475ba19625f5ca9fed0fc2eeab388924 (patch)
tree699e447aaa7c825b4150f85378e1b5616333f673 /app-admin/eselect-compiler/files
parentFixed spec->specs in eselect-compiler config file. Thanks Christophe Saout <... (diff)
downloadgentoo-2-c8e2844e475ba19625f5ca9fed0fc2eeab388924.tar.gz
gentoo-2-c8e2844e475ba19625f5ca9fed0fc2eeab388924.tar.bz2
gentoo-2-c8e2844e475ba19625f5ca9fed0fc2eeab388924.zip
Revbump to fix a problem when choosing the reference file for touch on crosscompilers and let postinst fix spec->specs in the conf files.
(Portage version: 2.0.53_rc3)
Diffstat (limited to 'app-admin/eselect-compiler/files')
-rw-r--r--app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_beta2-r1 (renamed from app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_beta2)0
-rw-r--r--app-admin/eselect-compiler/files/eselect-compiler-2.0.0_beta2-ref.patch24
-rw-r--r--app-admin/eselect-compiler/files/eselect-compiler-2.0.0_beta2-specs.patch13
3 files changed, 37 insertions, 0 deletions
diff --git a/app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_beta2 b/app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_beta2-r1
index 72093159868e..72093159868e 100644
--- a/app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_beta2
+++ b/app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_beta2-r1
diff --git a/app-admin/eselect-compiler/files/eselect-compiler-2.0.0_beta2-ref.patch b/app-admin/eselect-compiler/files/eselect-compiler-2.0.0_beta2-ref.patch
new file mode 100644
index 000000000000..bf0d3599dead
--- /dev/null
+++ b/app-admin/eselect-compiler/files/eselect-compiler-2.0.0_beta2-ref.patch
@@ -0,0 +1,24 @@
+Index: compiler.eselect.in
+===================================================================
+--- a/src/profile-manager/compiler.eselect.in (revision 202)
++++ a/src/profile-manager/compiler.eselect.in (working copy)
+@@ -433,10 +433,17 @@
+ # happy. See Bug #70548 for more info.
+ if has ${bin} ${COMPILER_CONFIG_ALIASES} ; then
+ set_v="COMPILER_CONFIG_ALIAS_${bin}"
+- ref="${ROOT}/${COMPILER_CONFIG_BINPATH}/${!set_v}"
++ ref="${!set_v}"
+ else
+- ref="${ROOT}/${COMPILER_CONFIG_BINPATH}/${bin}"
++ ref="${bin}"
+ fi
++
++ if [[ -f "${ROOT}/${COMPILER_CONFIG_BINPATH}/${ref}" ]] ; then
++ ref="${ROOT}/${COMPILER_CONFIG_BINPATH}/${ref}"
++ else
++ ref="${ROOT}/${COMPILER_CONFIG_BINPATH}/${ctarget}-${ref}"
++ fi
++
+ cp -f "${WRAPPER}" "${bindir}/${ctarget}-${bin}"
+ touch -r "${ref}" "${bindir}/${ctarget}-${bin}"
+
diff --git a/app-admin/eselect-compiler/files/eselect-compiler-2.0.0_beta2-specs.patch b/app-admin/eselect-compiler/files/eselect-compiler-2.0.0_beta2-specs.patch
new file mode 100644
index 000000000000..218cb6d3d2da
--- /dev/null
+++ b/app-admin/eselect-compiler/files/eselect-compiler-2.0.0_beta2-specs.patch
@@ -0,0 +1,13 @@
+Index: compiler.eselect.in
+===================================================================
+--- a/src/profile-manager/compiler.eselect.in (revision 203)
++++ a/src/profile-manager/compiler.eselect.in (working copy)
+@@ -678,7 +678,7 @@
+ [[ -n ${val} ]] && echo " ldpath=${val}" >> ${conf}
+
+ val=$(load_config "${file}" GCC_SPECS)
+- [[ -n ${val} ]] && echo " spec=${val}" >> ${conf}
++ [[ -n ${val} ]] && echo " specs=${val}" >> ${conf}
+
+ echo >> ${conf}
+ done