sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to devel-merged-gcc grimoire by Eric Sandall (f9604fab09f0bef7b2bec9fe987b61bf9515373f)
- From: Eric Sandall <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to devel-merged-gcc grimoire by Eric Sandall (f9604fab09f0bef7b2bec9fe987b61bf9515373f)
- Date: Wed, 18 Aug 2010 11:09:42 -0500
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
- [SM-Commit] GIT changes to devel-merged-gcc grimoire by Eric Sandall (f9604fab09f0bef7b2bec9fe987b61bf9515373f), Eric Sandall, 08/18/2010
Archive powered by MHonArc 2.6.24.