July 2011 - macports-changes - lists.macosforge.org

[80139] trunk/base/src/macports1.0/macports.tcl
by jmr＠macports.org 05 Jul '11

05 Jul '11

Revision: 80139 http://trac.macports.org/changeset/80139 Author: jmr(a)macports.org Date: 2011-07-05 00:04:50 -0700 (Tue, 05 Jul 2011) Log Message: ----------- add prefix=/usr check to selfupdate Modified Paths: -------------- trunk/base/src/macports1.0/macports.tcl Modified: trunk/base/src/macports1.0/macports.tcl =================================================================== --- trunk/base/src/macports1.0/macports.tcl 2011-07-05 07:04:06 UTC (rev 80138) +++ trunk/base/src/macports1.0/macports.tcl 2011-07-05 07:04:50 UTC (rev 80139) @@ -3021,7 +3021,7 @@ ui_warn "Disabling readline support due to readline in /usr/local" } - if {$prefix == "/usr/local"} { + if {$prefix == "/usr/local" || $prefix == "/usr"} { append configure_args " --with-unsupported-prefix" }

1 0

[80138] trunk/base/src/port/port.tcl
by jmr＠macports.org 05 Jul '11

05 Jul '11

Revision: 80138 http://trac.macports.org/changeset/80138 Author: jmr(a)macports.org Date: 2011-07-05 00:04:06 -0700 (Tue, 05 Jul 2011) Log Message: ----------- don't invite bug reports when using an unsupported prefix Modified Paths: -------------- trunk/base/src/port/port.tcl Modified: trunk/base/src/port/port.tcl =================================================================== --- trunk/base/src/port/port.tcl 2011-07-05 07:01:07 UTC (rev 80137) +++ trunk/base/src/port/port.tcl 2011-07-05 07:04:06 UTC (rev 80138) @@ -236,7 +236,9 @@ # show the URL for the ticket reporting instructions proc print_tickets_url {args} { - ui_notice "To report a bug, see <http://guide.macports.org/#project.tickets>" + if {${macports::prefix} != "/usr/local" && ${macports::prefix} != "/usr"} { + ui_notice "To report a bug, see <http://guide.macports.org/#project.tickets>" + } } # Form a composite version as is sometimes used for registry functions

1 0

[80137] trunk/base
by jmr＠macports.org 05 Jul '11

05 Jul '11

Revision: 80137 http://trac.macports.org/changeset/80137 Author: jmr(a)macports.org Date: 2011-07-05 00:01:07 -0700 (Tue, 05 Jul 2011) Log Message: ----------- also complain about prefix=/usr Modified Paths: -------------- trunk/base/configure trunk/base/configure.ac Modified: trunk/base/configure =================================================================== --- trunk/base/configure 2011-07-05 06:58:19 UTC (rev 80136) +++ trunk/base/configure 2011-07-05 07:01:07 UTC (rev 80137) @@ -7645,8 +7645,8 @@ with_unsupported_prefix=no fi -if test x$prefix = x/usr/local -a x$with_unsupported_prefix != xyes; then - as_fn_error $? "Installing MacPorts into /usr/local is not supported. If \ +if test x$prefix = x/usr/local -o x$prefix = x/usr && test x$with_unsupported_prefix != xyes; then + as_fn_error $? "Installing MacPorts into $prefix is not supported. If \ you understand this and wish to do so anyway, pass --with-unsupported-prefix \ to configure." "$LINENO" 5 fi Modified: trunk/base/configure.ac =================================================================== --- trunk/base/configure.ac 2011-07-05 06:58:19 UTC (rev 80136) +++ trunk/base/configure.ac 2011-07-05 07:01:07 UTC (rev 80137) @@ -176,8 +176,8 @@ [Acknowledge that you accept the consequences of using an unsupported prefix.]), [with_unsupported_prefix=$withval], [with_unsupported_prefix=no]) -if test x$prefix = x/usr/local -a x$with_unsupported_prefix != xyes; then - AC_MSG_ERROR([Installing MacPorts into /usr/local is not supported. If \ +if test x$prefix = x/usr/local -o x$prefix = x/usr && test x$with_unsupported_prefix != xyes; then + AC_MSG_ERROR([Installing MacPorts into $prefix is not supported. If \ you understand this and wish to do so anyway, pass --with-unsupported-prefix \ to configure.]) fi

1 0

[80136] trunk/dports/devel/boehmgc/Portfile
by jeremyhu＠macports.org 05 Jul '11

05 Jul '11

Revision: 80136 http://trac.macports.org/changeset/80136 Author: jeremyhu(a)macports.org Date: 2011-07-04 23:58:19 -0700 (Mon, 04 Jul 2011) Log Message: ----------- boehmgc: Update comment regarding inline asm Modified Paths: -------------- trunk/dports/devel/boehmgc/Portfile Modified: trunk/dports/devel/boehmgc/Portfile =================================================================== --- trunk/dports/devel/boehmgc/Portfile 2011-07-05 06:46:37 UTC (rev 80135) +++ trunk/dports/devel/boehmgc/Portfile 2011-07-05 06:58:19 UTC (rev 80136) @@ -29,8 +29,7 @@ configure.args-append --enable-redirect-malloc } -# Note that this was "fixed" differently in upstream's svn. -# Their "fix" is wrong, and this one is correct. +# This is now fixed in upstream svn and should be in the next release patchfiles asm.patch test.run yes

1 0

[80135] trunk/dports/multimedia/quickascii/files/Makefile
by ryandesign＠macports.org 05 Jul '11

05 Jul '11

Revision: 80135 http://trac.macports.org/changeset/80135 Author: ryandesign(a)macports.org Date: 2011-07-04 23:46:37 -0700 (Mon, 04 Jul 2011) Log Message: ----------- quickascii: presumably fix build on case-sensitive systems Modified Paths: -------------- trunk/dports/multimedia/quickascii/files/Makefile Modified: trunk/dports/multimedia/quickascii/files/Makefile =================================================================== --- trunk/dports/multimedia/quickascii/files/Makefile 2011-07-05 06:35:18 UTC (rev 80134) +++ trunk/dports/multimedia/quickascii/files/Makefile 2011-07-05 06:46:37 UTC (rev 80135) @@ -9,7 +9,7 @@ $(CC) -c $< -o $@ quickascii: $(OBJS) - $(CC) $(OBJS) -o $@ -framework Quicktime -framework Carbon + $(CC) $(OBJS) -o $@ -framework QuickTime -framework Carbon clean: @rm -f qtplyr.o commands.o quickascii

1 0

[80134] trunk/dports/net/mtr/Portfile
by ryandesign＠macports.org 05 Jul '11

05 Jul '11

Revision: 80134 http://trac.macports.org/changeset/80134 Author: ryandesign(a)macports.org Date: 2011-07-04 23:35:18 -0700 (Mon, 04 Jul 2011) Log Message: ----------- mtr: fix build on Lion; #29826 Modified Paths: -------------- trunk/dports/net/mtr/Portfile Modified: trunk/dports/net/mtr/Portfile =================================================================== --- trunk/dports/net/mtr/Portfile 2011-07-05 06:23:18 UTC (rev 80133) +++ trunk/dports/net/mtr/Portfile 2011-07-05 06:35:18 UTC (rev 80134) @@ -28,6 +28,6 @@ configure.args-append --without-gtk -platform darwin 10 { +if {${os.platform} == "darwin" && ${os.major} >= 10} { configure.env-append LIBS=-lresolv }

1 0

[80133] trunk/dports/devel/gperf
by jeremyhu＠macports.org 05 Jul '11

05 Jul '11

Revision: 80133 http://trac.macports.org/changeset/80133 Author: jeremyhu(a)macports.org Date: 2011-07-04 23:23:18 -0700 (Mon, 04 Jul 2011) Log Message: ----------- gperf: Ok, one last time cleaning up this inline-foo. Modified Paths: -------------- trunk/dports/devel/gperf/Portfile trunk/dports/devel/gperf/files/c99.patch Modified: trunk/dports/devel/gperf/Portfile =================================================================== --- trunk/dports/devel/gperf/Portfile 2011-07-05 05:42:07 UTC (rev 80132) +++ trunk/dports/devel/gperf/Portfile 2011-07-05 06:23:18 UTC (rev 80133) @@ -5,7 +5,7 @@ name gperf version 3.0.4 -revision 1 +revision 2 categories devel maintainers mcalhoun openmaintainer description GNU perfect hash generator Modified: trunk/dports/devel/gperf/files/c99.patch =================================================================== --- trunk/dports/devel/gperf/files/c99.patch 2011-07-05 05:42:07 UTC (rev 80132) +++ trunk/dports/devel/gperf/files/c99.patch 2011-07-05 06:23:18 UTC (rev 80133) @@ -1,39 +1,18 @@ --- src/output.cc.orig 2011-07-03 10:13:13.000000000 -0700 +++ src/output.cc 2011-07-03 10:17:43.000000000 -0700 -@@ -745,12 +745,12 @@ Output::output_hash_function () const +@@ -745,12 +745,10 @@ Output::output_hash_function () const if (option[CPLUSPLUS]) printf ("inline "); else if (option[KRC] | option[C] | option[ANSIC]) - printf ("#ifdef __GNUC__\n" -+ printf ("#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC_STDC_INLINE__)\n" ++ printf ("#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__cplusplus) || defined(__GNUC_STDC_INLINE__)\n" + "inline\n" + "#elif defined(__GNUC__)\n" "__inline\n" - "#else\n" - "#ifdef __cplusplus\n" -+ "#elif defined(__cplusplus)\n" - "inline\n" +- "inline\n" - "#endif\n" "#endif\n"); if (/* The function does not use the 'str' argument? */ -@@ -1892,12 +1892,13 @@ Output::output_lookup_function () const - warning: C99 inline functions are not supported; using GNU89 - warning: to disable this warning use -fgnu89-inline or the gnu_inline function attribute - It defines a macro __GNUC_GNU_INLINE__ to indicate this situation. */ -- printf ("#ifdef __GNUC__\n" -- "__inline\n" -- "#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__\n" -- "__attribute__ ((__gnu_inline__))\n" -- "#endif\n" -- "#endif\n"); -+ printf ("#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC_STDC_INLINE__)\n" -+ "static inline\n" -+ "#elif defined(__GNUC__)\n" -+ "__inline\n" -+ "#elif defined(__cplusplus)\n" -+ "inline\n" -+ "#endif\n"); - - printf ("%s%s\n", - const_for_struct, _return_type);

1 0

[80132] trunk/dports/devel/gperf
by jeremyhu＠macports.org 05 Jul '11

05 Jul '11

Revision: 80132 http://trac.macports.org/changeset/80132 Author: jeremyhu(a)macports.org Date: 2011-07-04 22:42:07 -0700 (Mon, 04 Jul 2011) Log Message: ----------- gperf: Fix douple static, #30022 Modified Paths: -------------- trunk/dports/devel/gperf/Portfile trunk/dports/devel/gperf/files/c99.patch Modified: trunk/dports/devel/gperf/Portfile =================================================================== --- trunk/dports/devel/gperf/Portfile 2011-07-05 04:04:57 UTC (rev 80131) +++ trunk/dports/devel/gperf/Portfile 2011-07-05 05:42:07 UTC (rev 80132) @@ -5,6 +5,7 @@ name gperf version 3.0.4 +revision 1 categories devel maintainers mcalhoun openmaintainer description GNU perfect hash generator Modified: trunk/dports/devel/gperf/files/c99.patch =================================================================== --- trunk/dports/devel/gperf/files/c99.patch 2011-07-05 04:04:57 UTC (rev 80131) +++ trunk/dports/devel/gperf/files/c99.patch 2011-07-05 05:42:07 UTC (rev 80132) @@ -6,7 +6,7 @@ else if (option[KRC] | option[C] | option[ANSIC]) - printf ("#ifdef __GNUC__\n" + printf ("#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC_STDC_INLINE__)\n" -+ "static inline\n" ++ "inline\n" + "#elif defined(__GNUC__)\n" "__inline\n" - "#else\n"

1 0

[80131] tags/release_2_0_0-beta2/
by jmr＠macports.org 05 Jul '11

05 Jul '11

Revision: 80131 http://trac.macports.org/changeset/80131 Author: jmr(a)macports.org Date: 2011-07-04 21:04:57 -0700 (Mon, 04 Jul 2011) Log Message: ----------- Create tag for 2.0.0-beta2 release Added Paths: ----------- tags/release_2_0_0-beta2/ Property changes on: tags/release_2_0_0-beta2 ___________________________________________________________________ Added: svn:mergeinfo + /trunk:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864,79943,80069,80088

1 0

[80130] branches/release_2_0
by jmr＠macports.org 05 Jul '11

05 Jul '11

Revision: 80130 http://trac.macports.org/changeset/80130 Author: jmr(a)macports.org Date: 2011-07-04 20:56:34 -0700 (Mon, 04 Jul 2011) Log Message: ----------- merge r80088 from trunk: choose default configure.compiler based on Xcode version (#30009) Revision Links: -------------- http://trac.macports.org/changeset/80088 Modified Paths: -------------- branches/release_2_0/base/src/macports1.0/macports.tcl branches/release_2_0/base/src/port1.0/portconfigure.tcl Property Changed: ---------------- branches/release_2_0/ branches/release_2_0/base/ branches/release_2_0/base/portmgr/fedora/macports.spec branches/release_2_0/base/src/pextlib1.0/sha2.c branches/release_2_0/base/src/pextlib1.0/sha2.h branches/release_2_0/base/src/pextlib1.0/sha256cmd.c branches/release_2_0/base/src/pextlib1.0/sha256cmd.h branches/release_2_0/base/src/registry2.0/receipt_sqlite.tcl Property changes on: branches/release_2_0 ___________________________________________________________________ Modified: svn:mergeinfo - /trunk:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864,79943,80069 + /trunk:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864,79943,80069,80088 Property changes on: branches/release_2_0/base ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base:37343-46937 /branches/gsoc09-logging/base:51231-60371 /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:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79771-79774,79782,79787,79864,79943,80069 /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/universal-sanity/base:51872-52323 /branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79771-79774,79782,79787,79864,79943,80069,80088 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 Property changes on: branches/release_2_0/base/portmgr/fedora/macports.spec ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base/portmgr/fedora/macports.spec:37343-46937 /branches/universal-sanity/base/portmgr/fedora/macports.spec:51872-52323 /branches/variant-descs-14482/base/portmgr/fedora/macports.spec:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/portmgr/fedora/macports.spec:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864,79943,80069 /trunk/base/portmgr/fedora/macports.spec.in:30388-57826 /users/perry/base-bugs_and_notes/portmgr/fedora/macports.spec:45682-46060 /users/perry/base-select/portmgr/fedora/macports.spec:44044-44692 + /branches/gsoc08-privileges/base/portmgr/fedora/macports.spec:37343-46937 /branches/universal-sanity/base/portmgr/fedora/macports.spec:51872-52323 /branches/variant-descs-14482/base/portmgr/fedora/macports.spec:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/portmgr/fedora/macports.spec:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864,79943,80069,80088 /trunk/base/portmgr/fedora/macports.spec.in:30388-57826 /users/perry/base-bugs_and_notes/portmgr/fedora/macports.spec:45682-46060 /users/perry/base-select/portmgr/fedora/macports.spec:44044-44692 Modified: branches/release_2_0/base/src/macports1.0/macports.tcl =================================================================== --- branches/release_2_0/base/src/macports1.0/macports.tcl 2011-07-05 03:53:54 UTC (rev 80129) +++ branches/release_2_0/base/src/macports1.0/macports.tcl 2011-07-05 03:56:34 UTC (rev 80130) @@ -374,8 +374,7 @@ set macports::xcodeversion "3.2.6" } elseif {$devtoolscore_v >= 1204.0} { set macports::xcodeversion "3.1.4" - } elseif {$devtoolscore_v > 921.0} { - # XXX find actual version corresponding to 3.1 + } elseif {$devtoolscore_v >= 1100.0} { set macports::xcodeversion "3.1" } elseif {$devtoolscore_v >= 921.0} { set macports::xcodeversion "3.0" @@ -3026,11 +3025,10 @@ append configure_args " --with-unsupported-prefix" } + # Choose a sane compiler set cc_arg "" - switch -glob -- $::macports::macosx_version { - 10.[45] { set cc_arg "CC=/usr/bin/gcc-4.0 " } - 10.6 { set cc_arg "CC=/usr/bin/gcc-4.2 " } - 10.* { set cc_arg "CC=/usr/bin/llvm-gcc-4.2 " } + if {$::macports::os_platform == "darwin"} { + set cc_arg "CC=/usr/bin/cc " } # do the actual configure, build and installation of new base Property changes on: branches/release_2_0/base/src/pextlib1.0/sha2.c ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base/src/pextlib1.0/sha2.c:37343-46937 /branches/universal-sanity/base/src/pextlib1.0/sha2.c:51872-52323 /branches/variant-descs-14482/base/src/pextlib1.0/sha2.c:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src/pextlib1.0/sha2.c:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864,79943,80069 /users/perry/base-bugs_and_notes/src/pextlib1.0/sha2.c:45682-46060 /users/perry/base-select/src/pextlib1.0/sha2.c:44044-44692 + /branches/gsoc08-privileges/base/src/pextlib1.0/sha2.c:37343-46937 /branches/universal-sanity/base/src/pextlib1.0/sha2.c:51872-52323 /branches/variant-descs-14482/base/src/pextlib1.0/sha2.c:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src/pextlib1.0/sha2.c:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864,79943,80069,80088 /users/perry/base-bugs_and_notes/src/pextlib1.0/sha2.c:45682-46060 /users/perry/base-select/src/pextlib1.0/sha2.c:44044-44692 Property changes on: branches/release_2_0/base/src/pextlib1.0/sha2.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base/src/pextlib1.0/sha2.h:37343-46937 /branches/universal-sanity/base/src/pextlib1.0/sha2.h:51872-52323 /branches/variant-descs-14482/base/src/pextlib1.0/sha2.h:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src/pextlib1.0/sha2.h:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864,79943,80069 /users/perry/base-bugs_and_notes/src/pextlib1.0/sha2.h:45682-46060 /users/perry/base-select/src/pextlib1.0/sha2.h:44044-44692 + /branches/gsoc08-privileges/base/src/pextlib1.0/sha2.h:37343-46937 /branches/universal-sanity/base/src/pextlib1.0/sha2.h:51872-52323 /branches/variant-descs-14482/base/src/pextlib1.0/sha2.h:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src/pextlib1.0/sha2.h:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864,79943,80069,80088 /users/perry/base-bugs_and_notes/src/pextlib1.0/sha2.h:45682-46060 /users/perry/base-select/src/pextlib1.0/sha2.h:44044-44692 Property changes on: branches/release_2_0/base/src/pextlib1.0/sha256cmd.c ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base/src/pextlib1.0/rmd160cmd.c:37343-46937 /branches/gsoc09-logging/base/src/pextlib1.0/sha256cmd.c:51231-60371 /branches/universal-sanity/base/src/pextlib1.0/rmd160cmd.c:51872-52323 /branches/variant-descs-14482/base/src/pextlib1.0/rmd160cmd.c:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src/pextlib1.0/sha256cmd.c:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864,79943,80069 /users/perry/base-bugs_and_notes/src/pextlib1.0/rmd160cmd.c:45682-46060 /users/perry/base-select/src/pextlib1.0/rmd160cmd.c:44044-44692 + /branches/gsoc08-privileges/base/src/pextlib1.0/rmd160cmd.c:37343-46937 /branches/gsoc09-logging/base/src/pextlib1.0/sha256cmd.c:51231-60371 /branches/universal-sanity/base/src/pextlib1.0/rmd160cmd.c:51872-52323 /branches/variant-descs-14482/base/src/pextlib1.0/rmd160cmd.c:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src/pextlib1.0/sha256cmd.c:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864,79943,80069,80088 /users/perry/base-bugs_and_notes/src/pextlib1.0/rmd160cmd.c:45682-46060 /users/perry/base-select/src/pextlib1.0/rmd160cmd.c:44044-44692 Property changes on: branches/release_2_0/base/src/pextlib1.0/sha256cmd.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base/src/pextlib1.0/rmd160cmd.h:37343-46937 /branches/gsoc09-logging/base/src/pextlib1.0/sha256cmd.h:51231-60371 /branches/universal-sanity/base/src/pextlib1.0/rmd160cmd.h:51872-52323 /branches/variant-descs-14482/base/src/pextlib1.0/rmd160cmd.h:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src/pextlib1.0/sha256cmd.h:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864,79943,80069 /users/perry/base-bugs_and_notes/src/pextlib1.0/rmd160cmd.h:45682-46060 /users/perry/base-select/src/pextlib1.0/rmd160cmd.h:44044-44692 + /branches/gsoc08-privileges/base/src/pextlib1.0/rmd160cmd.h:37343-46937 /branches/gsoc09-logging/base/src/pextlib1.0/sha256cmd.h:51231-60371 /branches/universal-sanity/base/src/pextlib1.0/rmd160cmd.h:51872-52323 /branches/variant-descs-14482/base/src/pextlib1.0/rmd160cmd.h:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src/pextlib1.0/sha256cmd.h:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864,79943,80069,80088 /users/perry/base-bugs_and_notes/src/pextlib1.0/rmd160cmd.h:45682-46060 /users/perry/base-select/src/pextlib1.0/rmd160cmd.h:44044-44692 Modified: branches/release_2_0/base/src/port1.0/portconfigure.tcl =================================================================== --- branches/release_2_0/base/src/port1.0/portconfigure.tcl 2011-07-05 03:53:54 UTC (rev 80129) +++ branches/release_2_0/base/src/port1.0/portconfigure.tcl 2011-07-05 03:56:34 UTC (rev 80130) @@ -352,28 +352,15 @@ # internal function to determine the default compiler proc portconfigure::configure_get_default_compiler {args} { - global macosx_deployment_target developer_dir - switch -exact ${macosx_deployment_target} { - "10.4" - - "10.5" { - if {![file executable /usr/bin/gcc-4.0]} { - if {[file executable /usr/bin/gcc-4.2]} { - return gcc-4.2 - } elseif {[file executable ${developer_dir}/usr/bin/llvm-gcc-4.2]} { - return llvm-gcc-4.2 - } - } - return gcc-4.0 - } - "10.6" { - if {![file executable /usr/bin/gcc-4.2] && - [file executable ${developer_dir}/usr/bin/llvm-gcc-4.2]} { - return llvm-gcc-4.2 - } - return gcc-4.2 - } - "10.7" { return llvm-gcc-4.2 } - default { return gcc } + global xcodeversion macosx_deployment_target + if {$xcodeversion == "none" || $xcodeversion == ""} { + return gcc + } elseif {[rpm-vercomp $xcodeversion 4.0] >= 0} { + return llvm-gcc-4.2 + } elseif {[rpm-vercomp $xcodeversion 3.2] >= 0 && $macosx_deployment_target != "10.4"} { + return gcc-4.2 + } else { + return gcc-4.0 } } Property changes on: branches/release_2_0/base/src/registry2.0/receipt_sqlite.tcl ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base/src/registry1.0/receipt_sqlite.tcl:37343-46937 /branches/gsoc09-logging/base/src/registry1.0/receipt_sqlite.tcl:51231-60371 /branches/universal-sanity/base/src/registry1.0/receipt_sqlite.tcl:51872-52323 /branches/variant-descs-14482/base/src/registry1.0/receipt_sqlite.tcl:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src/registry2.0/receipt_sqlite.tcl:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864,79943,80069 /users/perry/base-bugs_and_notes/src/registry1.0/receipt_sqlite.tcl:45682-46060 /users/perry/base-select/src/registry1.0/receipt_sqlite.tcl:44044-44692 + /branches/gsoc08-privileges/base/src/registry1.0/receipt_sqlite.tcl:37343-46937 /branches/gsoc09-logging/base/src/registry1.0/receipt_sqlite.tcl:51231-60371 /branches/universal-sanity/base/src/registry1.0/receipt_sqlite.tcl:51872-52323 /branches/variant-descs-14482/base/src/registry1.0/receipt_sqlite.tcl:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src/registry2.0/receipt_sqlite.tcl:79584,79586,79590-79594,79599-79600,79649,79686,79689,79692,79750,79762,79787,79864,79943,80069,80088 /users/perry/base-bugs_and_notes/src/registry1.0/receipt_sqlite.tcl:45682-46060 /users/perry/base-select/src/registry1.0/receipt_sqlite.tcl:44044-44692

1 0