[108788] trunk/dports/graphics/wxWidgets30
mojca at macports.org
mojca at macports.org
Thu Aug 1 15:36:01 PDT 2013
Revision: 108788
https://trac.macports.org/changeset/108788
Author: mojca at macports.org
Date: 2013-08-01 15:36:01 -0700 (Thu, 01 Aug 2013)
Log Message:
-----------
wxWidgets30: add myself as co-maintainer, fix universal build #39786
Modified Paths:
--------------
trunk/dports/graphics/wxWidgets30/Portfile
trunk/dports/graphics/wxWidgets30/files/patch-configure-change_install_names.diff
Modified: trunk/dports/graphics/wxWidgets30/Portfile
===================================================================
--- trunk/dports/graphics/wxWidgets30/Portfile 2013-08-01 22:19:18 UTC (rev 108787)
+++ trunk/dports/graphics/wxWidgets30/Portfile 2013-08-01 22:36:01 UTC (rev 108788)
@@ -11,7 +11,7 @@
license wxwidgets-3.1
categories graphics devel
platforms darwin
-maintainers jwa
+maintainers jwa mojca
description mature cross-platform C++ GUI framework
long_description wxWidgets is a mature open-source cross-platform C++ \
GUI framework for Mac OS, Unix, Linux, Windows. It can \
@@ -69,16 +69,17 @@
--disable-sdltest \
--enable-unicode \
--enable-display \
- --enable-xrc
+ --enable-xrc \
+ --with-macosx-sdk=no \
+ --with-macosx-version-min=no
build.target
use_parallel_build yes
variant universal {
- configure.args-append --enable-universal_binary \
- --with-macosx-sdk=${configure.sdkroot}/ \
- --with-macosx-version-min=${macosx_deployment_target}
+ set archs [join ${configure.universal_archs} ,]
+ configure.args-append --enable-universal_binary=${archs}
}
configure.ccache no
@@ -88,10 +89,6 @@
ln -sf ${confscript} ${destroot}${prefix}/bin/wx-config
}
-post-patch {
- reinplace "s|@@MP_ARCH_FLAGS@@|[get_canonical_archflags]|g" ${worksrcpath}/../configure
-}
-
default_variants +sdl
variant monolithic description {build only one library} {
Modified: trunk/dports/graphics/wxWidgets30/files/patch-configure-change_install_names.diff
===================================================================
--- trunk/dports/graphics/wxWidgets30/files/patch-configure-change_install_names.diff 2013-08-01 22:19:18 UTC (rev 108787)
+++ trunk/dports/graphics/wxWidgets30/files/patch-configure-change_install_names.diff 2013-08-01 22:36:01 UTC (rev 108788)
@@ -1,28 +1,6 @@
---- configure 2011-10-19 17:36:57.000000000 +0200
-+++ configure 2011-10-19 18:01:41.000000000 +0200
-@@ -19176,10 +19176,10 @@
- fi
-
- if test "x$wxUSE_UNIVERSAL_BINARY" != xyes; then
-- OSX_ARCH_OPTS=$wxUSE_UNIVERSAL_BINARY
-+ OSX_ARCH_OPTS="@@MP_ARCH_FLAGS@@"
- else OSX_ARCH_OPTS="ppc,i386"
- if test "$wxUSE_OSX_COCOA" = 1; then
-- OSX_ARCH_OPTS="$OSX_ARCH_OPTS,x86_64"
-+ OSX_ARCH_OPTS="@@MP_ARCH_FLAGS@@"
- fi
- fi
-
-@@ -19204,8 +19204,6 @@
- disable_macosx_deps=yes
- fi
-
-- OSX_ARCH_OPTS=`echo $OSX_ARCH_OPTS | sed -e 's/^/-arch /' -e 's/,/ -arch /g'`
--
- CXXFLAGS="$OSX_ARCH_OPTS $CXXFLAGS"
- CFLAGS="$OSX_ARCH_OPTS $CFLAGS"
- OBJCXXFLAGS="$OSX_ARCH_OPTS $OBJCXXFLAGS"
-@@ -29071,16 +29069,18 @@
+--- configure.orig
++++ configure
+@@ -29407,16 +29405,18 @@ rm -f core conftest.err conftest.$ac_objext \
DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
cat <<EOF >change-install-names
#!/bin/sh
@@ -47,31 +25,3 @@
fi
HEADER_PAD_OPTION="-headerpad_max_install_names"
---- configure.in 2011-10-19 17:36:57.000000000 +0200
-+++ configure.in 2011-10-19 17:38:38.000000000 +0200
-@@ -3847,16 +3847,18 @@
- DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
- cat <<EOF >change-install-names
- #!/bin/sh
--libnames=\`cd \${2} ; ls -1 | grep '\.[[0-9]][[0-9]]*\.dylib\$'\`
--for i in \${libnames} ; do
-- ${HOST_PREFIX}install_name_tool -id \${3}/\${i} \${1}/\${i}
-- for dep in \${libnames} ; do
-- ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${3}/\${dep} \${1}/\${i}
-- done
-+libnames=\`find \$4 -type f -a -regex '.*\.[0-9]+\.dylib' -exec basename '{}' \;\`
-+changes=''
-+for dep in \$libnames; do
-+ changes="\$changes -change \$4/\$dep \$3/\$dep"
- done
-+for i in \$libnames; do
-+ ${HOST_PREFIX}install_name_tool \$changes -id \$3/\$i \$1/\$i
-+done
-+${HOST_PREFIX}install_name_tool \$changes \$2/wxrc-2.9
- EOF
- chmod +x change-install-names
-- DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \$(wx_top_builddir)/lib \${libdir}"
-+ DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \${DESTDIR}\${bindir} \${libdir} \$(wx_top_builddir)/lib"
- fi
-
- dnl the HEADER_PAD_OPTION is required by some wx samples to avoid the error:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130801/db3d30a6/attachment.html>
More information about the macports-changes
mailing list