[Midnightbsd-cvs] mports: bsd.gnustep.mk: Remove GCC 4.0, add 4.3.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Apr 14 00:18:25 EDT 2008
Log Message:
-----------
Remove GCC 4.0, add 4.3. Document the default gcc version properly.
Modified Files:
--------------
mports/Mk:
bsd.gnustep.mk (r1.15 -> r1.16)
-------------- next part --------------
Index: bsd.gnustep.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.gnustep.mk,v
retrieving revision 1.15
retrieving revision 1.16
diff -L Mk/bsd.gnustep.mk -L Mk/bsd.gnustep.mk -u -r1.15 -r1.16
--- Mk/bsd.gnustep.mk
+++ Mk/bsd.gnustep.mk
@@ -31,17 +31,16 @@
# use gcc 3.3.x with objective C shared libraries.
#
# GNUSTEP_WITH_GCC34=yes
-# use gcc 3.4.x with objective C shared libraries (default).
-#
-# GNUSTEP_WITH_GCC40=yes
-# use gcc 4.0.x with objective C shared libraries.
+# use gcc 3.4.x with objective C shared libraries.
#
# GNUSTEP_WITH_GCC41=yes
-# use gcc 4.1.x with objective C shared libraries.
+# use gcc 4.1.x with objective C shared libraries. (default)
#
# GNUSTEP_WITH_GCC42=yes
# use gcc 4.2.x with objective C shared libraries.
#
+# GNUSTEP_WITH_GCC43=yes
+# use gcc 4.3.x with objective C shared libraries.
#
# Options for a port before include this file:
# ============================================
@@ -217,9 +216,10 @@
PLIST_SUB+= LIBVERSION=${DEFAULT_LIBVERSION}
PLIST_SUB+= MAJORLIBVERSION=${DEFAULT_LIBVERSION:C/([0-9]).*/\1/1}
+# Set base version
.if !defined(GNUSTEP_WITH_BASE_GCC)
.if !defined(GNUSTEP_WITH_GCC32) && !defined(GNUSTEP_WITH_GCC33) && !defined(GNUSTEP_WITH_GCC34)
-.if !defined(GNUSTEP_WITH_GCC40) && !defined(GNUSTEP_WITH_GCC41) && !defined(GNUSTEP_WITH_GCC42)
+.if !defined(GNUSTEP_WITH_GCC41) && !defined(GNUSTEP_WITH_GCC42) && !defined(GNUSTEP_WITH_GCC43)
GNUSTEP_WITH_GCC41= yes
.endif
.endif
@@ -234,15 +234,15 @@
.if defined(GNUSTEP_WITH_GCC34)
GCCSUFFIX=34
.endif
-.if defined(GNUSTEP_WITH_GCC40)
-GCCSUFFIX=40
-.endif
.if defined(GNUSTEP_WITH_GCC41)
GCCSUFFIX=41
.endif
.if defined(GNUSTEP_WITH_GCC42)
GCCSUFFIX=42
.endif
+.if defined(GNUSTEP_WITH_GCC43)
+GCCSUFFIX=43
+.endif
CC= gcc${GCCSUFFIX}
CXX= g++${GCCSUFFIX}
GNUSTEP_GCC_PORT?= lang/gcc${GCCSUFFIX}
More information about the Midnightbsd-cvs
mailing list