August 2013 - macports-changes - lists.macosforge.org

[110369] trunk/base/src
by jeremyhu＠macports.org 30 Aug '13

30 Aug '13

Revision: 110369 https://trac.macports.org/changeset/110369 Author: jeremyhu(a)macports.org Date: 2013-08-30 11:41:03 -0700 (Fri, 30 Aug 2013) Log Message: ----------- Add support for setting cxx_stdlib in macports.conf This will be added to configure.cxxflags -stdlib=${cxx_stdlib} when the C++ compiler is clang. This is a developer option to aide in testing ports with libc++. Please do not file bug reports when using this option unless you are also providing a fix for the problem being reported. It is reccomended that you reinstall all ports from source when changing this option (make sure you set buildfromsource always). Modified Paths: -------------- trunk/base/src/macports1.0/macports.tcl trunk/base/src/port1.0/portconfigure.tcl Modified: trunk/base/src/macports1.0/macports.tcl =================================================================== --- trunk/base/src/macports1.0/macports.tcl 2013-08-30 18:35:40 UTC (rev 110368) +++ trunk/base/src/macports1.0/macports.tcl 2013-08-30 18:41:03 UTC (rev 110369) @@ -49,7 +49,7 @@ macportsuser proxy_override_env proxy_http proxy_https proxy_ftp proxy_rsync proxy_skip \ master_site_local patch_site_local archive_site_local buildfromsource \ revupgrade_autorun revupgrade_mode revupgrade_check_id_loadcmds \ - host_blacklist preferred_hosts sandbox_enable delete_la_files \ + host_blacklist preferred_hosts sandbox_enable delete_la_files cxx_stdlib \ packagemaker_path default_compilers pkg_post_unarchive_deletions" variable user_options {} variable portinterp_options "\ @@ -60,7 +60,7 @@ configureccache ccache_dir ccache_size configuredistcc configurepipe buildnicevalue buildmakejobs \ applications_dir current_phase frameworks_dir developer_dir universal_archs build_arch \ os_arch os_endian os_version os_major os_platform macosx_version macosx_deployment_target \ - packagemaker_path default_compilers sandbox_enable delete_la_files \ + packagemaker_path default_compilers sandbox_enable delete_la_files cxx_stdlib \ pkg_post_unarchive_deletions $user_options" # deferred options are only computed when needed. @@ -580,7 +580,8 @@ macports::ping_cache \ macports::host_blacklisted \ macports::host_preferred \ - macports::delete_la_files + macports::delete_la_files \ + macports::cxx_stdlib # Set the system encoding to utf-8 encoding system utf-8 @@ -963,6 +964,13 @@ set macports::delete_la_files no } } + if {![info exists macports::cxx_stdlib]} { + if {$os_platform eq "darwin" && $os_major < 13} { + set macports::cxx_stdlib libstdc++ + } else { + set macports::cxx_stdlib {} + } + } if {![info exists macports::global_options(ports_rev-upgrade_id-loadcmd-check)] && [info exists macports::revupgrade_check_id_loadcmds]} { set macports::global_options(ports_rev-upgrade_id-loadcmd-check) $macports::revupgrade_check_id_loadcmds Modified: trunk/base/src/port1.0/portconfigure.tcl =================================================================== --- trunk/base/src/port1.0/portconfigure.tcl 2013-08-30 18:35:40 UTC (rev 110368) +++ trunk/base/src/port1.0/portconfigure.tcl 2013-08-30 18:41:03 UTC (rev 110369) @@ -136,9 +136,9 @@ # compiler flags section default configure.optflags {-Os} default configure.cflags {${configure.optflags}} -default configure.cxxflags {${configure.optflags}} +default configure.cxxflags {[portconfigure::choose_default_cxxflags]} default configure.objcflags {${configure.optflags}} -default configure.objcxxflags {${configure.optflags}} +default configure.objcxxflags {[portconfigure::choose_default_cxxflags]} default configure.cppflags {-I${prefix}/include} default configure.ldflags {"-L${prefix}/lib -Wl,-headerpad_max_install_names"} default configure.libs {} @@ -259,6 +259,21 @@ } } +# internal function to choose the default configure.cxxflags and configure.objcxxflags +proc portconfigure::choose_default_cxxflags {} { + global cxx_stdlib + global configure.optflags + global configure.cxx + + set flags ${configure.optflags} + + if {${cxx_stdlib} != "" && [string match *clang* ${configure.cxx}]} { + append flags " -stdlib=${cxx_stdlib}" + } + + return ${flags} +} + # internal function to choose the default configure.build_arch and # configure.universal_archs based on supported_archs and build_arch or # universal_archs

1 0

[110368] trunk/dports/lang/eero-devel/Portfile
by jeremyhu＠macports.org 30 Aug '13

30 Aug '13

Revision: 110368 https://trac.macports.org/changeset/110368 Author: jeremyhu(a)macports.org Date: 2013-08-30 11:35:40 -0700 (Fri, 30 Aug 2013) Log Message: ----------- eero-devel: Simplify compiler blacklist Modified Paths: -------------- trunk/dports/lang/eero-devel/Portfile Modified: trunk/dports/lang/eero-devel/Portfile =================================================================== --- trunk/dports/lang/eero-devel/Portfile 2013-08-30 18:33:16 UTC (rev 110367) +++ trunk/dports/lang/eero-devel/Portfile 2013-08-30 18:35:40 UTC (rev 110368) @@ -73,7 +73,7 @@ } # It seems only clang (>= 3.1 ?) can compile eero -compiler.blacklist-append gcc-4.0 gcc-4.2 apple-gcc-4.2 llvm-gcc-4.2 macports-llvm-gcc-4.2 {clang < 300} +compiler.blacklist-append *gcc* macports-clang-2.9 macports-clang-3.0 {clang < 300} variant universal { build.env-append \

1 0

[110367] trunk/dports/aqua/FScript/Portfile
by jeremyhu＠macports.org 30 Aug '13

30 Aug '13

Revision: 110367 https://trac.macports.org/changeset/110367 Author: jeremyhu(a)macports.org Date: 2013-08-30 11:33:16 -0700 (Fri, 30 Aug 2013) Log Message: ----------- FScript: Remove clang blacklisting. This port doesn't compile out of the box on Lion or ML with or without clang being blacklisted. Perhaps we should just remove this port since it doesn't build at all. Modified Paths: -------------- trunk/dports/aqua/FScript/Portfile Modified: trunk/dports/aqua/FScript/Portfile =================================================================== --- trunk/dports/aqua/FScript/Portfile 2013-08-30 18:18:10 UTC (rev 110366) +++ trunk/dports/aqua/FScript/Portfile 2013-08-30 18:33:16 UTC (rev 110367) @@ -49,10 +49,6 @@ default_variants +ib_plugin } -if {${configure.compiler} == "clang"} { - configure.compiler llvm-gcc-4.2 -} - macosx_deployment_target 10.6 variant ib_plugin description "Install the Interface Builder Plug-in" {

1 0

[110366] trunk/dports/graphics/wxWidgets-3.0
by mojca＠macports.org 30 Aug '13

30 Aug '13

Revision: 110366 https://trac.macports.org/changeset/110366 Author: mojca(a)macports.org Date: 2013-08-30 11:18:10 -0700 (Fri, 30 Aug 2013) Log Message: ----------- wxWidgets-3.0: minor cosmetic changes only Modified Paths: -------------- trunk/dports/graphics/wxWidgets-3.0/Portfile trunk/dports/graphics/wxWidgets-3.0/files/patch-include-wx-math.h.diff Modified: trunk/dports/graphics/wxWidgets-3.0/Portfile =================================================================== --- trunk/dports/graphics/wxWidgets-3.0/Portfile 2013-08-30 18:08:37 UTC (rev 110365) +++ trunk/dports/graphics/wxWidgets-3.0/Portfile 2013-08-30 18:18:10 UTC (rev 110366) @@ -20,10 +20,6 @@ } elseif {$subport == "wxPython-3.0"} { wxWidgets.use wxPython-3.0 version 2.9.4 - revision 1 - set wxpythonsubset wxPython-2.9.4.0-MacPorts-subset - # temporary patch for 2.9.4 only; already integrated into 2.9.5 - patchfiles-append patch-include-wx-math.h.diff } elseif {$subport == "wxgtk-3.0"} { # with satisfactory Cocoa support there is no real need for GTK-based wxWidgets any more # wxgtk-3.0 is here mainly for testing purposes @@ -102,10 +98,13 @@ --with-macosx-version-min=no if {$subport == "wxPython-3.0"} { + set wxpythonsubset wxPython-2.9.4.0-MacPorts-subset distfiles-append ${wxpythonsubset}${extract.suffix}:trac # patch-src-osx-cocoa-window.mm.diff: http://trac.wxwidgets.org/changeset/72195 (only needed for 2.9.4) - patchfiles-append patch-src-osx-cocoa-window.mm.diff + # patch-include-wx-math.h.diff: http://trac.wxwidgets.org/changeset/74456 (only needed for 2.9.4) + patchfiles-append patch-src-osx-cocoa-window.mm.diff \ + patch-include-wx-math.h.diff description wxWidgets ${branch} for the wxPython distribution long_description The port installs wxWidgets ${branch} for wxPython \ Modified: trunk/dports/graphics/wxWidgets-3.0/files/patch-include-wx-math.h.diff =================================================================== --- trunk/dports/graphics/wxWidgets-3.0/files/patch-include-wx-math.h.diff 2013-08-30 18:08:37 UTC (rev 110365) +++ trunk/dports/graphics/wxWidgets-3.0/files/patch-include-wx-math.h.diff 2013-08-30 18:18:10 UTC (rev 110366) @@ -1,11 +1,17 @@ ---- include/wx/math.h.orig 2013-08-29 12:45:25.000000000 -0400 -+++ include/wx/math.h 2013-08-29 12:45:40.000000000 -0400 -@@ -62,7 +62,7 @@ +Upstream: http://trac.wxwidgets.org/changeset/74456 +--- include/wx/math.h (revision 73280) ++++ include/wx/math.h (revision 74456) +@@ -62,7 +62,12 @@ add more compilers with C99 support here: using C99 isfinite() is preferable to using BSD-ish finite() */ - #define wxFinite(x) isfinite(x) -+ #define wxFinite(x) std::isfinite(x) ++ #if defined(_GLIBCXX_CMATH) || defined(_LIBCPP_CMATH) ++ // these <cmath> headers #undef isfinite ++ #define wxFinite(x) std::isfinite(x) ++ #else ++ #define wxFinite(x) isfinite(x) ++ #endif #elif ( defined(__GNUG__)||defined(__GNUWIN32__)||defined(__DJGPP__)|| \ defined(__SGI_CC__)||defined(__SUNCC__)||defined(__XLC__)|| \ defined(__HPUX__) ) && ( !defined(wxOSX_USE_IPHONE) || wxOSX_USE_IPHONE == 0 )

1 0

[110365] trunk/dports/science/gnuradio/Portfile
by michaelld＠macports.org 30 Aug '13

30 Aug '13

Revision: 110365 https://trac.macports.org/changeset/110365 Author: michaelld(a)macports.org Date: 2013-08-30 11:08:37 -0700 (Fri, 30 Aug 2013) Log Message: ----------- gnuradio: * fix compiler blacklists and comments; * update releasse to 3.7.1; * update devel to d19aa281 and next to 880d0392 (both 20130829). Modified Paths: -------------- trunk/dports/science/gnuradio/Portfile Modified: trunk/dports/science/gnuradio/Portfile =================================================================== --- trunk/dports/science/gnuradio/Portfile 2013-08-30 18:04:31 UTC (rev 110364) +++ trunk/dports/science/gnuradio/Portfile 2013-08-30 18:08:37 UTC (rev 110365) @@ -22,8 +22,7 @@ if {${subport} == ${name}} { - version 3.7.0 - revision 2 + version 3.7.1 long_description ${description}: \ This port is kept up with the GNU Radio release, currently ${version}, which is typically updated every few months. @@ -35,8 +34,8 @@ master_sites http://gnuradio.org/releases/gnuradio gnu checksums \ - rmd160 6b899929b072edf6c3784efbff5836531c558f6a \ - sha256 c18e12f119df5ea49ea2ed8ccde3b13043d9c4adfbbb28ac3f15122c91e646a5 + rmd160 c3c346d5d9a9b6d91f30b4b5d56737dcb9f41125 \ + sha256 e9f7f66d175365e281175f889ed4fc46e20318affa8f1f5b4edbe477378ad6cd livecheck.url http://gnuradio.org/releases/gnuradio/?C=M&O=D livecheck.regex >LATEST-IS-(\[^<\]*)< @@ -73,13 +72,13 @@ long_description ${description}: \ This port is kept up with the GNU Radio GIT 'master' branch, which is typically updated daily to weekly. This version of GNU Radio generally contains fixes to, and its API is compatible with, the current GNU Radio release, and will be incorporated in an upcoming release. This port may or not compile or function correctly, as it represents a work in progress. If it does not work, check back in a few days. Or try deactivating the currently active gnuradio port, cleaning any current builds, and trying again. - version 3.7.1_20130828 + version 3.7.2_20130829 conflicts gnuradio-legacy gnuradio gnuradio-next fetch.type git git.url http://git.gnuradio.org/git/gnuradio.git - git.branch 55f637b609d676c7189dbf7c939a1284225768e9 + git.branch d19aa281291a4cb45b3c30cdaafcea9eee5d1887 livecheck.url http://gnuradio.org/cgit/gnuradio.git/log/?h=master livecheck.version ${git.branch} @@ -92,13 +91,13 @@ long_description ${description}: \ This port is kept up with the GNU Radio GIT 'next' branch, which is typically updated daily to weekly. This version of GNU Radio represents the next major release of GNU Radio, and hence its API is likely to be different than that provided by either gnuradio or gnuradio-devel. This port may or not compile or function correctly, as it represents a work in progress. If it does not work, check back in a few days. Or try deactivating the currently active gnuradio port, cleaning any current builds, and trying again. - version 3.8.0_20130828 + version 3.8.0_20130829 conflicts gnuradio-legacy gnuradio gnuradio-devel fetch.type git git.url http://git.gnuradio.org/git/gnuradio.git - git.branch efed905156813b47dfdf486bdbe312fea6b2da71 + git.branch 880d0392c2371cf1b67ec1481978e8f9e1cae9c6 livecheck.url http://gnuradio.org/cgit/gnuradio.git/log/?h=next livecheck.version ${git.branch} @@ -125,6 +124,21 @@ configure.args-append -DENABLE_GR_CTRLPORT=OFF } + + # VOLK requires a GCC variant (Apple or MacPorts), for now; + # blacklist all clang variants, for now. + # http://trac.macports.org/ticket/37979 + + compiler.blacklist *clang* + +} else { + + # legacy works with Apple GCC only, because the cmake build script + # does not robustly check for the xgetbv instruction; a fix for + # this issue is in release 3.7.1 and newer. + + compiler.blacklist *clang* macports* dragonegg* + } use_parallel_build yes @@ -142,11 +156,6 @@ configure.dir ${vpath} build.dir ${vpath} -# VOLK requires an Apple GCC variant (including the ones from -# MacPorts), for now; blacklist all others, for now. -# http://trac.macports.org/ticket/37979 -compiler.blacklist *clang* macports-gcc* dragonegg* - # let CMake figure out some flags configure.ldflags

1 0

[110364] trunk/dports/science/gvemod-xforms-example/Portfile
by jeremyhu＠macports.org 30 Aug '13

30 Aug '13

Revision: 110364 https://trac.macports.org/changeset/110364 Author: jeremyhu(a)macports.org Date: 2013-08-30 11:04:31 -0700 (Fri, 30 Aug 2013) Log Message: ----------- gvemod-xforms-example: Set -std=gnu89 rather than falling back to llvm-gcc Modified Paths: -------------- trunk/dports/science/gvemod-xforms-example/Portfile Modified: trunk/dports/science/gvemod-xforms-example/Portfile =================================================================== --- trunk/dports/science/gvemod-xforms-example/Portfile 2013-08-30 18:03:06 UTC (rev 110363) +++ trunk/dports/science/gvemod-xforms-example/Portfile 2013-08-30 18:04:31 UTC (rev 110364) @@ -28,9 +28,7 @@ depends_lib port:geomview \ port:xforms -if {${configure.compiler} == "clang"} { - configure.compiler llvm-gcc-4.2 -} +configure.cflags-append -std=gnu89 platform darwin 9 { configure.ldflags-append \ -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:\

1 0

[110363] trunk/dports/science/gvemodules-xforms/Portfile
by jeremyhu＠macports.org 30 Aug '13

30 Aug '13

Revision: 110363 https://trac.macports.org/changeset/110363 Author: jeremyhu(a)macports.org Date: 2013-08-30 11:03:06 -0700 (Fri, 30 Aug 2013) Log Message: ----------- gvemodules-xforms: Set -std=gnu89 rather than falling back to llvm-gcc Modified Paths: -------------- trunk/dports/science/gvemodules-xforms/Portfile Modified: trunk/dports/science/gvemodules-xforms/Portfile =================================================================== --- trunk/dports/science/gvemodules-xforms/Portfile 2013-08-30 17:56:07 UTC (rev 110362) +++ trunk/dports/science/gvemodules-xforms/Portfile 2013-08-30 18:03:06 UTC (rev 110363) @@ -31,9 +31,7 @@ depends_lib port:geomview \ port:xforms -if {${configure.compiler} == "clang"} { - configure.compiler llvm-gcc-4.2 -} +configure.cflags-append -std=gnu89 platform darwin 9 { configure.ldflags-append \ -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:\

1 0

[110362] trunk/dports/science/gnuradio/Portfile
by jeremyhu＠macports.org 30 Aug '13

30 Aug '13

Revision: 110362 https://trac.macports.org/changeset/110362 Author: jeremyhu(a)macports.org Date: 2013-08-30 10:56:07 -0700 (Fri, 30 Aug 2013) Log Message: ----------- gnuradio: Simplify compiler.blacklist with patterns Modified Paths: -------------- trunk/dports/science/gnuradio/Portfile Modified: trunk/dports/science/gnuradio/Portfile =================================================================== --- trunk/dports/science/gnuradio/Portfile 2013-08-30 17:12:11 UTC (rev 110361) +++ trunk/dports/science/gnuradio/Portfile 2013-08-30 17:56:07 UTC (rev 110362) @@ -145,9 +145,7 @@ # VOLK requires an Apple GCC variant (including the ones from # MacPorts), for now; blacklist all others, for now. # http://trac.macports.org/ticket/37979 -compiler.blacklist \ - clang macports-clang-2.9 macports-clang-3.0 macports-clang-3.1 \ - macports-clang-3.2 macports-clang-3.3 macports-clang-3.4 +compiler.blacklist *clang* macports-gcc* dragonegg* # let CMake figure out some flags

1 0

[110361] trunk/dports/php/php-event/Portfile
by ryandesign＠macports.org 30 Aug '13

30 Aug '13

Revision: 110361 https://trac.macports.org/changeset/110361 Author: ryandesign(a)macports.org Date: 2013-08-30 10:12:11 -0700 (Fri, 30 Aug 2013) Log Message: ----------- php-event: use sockets Modified Paths: -------------- trunk/dports/php/php-event/Portfile Modified: trunk/dports/php/php-event/Portfile =================================================================== --- trunk/dports/php/php-event/Portfile 2013-08-30 16:52:45 UTC (rev 110360) +++ trunk/dports/php/php-event/Portfile 2013-08-30 17:12:11 UTC (rev 110361) @@ -6,6 +6,7 @@ name php-event version 1.7.5 +revision 1 categories-append devel platforms darwin maintainers ryandesign openmaintainer @@ -23,9 +24,13 @@ if {${name} ne ${subport}} { depends_lib-append port:libevent \ - port:openssl + port:openssl \ + port:${php}-sockets configure.args-append \ --with-event-libevent-dir=${prefix} \ --with-openssl-dir=${prefix} + + configure.cflags-append \ + -DHAVE_SOCKETS }

1 0

[110360] trunk/dports/emulators/lisaem/Portfile
by ryandesign＠macports.org 30 Aug '13

30 Aug '13

Revision: 110360 https://trac.macports.org/changeset/110360 Author: ryandesign(a)macports.org Date: 2013-08-30 09:52:45 -0700 (Fri, 30 Aug 2013) Log Message: ----------- lisaem: fix destroot if done separately from build Modified Paths: -------------- trunk/dports/emulators/lisaem/Portfile Modified: trunk/dports/emulators/lisaem/Portfile =================================================================== --- trunk/dports/emulators/lisaem/Portfile 2013-08-30 16:52:20 UTC (rev 110359) +++ trunk/dports/emulators/lisaem/Portfile 2013-08-30 16:52:45 UTC (rev 110360) @@ -41,7 +41,8 @@ destroot.destdir pre-destroot { - destroot.env-append [join ${build.env}] \ + destroot.env-append CC="${configure.cc} [get_canonical_archflags cc] -Wno-error -Wno-return-type" \ + CXX="${configure.cxx} [get_canonical_archflags cxx]" \ PREFIXAPP=${destroot}${applications_dir} \ PREFIXBIN=${destroot}${prefix}/bin \ PREFIXLIB=${destroot}${prefix}/share

1 0