[SM-Commit] GIT changes to devel-merged-gcc grimoire by Eric Sandall (f9604fab09f0bef7b2bec9fe987b61bf9515373f)

Eric Sandall scm at sourcemage.org
Wed Aug 18 12:09:42 EDT 2010


GIT changes to devel-merged-gcc grimoire by Eric Sandall <sandalle at sourcemage.org>:

 gnu/gcc/CONFLICTS |    5 +++++
 gnu/gcc/HISTORY   |    5 +++++
 2 files changed, 10 insertions(+)

New commits:
commit f9604fab09f0bef7b2bec9fe987b61bf9515373f
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    gcc: Auto-conflict with ada, fortran, g++, gcj, and objc
    This will remove the old stand-alone files before the combined
    gcc installs them.
    
    Should fix this test case:
    	Recasting g++ causes the following:
    	1. g++ to depend on gcc with CXX
    	2. gcc to be cast
    		a. gcc now installs the gcc and g++ binaries
    	3. g++ is now cast, removing the g++ binary

diff --git a/gnu/gcc/CONFLICTS b/gnu/gcc/CONFLICTS
new file mode 100755
index 0000000..4522282
--- /dev/null
+++ b/gnu/gcc/CONFLICTS
@@ -0,0 +1,5 @@
+conflicts ada y
+conflicts fortran y
+conflicts g++ y
+conflicts gcj y
+conflicts objc y
diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index 06267fd..e6a0451 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,3 +1,8 @@
+2010-08-18 Eric Sandall <sandalle at sourcemage.org>
+	* CONFLICTS: Auto-conflict with ada, fortran, g++, gcj, and objc
+	  This will remove the old stand-alone files before the combined gcc
+	  installs them.
+
 2010-08-17 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Updated to 4.4.3
 	* PRE_BUILD: gcc-4.3.0-ffast-math.patch -> gcc-4.4.0-ffast-math.patch



More information about the SM-Commit mailing list