[104715] branches/new-help-system/base
raimue at macports.org
raimue at macports.org
Mon Apr 1 06:30:37 PDT 2013
Revision: 104715
https://trac.macports.org/changeset/104715
Author: raimue at macports.org
Date: 2013-04-01 06:30:36 -0700 (Mon, 01 Apr 2013)
Log Message:
-----------
Merge from trunk
Modified Paths:
--------------
branches/new-help-system/base/src/macports1.0/macports.tcl
branches/new-help-system/base/src/port1.0/portbuild.tcl
branches/new-help-system/base/src/port1.0/portconfigure.tcl
branches/new-help-system/base/src/port1.0/portutil.tcl
Property Changed:
----------------
branches/new-help-system/base/
Property changes on: branches/new-help-system/base
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:49341-103912
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
+ /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:49341-104698
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
Modified: branches/new-help-system/base/src/macports1.0/macports.tcl
===================================================================
--- branches/new-help-system/base/src/macports1.0/macports.tcl 2013-04-01 08:19:47 UTC (rev 104714)
+++ branches/new-help-system/base/src/macports1.0/macports.tcl 2013-04-01 13:30:36 UTC (rev 104715)
@@ -3364,7 +3364,7 @@
# Choose a sane compiler
set cc_arg ""
if {$::macports::os_platform == "darwin"} {
- set cc_arg "CC=/usr/bin/cc "
+ set cc_arg "CC=/usr/bin/cc OBJC=/usr/bin/cc "
}
# do the actual configure, build and installation of new base
Modified: branches/new-help-system/base/src/port1.0/portbuild.tcl
===================================================================
--- branches/new-help-system/base/src/port1.0/portbuild.tcl 2013-04-01 08:19:47 UTC (rev 104714)
+++ branches/new-help-system/base/src/port1.0/portbuild.tcl 2013-04-01 13:30:36 UTC (rev 104715)
@@ -70,9 +70,12 @@
ui_debug "build.type is BSD, adding bin:bsdmake:bsdmake build dependency"
depends_build-delete bin:bsdmake:bsdmake
depends_build-append bin:bsdmake:bsdmake
- depends_skip_archcheck-delete bsdmake
- depends_skip_archcheck-append bsdmake
}
+ if {[option build.type] == "gnu" && [option os.platform] == "freebsd"} {
+ ui_debug "build.type is GNU, adding bin:gmake:gmake build dependency"
+ depends_build-delete bin:gmake:gmake
+ depends_build-append bin:gmake:gmake
+ }
}
# Register the above procedure as a callback after Portfile evaluation
port::register_callback portbuild::add_automatic_buildsystem_dependencies
Modified: branches/new-help-system/base/src/port1.0/portconfigure.tcl
===================================================================
--- branches/new-help-system/base/src/port1.0/portconfigure.tcl 2013-04-01 08:19:47 UTC (rev 104714)
+++ branches/new-help-system/base/src/port1.0/portconfigure.tcl 2013-04-01 13:30:36 UTC (rev 104715)
@@ -127,14 +127,18 @@
default configure.march {}
default configure.mtune {}
# We could have debug/optimizations be global configurable at some point.
-options configure.optflags configure.cflags configure.cppflags configure.cxxflags configure.objcflags configure.ldflags configure.libs configure.fflags configure.f90flags configure.fcflags configure.classpath
+options configure.optflags
+options configure.cflags configure.cxxflags configure.objcflags
+options configure.cppflags configure.ldflags configure.libs
+options configure.fflags configure.f90flags configure.fcflags
+options configure.classpath
+# compiler flags section
default configure.optflags {-Os}
-# compiler flags section
default configure.cflags {${configure.optflags}}
-default configure.cppflags {-I${prefix}/include}
default configure.cxxflags {${configure.optflags}}
default configure.objcflags {${configure.optflags}}
-default configure.ldflags {-L${prefix}/lib}
+default configure.cppflags {-I${prefix}/include}
+default configure.ldflags {"-L${prefix}/lib -Wl,-headerpad_max_install_names"}
default configure.libs {}
default configure.fflags {${configure.optflags}}
default configure.f90flags {${configure.optflags}}
@@ -142,7 +146,9 @@
default configure.classpath {}
# tools section
-options configure.perl configure.python configure.ruby configure.install configure.awk configure.bison configure.pkg_config configure.pkg_config_path
+options configure.perl configure.python configure.ruby
+options configure.install configure.awk configure.bison
+options configure.pkg_config configure.pkg_config_path
default configure.perl {}
default configure.python {}
default configure.ruby {}
@@ -153,20 +159,22 @@
default configure.pkg_config_path {}
options configure.build_arch configure.ld_archflags configure.sdkroot
-default configure.build_arch {[portconfigure::choose_supported_archs ${build_arch}]}
-default configure.ld_archflags {[portconfigure::configure_get_ld_archflags]}
-default configure.sdkroot {[portconfigure::configure_get_sdkroot]}
+default configure.build_arch {[portconfigure::choose_supported_archs ${build_arch}]}
+default configure.ld_archflags {[portconfigure::configure_get_ld_archflags]}
+default configure.sdkroot {[portconfigure::configure_get_sdkroot]}
foreach tool {cc cxx objc f77 f90 fc} {
options configure.${tool}_archflags
default configure.${tool}_archflags "\[portconfigure::configure_get_archflags $tool\]"
}
-options configure.universal_archs configure.universal_args configure.universal_cflags configure.universal_cppflags configure.universal_cxxflags configure.universal_ldflags
+options configure.universal_archs configure.universal_args
+options configure.universal_cflags configure.universal_cxxflags
+options configure.universal_cppflags configure.universal_ldflags
default configure.universal_archs {[portconfigure::choose_supported_archs ${universal_archs}]}
default configure.universal_args {--disable-dependency-tracking}
default configure.universal_cflags {[portconfigure::configure_get_universal_cflags]}
+default configure.universal_cxxflags {[portconfigure::configure_get_universal_cflags]}
default configure.universal_cppflags {}
-default configure.universal_cxxflags {[portconfigure::configure_get_universal_cflags]}
default configure.universal_ldflags {[portconfigure::configure_get_universal_ldflags]}
# Select a distinct compiler (C, C preprocessor, C++)
@@ -200,24 +208,24 @@
set name ""
switch -exact ${configure.compiler} {
cc { set name "System cc" }
- gcc { set name "System gcc" }
- gcc-3.3 { set name "Mac OS X gcc 3.3" }
- gcc-4.0 { set name "Mac OS X gcc 4.0" }
- gcc-4.2 { set name "Mac OS X gcc 4.2" }
- llvm-gcc-4.2 { set name "Mac OS X llvm-gcc 4.2" }
- clang { set name "Mac OS X clang" }
- apple-gcc-4.0 { set name "MacPorts Apple gcc 4.0" }
- apple-gcc-4.2 { set name "MacPorts Apple gcc 4.2" }
- macports-gcc { set name "MacPorts gcc (port select)" }
- macports-llvm-gcc-4.2 { set name "MacPorts llvm-gcc 4.2" }
- macports-clang { set name "MacPorts clang (port select)" }
+ gcc { set name "System GCC" }
+ gcc-3.3 { set name "Mac OS X GCC 3.3" }
+ gcc-4.0 { set name "Mac OS X GCC 4.0" }
+ gcc-4.2 { set name "Mac OS X GCC 4.2" }
+ llvm-gcc-4.2 { set name "Mac OS X LLVM-GCC 4.2" }
+ clang { set name "Mac OS X Clang" }
+ apple-gcc-4.0 { set name "MacPorts Apple GCC 4.0" }
+ apple-gcc-4.2 { set name "MacPorts Apple GCC 4.2" }
+ macports-gcc { set name "MacPorts GCC (port select)" }
+ macports-llvm-gcc-4.2 { set name "MacPorts LLVM-GCC 4.2" }
+ macports-clang { set name "MacPorts Clang (port select)" }
default {
if {[regexp {macports-clang-(.*)\.(.*)} ${configure.compiler} -> major minor]} {
- set name "MacPorts clang ${major}.${minor}"
+ set name "MacPorts Clang ${major}.${minor}"
} elseif {[regexp {macports-dragonegg-(.*)\.(.*)} ${configure.compiler} -> major minor]} {
- set name "MacPorts dragonegg ${major}.${minor}"
+ set name "MacPorts DragonEgg ${major}.${minor}"
} elseif {[regexp {macports-gcc-(.*)\.(.*)} ${configure.compiler} -> major minor]} {
- set name "MacPorts gcc ${major}.${minor}"
+ set name "MacPorts GCC ${major}.${minor}"
} else {
return -code error "Invalid value for configure.compiler: ${configure.compiler}"
}
@@ -286,7 +294,9 @@
} elseif {[tbool configure.m32]} {
set flags "-m32"
} elseif {${configure.build_arch} != ""} {
- if {[arch_flag_supported ${configure.compiler}] && ($tool == "cc" || $tool == "cxx" || $tool == "objc")} {
+ if {[arch_flag_supported ${configure.compiler}] &&
+ ($tool == "cc" || $tool == "cxx" || $tool == "objc")
+ } then {
set flags "-arch ${configure.build_arch}"
} elseif {${configure.build_arch} == "x86_64" || ${configure.build_arch} == "ppc64"} {
set flags "-m64"
@@ -406,22 +416,28 @@
# internal function to determine the default compiler
proc portconfigure::configure_get_default_compiler {args} {
- global compiler.blacklist compiler.whitelist compiler.fallback
- if {${compiler.whitelist} != {}} {
- set search_list ${compiler.whitelist}
+ if {[option compiler.whitelist] != {}} {
+ set search_list [option compiler.whitelist]
} else {
- set search_list ${compiler.fallback}
+ set search_list [option compiler.fallback]
}
foreach compiler $search_list {
- if {[lsearch -exact ${compiler.blacklist} $compiler] == -1} {
- if {[file executable [configure_get_compiler cc $compiler]]
- || [compiler_is_port $compiler]} {
- return $compiler
+ set allowed yes
+ foreach pattern [option compiler.blacklist] {
+ if {[string match $pattern $compiler]} {
+ set allowed no
+ break
}
}
+ if {$allowed &&
+ ([file executable [configure_get_compiler cc $compiler]] ||
+ [compiler_is_port $compiler])
+ } then {
+ return $compiler
+ }
}
- ui_warn "All compilers are either blacklisted or unavailable; using first fallback entry as last resort"
- return [lindex ${compiler.fallback} 0]
+ ui_warn "All compilers are either blacklisted or unavailable; defaulting to first fallback option"
+ return [lindex [option compiler.fallback] 0]
}
# internal function to choose compiler fallback list based on platform
@@ -606,8 +622,11 @@
global [info globals]
global worksrcpath use_configure use_autoreconf use_autoconf use_automake use_xmkmf
global configure.env configure.pipe configure.libs configure.classpath configure.universal_args
- global configure.perl configure.python configure.ruby configure.install configure.awk configure.bison configure.pkg_config configure.pkg_config_path
- global configure.ccache configure.distcc configure.cpp configure.javac configure.march configure.mtune configure.sdkroot
+ global configure.perl configure.python configure.ruby configure.install configure.awk configure.bison
+ global configure.pkg_config configure.pkg_config_path
+ global configure.ccache configure.distcc configure.cpp configure.javac configure.sdkroot
+ global configure.march configure.mtune
+ global os.platform os.major
foreach tool {cc cxx objc f77 f90 fc ld} {
global configure.${tool} configure.${tool}_archflags
}
@@ -695,6 +714,11 @@
append_list_to_environment_value configure "PKG_CONFIG" ${configure.pkg_config}
append_list_to_environment_value configure "PKG_CONFIG_PATH" ${configure.pkg_config_path}
+ # https://trac.macports.org/ticket/34221
+ if {${os.platform} == "darwin" && ${os.major} == 12} {
+ append_list_to_environment_value configure "__CFPREFERENCES_AVOID_DAEMON" 1
+ }
+
# add SDK flags if cross-compiling (or universal on ppc tiger)
if {${configure.sdkroot} != ""} {
foreach flags {CPPFLAGS CFLAGS CXXFLAGS OBJCFLAGS} {
Modified: branches/new-help-system/base/src/port1.0/portutil.tcl
===================================================================
--- branches/new-help-system/base/src/port1.0/portutil.tcl 2013-04-01 08:19:47 UTC (rev 104714)
+++ branches/new-help-system/base/src/port1.0/portutil.tcl 2013-04-01 13:30:36 UTC (rev 104715)
@@ -1742,8 +1742,7 @@
set portfile_changed yes
} else {
if {$checksum_portfile != $checksum_statefile} {
- ui_debug "Checksum recorded in statefile '$checksum_statefile' \
- differs from Portfile checksum '$checksum_portfile'"
+ ui_debug "Checksum recorded in statefile '$checksum_statefile' differs from Portfile checksum '$checksum_portfile'"
set portfile_changed yes
}
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130401/51832eab/attachment.html>
More information about the macports-changes
mailing list