[110224] users/mojca/wxports/graphics/wxWidgets-3.0

[mojca at macports.org]

Revision: 110224
          https://trac.macports.org/changeset/110224
Author:   mojca at macports.org
Date:     2013-08-28 19:46:35 -0700 (Wed, 28 Aug 2013)
Log Message:
-----------
mojca/wxWidget-3.0: another try

Modified Paths:
--------------
    users/mojca/wxports/graphics/wxWidgets-3.0/Portfile
    users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-configure.diff

Modified: users/mojca/wxports/graphics/wxWidgets-3.0/Portfile
===================================================================
--- users/mojca/wxports/graphics/wxWidgets-3.0/Portfile	2013-08-29 00:30:55 UTC (rev 110223)
+++ users/mojca/wxports/graphics/wxWidgets-3.0/Portfile	2013-08-29 02:46:35 UTC (rev 110224)
@@ -77,10 +77,12 @@
 patch.dir           ${worksrcpath}/..
 
 # without (the second part of) this patch wxrc-2.9 ends up linking to libraries in workdir
+# http://trac.wxwidgets.org/ticket/15452
 patchfiles          patch-configure.diff
 
-# TODO: is this still needed?
-# configure.ccache    no
+post-patch {
+    reinplace "s|@@PREFIX@@|${prefix}|g" ${patch.dir}/configure
+}
 
 configure.cmd       ../configure
 configure.args      --prefix=${wxWidgets.prefix} \
@@ -169,14 +171,17 @@
     #}
 }
 
-post-destroot {
-    set confscript ${wxWidgets.prefix}/lib/wx/config/${wxtype}-unicode-${branch}
-    ln -sf ${confscript} ${destroot}${wxWidgets.prefix}/bin/wx-config
-}
+# post-destroot {
+#     set confscript ${wxWidgets.prefix}/lib/wx/config/${wxtype}-unicode-${branch}
+#     ln -sf ${confscript} ${destroot}${wxWidgets.prefix}/bin/wx-config
+# }
 
 variant universal {
     set archs [join ${configure.universal_archs} ,]
-    configure.args-append   --enable-universal_binary=${archs}
+    # --disable-precomp-headers is automatically selected with cocoa, but not with gtk
+    # http://trac.wxwidgets.org/ticket/15454
+    configure.args-append   --enable-universal_binary=${archs} \
+                            --disable-precomp-headers
 }
 
 variant monolithic description {build only one library} {

Modified: users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-configure.diff
===================================================================
--- users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-configure.diff	2013-08-29 00:30:55 UTC (rev 110223)
+++ users/mojca/wxports/graphics/wxWidgets-3.0/files/patch-configure.diff	2013-08-29 02:46:35 UTC (rev 110224)
@@ -1,5 +1,5 @@
 The first part is for GTK and makes sure that the port finds the right OpenGL library
-The second part makes sure that install_name_tool fixes links to dylib files in wxrc-2.9
+The second part makes sure that install_name_tool doesn't break library names and links (http://trac.wxwidgets.org/ticket/15452)
 --- configure.orig
 +++ configure
 @@ -22038,48 +22038,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -52,28 +52,28 @@
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libraries directories" >&5
  $as_echo_n "checking for libraries directories... " >&6; }
-@@ -29407,16 +29366,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
+@@ -29402,24 +29361,6 @@ rm -f core conftest.err conftest.$ac_objext \
+       ;;
+ 
+       *-*-darwin* )
+-        install_name_tool=`which ${HOST_PREFIX}install_name_tool`
+-        if test "$install_name_tool" -a -x "$install_name_tool"; then
+-            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}
-+libnames=\`find -E \$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
+-    done
+-done
+-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
+-        fi
+-
+-                                        HEADER_PAD_OPTION="-headerpad_max_install_names"
+       ;;
  
-                                         HEADER_PAD_OPTION="-headerpad_max_install_names"
+       *-*-cygwin* | *-*-mingw32* )
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130828/2a61a2da/attachment.html>