Revision

100353

Author

raimue@macports.org

Date

2012-12-08 18:37:02 -0800 (Sat, 08 Dec 2012)

Log Message

group/crossgcc-1.0, cross/{avr,msp430}-gcc{,-devel}:
Add new option crossgcc.languages to port group crossgcc, default to
--enable-languages="c,c++", removing objc,objc++ from the default set.
Simplify ports using this port group (overriding maintainers as this change
does actually change the ports).

Modified Paths

• trunk/dports/_resources/port1.0/group/crossgcc-1.0.tcl
• trunk/dports/cross/avr-gcc/Portfile
• trunk/dports/cross/msp430-gcc/Portfile
• trunk/dports/cross/msp430-gcc-devel/Portfile

Diff

--- trunk/dports/_resources/port1.0/group/crossgcc-1.0.tcl	2012-12-09 02:16:16 UTC (rev 100352)
+++ trunk/dports/_resources/port1.0/group/crossgcc-1.0.tcl	2012-12-09 02:37:02 UTC (rev 100353)
@@ -37,11 +37,18 @@
 #   PortGroup           crossgcc 1.0
 #
 #   crossgcc.setup      arm-none-eabi 4.6.1
-#   # Optional
+#
+#   # Optional: libc support
 #   crossgcc.setup_libc newlib 1.19.0
+#
+#   # Optional: additional language support (e.g. Objective-C/Objective-C++)
+#   crossgcc.languages-append objc obj-c++
 
-options crossgcc.target
+options crossgcc.target \
+        crossgcc.languages
 
+default crossgcc.languages {{c c++}}
+
 proc crossgcc.setup {target version} {
     global crossgcc.target crossgcc.version
 
@@ -145,7 +152,6 @@
         configure.dir   ${workpath}/build
         configure.cmd   ${worksrcpath}/configure
         configure.args  --target=${crossgcc.target} \
-                        --enable-languages="c,objc,c++,obj-c++" \
                         --infodir=${prefix}/share/info \
                         --mandir=${prefix}/share/man \
                         --datarootdir=${prefix}/share/${name} \
@@ -156,6 +162,12 @@
                         --enable-stage1-checking \
                         --enable-multilib
 
+        # The Portfile may modify crossgcc.languages, thus, evaluate the option
+        # late in this pre-configure phase
+        pre-configure {
+            configure.args-append --enable-languages="[join ${crossgcc.languages} ","]"
+        }
+
         configure.env-append \
             AR_FOR_TARGET=${crossgcc.target}-ar \
             AS_FOR_TARGET=${crossgcc.target}-as \

--- trunk/dports/cross/avr-gcc/Portfile	2012-12-09 02:16:16 UTC (rev 100352)
+++ trunk/dports/cross/avr-gcc/Portfile	2012-12-09 02:37:02 UTC (rev 100353)
@@ -24,9 +24,6 @@
     configure.compiler      llvm-gcc-4.2
 }
 
-configure.args-delete   --enable-languages="c,objc,c++,obj-c++"
-configure.args-append   --enable-languages="c,c++" \
-                        
 default_variants        +lto
 
 if {$build_arch != "" && ${os.platform} == "darwin"} {

--- trunk/dports/cross/msp430-gcc/Portfile	2012-12-09 02:16:16 UTC (rev 100352)
+++ trunk/dports/cross/msp430-gcc/Portfile	2012-12-09 02:37:02 UTC (rev 100353)
@@ -42,6 +42,3 @@
 depends_run         port:msp430mcu
 
 patch.pre_args      -p1
-
-configure.args-delete --enable-languages="c,objc,c++,obj-c++"
-configure.args-append --enable-languages="c,c++"

--- trunk/dports/cross/msp430-gcc-devel/Portfile	2012-12-09 02:16:16 UTC (rev 100352)
+++ trunk/dports/cross/msp430-gcc-devel/Portfile	2012-12-09 02:37:02 UTC (rev 100353)
@@ -49,6 +49,3 @@
 if {${configure.compiler} == "clang"} {
     configure.compiler      llvm-gcc-4.2
 }
-
-configure.args-delete --enable-languages="c,objc,c++,obj-c++"
-configure.args-append --enable-languages="c,c++"