Changeset 28677


Ignore:
Timestamp:
Sep 6, 2007, 7:03:59 PM (12 years ago)
Author:
mww@…
Message:

add configure.objc/objcflags for Objective-C configure cflags

Location:
trunk/base
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/ChangeLog

    r28676 r28677  
    77Unreleased:
    88
     9    - add configure.objc/objcflags for Objective-C
     10
    911    - add optional build.nice (0) and build.jobs (1) modifiers (afb in r28634 & r28673)
    1012
     
    1517    - add configure.macosx_deployment_target for configure flags
    1618
    17     - add configure.javac/classpath for Java flags
     19    - add configure.javac/classpath for Java
    1820
    1921    - add configure.fflags/fcflags/f90flags for Fortran flags
  • trunk/base/doc/portfile.7

    r28579 r28677  
    810810.Sy Default:
    811811.Em -O2
     812.It Ic configure.objcflags
     813Flags to put in the OBJCFLAGS environment variable when invoking the configure script.
     814.br
     815.Sy Type:
     816.Em optional
     817.br
     818.Sy Default:
     819.Em -O2
    812820.It Ic configure.ldflags
    813821Flags to put in the LDFLAGS environment variable when invoking the configure script.
     
    873881.Sy Type:
    874882.Em optional
     883.It Ic configure.objc
     884Objective-C-compiler to put in the OBJC environment variable when invoking the configure script.
     885.br
     886.Sy Type:
     887.Em optional
     888.br
     889.Sy Example:
     890.Dl configure.objc ${prefix}/bin/gcc-mp-4.1
    875891.It Ic configure.fc
    876892Fortran-compiler to put in the FC environment variable when invoking the configure script.
  • trunk/base/src/port1.0/portconfigure.tcl

    r28550 r28677  
    5454
    5555# Configure special environment variables.
    56 options configure.cflags configure.cppflags configure.cxxflags configure.ldflags configure.fflags configure.f90flags configure.fcflags configure.classpath configure.macosx_deployment_target
     56options configure.cflags configure.cppflags configure.cxxflags configure.objcflags configure.ldflags configure.fflags configure.f90flags configure.fcflags configure.classpath configure.macosx_deployment_target
    5757# We could have default debug/optimization flags at some point.
    5858default configure.cflags        {-O2}
    5959default configure.cppflags      {"-I${prefix}/include"}
    6060default configure.cxxflags      {-O2}
     61default configure.objcflags     {-O2}
    6162default configure.ldflags       {"-L${prefix}/lib"}
    6263default configure.fflags        {-O2}
     
    7576
    7677# Select a distinct compiler (C, C preprocessor, C++)
    77 options configure.cc configure.cxx configure.cpp configure.f77 configure.f90 configure.fc configure.javac configure.compiler
     78options configure.cc configure.cxx configure.cpp configure.objc configure.f77 configure.f90 configure.fc configure.javac configure.compiler
    7879default configure.cc                    {}
    7980default configure.cxx                   {}
    8081default configure.cpp                   {}
     82default configure.objc                  {}
    8183default configure.f77                   {}
    8284default configure.f90                   {}
     
    9698# this function will NOT override explicitely set variables from the portfile
    9799proc select_compiler {info args} {
    98     global configure.cc configure.cxx configure.cpp configure.f77 configure.f90 configure.fc
     100    global configure.cc configure.cxx configure.cpp configure.objc configure.f77 configure.f90 configure.fc
    99101    ui_debug "Using compiler '$info'"
    100102    set i 0
     
    108110                cxx { if {""==${configure.cxx}} { set configure.cxx $value } }
    109111                cpp { if {""==${configure.cpp}} { set configure.cpp $value } }
     112                objc { if {""==${configure.objc}} { set configure.objc $value } }
    110113                fc  { if {""==${configure.fc}}  { set configure.fc $value } }
    111114                f77 { if {""==${configure.f77}} { set configure.f77 $value } }
     
    120123    global [info globals]
    121124    global worksrcpath use_configure use_autoconf use_automake use_xmkmf
    122     global configure.env configure.cflags configure.cppflags configure.cxxflags configure.ldflags configure.fflags configure.f90flags configure.fcflags configure.classpath configure.macosx_deployment_target
    123     global configure.cc configure.cxx configure.cpp configure.f77 configure.f90 configure.fc configure.javac configure.compiler prefix
     125    global configure.env configure.cflags configure.cppflags configure.cxxflags configure.objcflags configure.ldflags configure.fflags configure.f90flags configure.fcflags configure.classpath configure.macosx_deployment_target
     126    global configure.cc configure.cxx configure.cpp configure.objc configure.f77 configure.f90 configure.fc configure.javac configure.compiler prefix
    124127    global os.platform os.major
    125128   
     
    152155            select_compiler "Mac OS X gcc 3.3" \
    153156                cc  /usr/bin/gcc-3.3 \
     157                objc /usr/bin/gcc-3.3 \
    154158                cxx /usr/bin/g++-3.3 \
    155159                cpp /usr/bin/cpp-3.3 }
     
    157161            select_compiler "Mac OS X gcc 4.0" \
    158162                cc  /usr/bin/gcc-4.0 \
     163                objc /usr/bin/gcc-4.0 \
    159164                cxx /usr/bin/g++-4.0 \
    160165                cpp /usr/bin/cpp-4.0 }
     
    166171            select_compiler "MacPorts Apple gcc 4.0" \
    167172                cc  ${prefix}/bin/gcc-apple-4.0 \
     173                objc ${prefix}/bin/gcc-apple-4.0 \
    168174                cpp ${prefix}/bin/cpp-apple-4.0 }
    169175        macports-gcc-3.3 {
     
    180186            select_compiler "MacPorts gcc 4.0" \
    181187                cc  ${prefix}/bin/gcc-mp-4.0 \
     188                objc ${prefix}/bin/gcc-mp-4.0 \
    182189                cxx ${prefix}/bin/g++-mp-4.0 \
    183190                cpp ${prefix}/bin/cpp-mp-4.0 \
     
    188195            select_compiler "MacPorts gcc 4.1" \
    189196                cc  ${prefix}/bin/gcc-mp-4.1 \
     197                objc ${prefix}/bin/gcc-mp-4.1 \
    190198                cxx ${prefix}/bin/g++-mp-4.1 \
    191199                cpp ${prefix}/bin/cpp-mp-4.1 \
     
    196204            select_compiler "MacPorts gcc 4.2" \
    197205                cc  ${prefix}/bin/gcc-mp-4.2 \
     206                objc ${prefix}/bin/gcc-mp-4.2 \
    198207                cxx ${prefix}/bin/g++-mp-4.2 \
    199208                cpp ${prefix}/bin/cpp-mp-4.2 \
     
    204213            select_compiler "MacPorts gcc 4.3" \
    205214                cc  ${prefix}/bin/gcc-mp-4.3 \
     215                objc ${prefix}/bin/gcc-mp-4.3 \
    206216                cxx ${prefix}/bin/g++-mp-4.3 \
    207217                cpp ${prefix}/bin/cpp-mp-4.3 \
     
    230240                append_list_to_environment_value configure "CPP" ${configure.cpp}
    231241                append_list_to_environment_value configure "CXX" ${configure.cxx}
     242                append_list_to_environment_value configure "OBJC" ${configure.objc}
    232243                append_list_to_environment_value configure "FC" ${configure.fc}
    233244                append_list_to_environment_value configure "F77" ${configure.f77}
     
    237248                append_list_to_environment_value configure "CPPFLAGS" ${configure.cppflags}
    238249                append_list_to_environment_value configure "CXXFLAGS" ${configure.cxxflags}
     250                append_list_to_environment_value configure "OBJCFLAGS" ${configure.objcflags}
    239251                append_list_to_environment_value configure "LDFLAGS" ${configure.ldflags}
    240252                append_list_to_environment_value configure "FFLAGS" ${configure.fflags}
Note: See TracChangeset for help on using the changeset viewer.