From eeeca055dfaf9516a9439b40a60037d7619861e4 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 5 Jan 2005 05:33:34 +0000 Subject: [PATCH] Make sure that when we switch compilers, we dont accidently invalidate all of our ccache data #70548. --- sys-devel/gcc-config/ChangeLog | 9 ++++++++- sys-devel/gcc-config/Manifest | 14 +++++++------- ...onfig-1.3.8-r3 => digest-gcc-config-1.3.8-r4} | 0 sys-devel/gcc-config/files/gcc-config-1.3.8 | 16 +++++++++------- ....3.8-r3.ebuild => gcc-config-1.3.8-r4.ebuild} | 2 +- 5 files changed, 25 insertions(+), 16 deletions(-) rename sys-devel/gcc-config/files/{digest-gcc-config-1.3.8-r3 => digest-gcc-config-1.3.8-r4} (100%) rename sys-devel/gcc-config/{gcc-config-1.3.8-r3.ebuild => gcc-config-1.3.8-r4.ebuild} (95%) diff --git a/sys-devel/gcc-config/ChangeLog b/sys-devel/gcc-config/ChangeLog index 7af85f31ea21..70d6f1117809 100644 --- a/sys-devel/gcc-config/ChangeLog +++ b/sys-devel/gcc-config/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-devel/gcc-config # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.74 2005/01/03 00:02:43 ciaranm Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.75 2005/01/05 05:33:34 vapier Exp $ + +*gcc-config-1.3.8-r4 (05 Jan 2005) + + 05 Jan 2005; Mike Frysinger files/gcc-config-1.3.8, + -gcc-config-1.3.8-r3.ebuild, +gcc-config-1.3.8-r4.ebuild: + Make sure that when we switch compilers, we dont accidently invalidate all + of our ccache data #70548. 03 Jan 2005; Ciaran McCreesh : Change encoding to UTF-8 for GLEP 31 compliance diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest index ef03383b8b0f..4f5f30eda3a5 100644 --- a/sys-devel/gcc-config/Manifest +++ b/sys-devel/gcc-config/Manifest @@ -2,19 +2,19 @@ Hash: SHA1 MD5 8d1e179549c1c01e991cd0eebd80f0d8 gcc-config-1.3.9.ebuild 1371 -MD5 694cfbc3b3c915b77e4f1e4f9af8cf37 ChangeLog 14713 +MD5 5d9bf515454f54cc1fa8c6f39ff6dc25 ChangeLog 14989 +MD5 4b9c47ec37e9e99b4811baaca5c1ce8f gcc-config-1.3.8-r4.ebuild 1347 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162 -MD5 4afa82e91f513ea1db20555dcdfd2c74 gcc-config-1.3.8-r3.ebuild 1347 -MD5 081d4327e878875cbebc11e8ebb0cbec files/gcc-config-1.3.8 12381 +MD5 bd9ae2143c2f5ba864ec1261284d0689 files/gcc-config-1.3.8 12455 +MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.8-r4 0 MD5 e8a654e548e74887bcd99ed224a9efca files/gcc-config-1.3.9 12326 MD5 7723c767ef3e4935c2299fb253412d7e files/wrapper-1.4.4.c 10132 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.9 0 MD5 e7c7a83406a374ee4262c97d6e5673b2 files/wrapper-1.4.3.c 7545 -MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.8-r3 0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.9.10 (GNU/Linux) -iD8DBQFB2sgRroRuSHgZdywRAmzvAJ9QOOzguUh7ODFoyAdHvDo0bxI/OQCfVq33 -wsOoJklR07+WePPCjr32ey0= -=9RTu +iD8DBQFB23w1roRuSHgZdywRAp9rAKCGstjdHtW2S0dZj0l7VKZSvFVcRgCff2I5 +Yu7g/9MRU2QELM1HVXrCLlE= +=3Aek -----END PGP SIGNATURE----- diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.3.8-r3 b/sys-devel/gcc-config/files/digest-gcc-config-1.3.8-r4 similarity index 100% rename from sys-devel/gcc-config/files/digest-gcc-config-1.3.8-r3 rename to sys-devel/gcc-config/files/digest-gcc-config-1.3.8-r4 diff --git a/sys-devel/gcc-config/files/gcc-config-1.3.8 b/sys-devel/gcc-config/files/gcc-config-1.3.8 index 402c76a6caf3..4c5b43b72296 100755 --- a/sys-devel/gcc-config/files/gcc-config-1.3.8 +++ b/sys-devel/gcc-config/files/gcc-config-1.3.8 @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.8,v 1.4 2004/12/29 01:05:58 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.8,v 1.5 2005/01/05 05:33:34 vapier Exp $ # Author: Martin Schlemmer trap ":" INT QUIT TSTP @@ -199,14 +199,16 @@ switch_profile() { && ${RM} -f "${ROOT}/usr/bin/${x}"{32,64} # Only install a wrapper if the binary exists ... - # If installing one of the C++ binaries, check to see - # if g++ exists so we don't install crappy wrappers - if ([[ -x ${ROOT}/${GCC_BIN_PATH}/${x} || ${x} = "cc" ]]) || \ - ([[ ${x} = "c++" || ${x} = ${CTARGET}-c++ || ${x} = "cpp" ]] && \ - [[ -x ${ROOT}/${GCC_BIN_PATH}/${CTARGET}-g++ ]]) - then + # We want to figure out the 'reference file' for each + # wrapper (the binary we're 'wrapping') so that we can + # sync mtimes together. This makes things like ccache + # happy. See Bug #70548 for more info. + local ref=${ROOT}/${GCC_BIN_PATH}/${x} + [[ ${x} = "cc" ]] && ref=${ROOT}/${GCC_BIN_PATH}/gcc + if [[ -x ${ref} ]] ; then ${CP} -f "${ROOT}/usr/lib/gcc-config/wrapper" \ "${ROOT}/usr/bin/${x}" + touch -r "${ref}" "${ROOT}/usr/bin/${x}" # Install 32bit and 64bit wrappers if need be # This should probably get folded back into the wrapper ... diff --git a/sys-devel/gcc-config/gcc-config-1.3.8-r3.ebuild b/sys-devel/gcc-config/gcc-config-1.3.8-r4.ebuild similarity index 95% rename from sys-devel/gcc-config/gcc-config-1.3.8-r3.ebuild rename to sys-devel/gcc-config/gcc-config-1.3.8-r4.ebuild index 0bd272179a25..e21f219b50ba 100644 --- a/sys-devel/gcc-config/gcc-config-1.3.8-r3.ebuild +++ b/sys-devel/gcc-config/gcc-config-1.3.8-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.3.8-r3.ebuild,v 1.2 2005/01/01 21:42:08 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.3.8-r4.ebuild,v 1.1 2005/01/05 05:33:34 vapier Exp $ inherit toolchain-funcs -- 2.26.2