[Lunar-commits] r23928 - in moonbase/trunk/compilers: gcc gcc2 gcc3

[Auke Kok]

Author: sofar
Date: 2007-04-05 17:41:57 +0200 (Thu, 05 Apr 2007)
New Revision: 23928

Removed:
   moonbase/trunk/compilers/gcc/CONFLICTS
   moonbase/trunk/compilers/gcc3/CONFLICTS
Modified:
   moonbase/trunk/compilers/gcc2/DETAILS
   moonbase/trunk/compilers/gcc3/DETAILS
Log:
Removing these conflicts as they are harmful:

If you wish to install gcc2, 3 and 4 together the *default* should be
that gcc4 installs in /usr and 2 and 3 in /opt.

Added a GCC2_PREFIX. Make GCC3_PREFIX default to /opt/lunar/gcc3.

Don't make these conflict, deleting your compiler is not a good idea.

If you wish to *solely* use gcc3 only, set GCC3_PREFIX to /usr, do
`lin gcc3` and `lsh remove_module gcc` to accomplish.


Deleted: moonbase/trunk/compilers/gcc/CONFLICTS

Modified: moonbase/trunk/compilers/gcc2/DETAILS
===================================================================
--- moonbase/trunk/compilers/gcc2/DETAILS	2007-04-05 10:44:35 UTC (rev 23927)
+++ moonbase/trunk/compilers/gcc2/DETAILS	2007-04-05 15:41:57 UTC (rev 23928)
@@ -1,10 +1,10 @@
           MODULE=gcc2
          VERSION=2.95.3
   PASCAL_VERSION=20011222
-   MODULE_PREFIX=/opt/lunar/gcc/2.95
+   MODULE_PREFIX=${GCC2_PREFIX:-/opt/lunar/gcc2}
           SOURCE=gcc-$VERSION.tar.gz
          SOURCE2=gpc-$PASCAL_VERSION.tar.gz
-	 SOURCE3=gcc-2.95.3-2.patch.bz2
+         SOURCE3=gcc-2.95.3-2.patch.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION
    SOURCE_URL[0]=$GNU_URL/gcc/
    SOURCE_URL[1]=ftp://ftp.gnu.org/pub/gnu/gcc/

Deleted: moonbase/trunk/compilers/gcc3/CONFLICTS

Modified: moonbase/trunk/compilers/gcc3/DETAILS
===================================================================
--- moonbase/trunk/compilers/gcc3/DETAILS	2007-04-05 10:44:35 UTC (rev 23927)
+++ moonbase/trunk/compilers/gcc3/DETAILS	2007-04-05 15:41:57 UTC (rev 23928)
@@ -3,7 +3,7 @@
          VERSION=3.4.6
           SOURCE=$PKG-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$PKG-$VERSION
-   MODULE_PREFIX=${GCC3_PREFIX:-/usr}
+   MODULE_PREFIX=${GCC3_PREFIX:-/opt/lunar/gcc3}
    SOURCE_URL[0]=$GNU_URL/gcc/$PKG-$VERSION/
    SOURCE_URL[1]=ftp://ftp.gnu.org/pub/gnu/gcc/$PKG-$VERSION/
    SOURCE_URL[2]=http://www.online-mirror.org/gcc/$PKG-$VERSION/