[79390] trunk/dports/graphics/wxWidgets-devel/files/ patch-configure-change_install_names.diff
and.damore at macports.org
and.damore at macports.org
Sun Jun 12 10:00:33 PDT 2011
Revision: 79390
http://trac.macports.org/changeset/79390
Author: and.damore at macports.org
Date: 2011-06-12 10:00:33 -0700 (Sun, 12 Jun 2011)
Log Message:
-----------
wxwidgets-devel files patched repeateadly in r79389, fixed
Revision Links:
--------------
http://trac.macports.org/changeset/79389
Modified Paths:
--------------
trunk/dports/graphics/wxWidgets-devel/files/patch-configure-change_install_names.diff
Modified: trunk/dports/graphics/wxWidgets-devel/files/patch-configure-change_install_names.diff
===================================================================
--- trunk/dports/graphics/wxWidgets-devel/files/patch-configure-change_install_names.diff 2011-06-12 13:15:01 UTC (rev 79389)
+++ trunk/dports/graphics/wxWidgets-devel/files/patch-configure-change_install_names.diff 2011-06-12 17:00:33 UTC (rev 79390)
@@ -54,115 +54,3 @@
fi
dnl the HEADER_PAD_OPTION is required by some wx samples to avoid the error:
---- configure.orig 2011-01-13 02:34:25.000000000 -0800
-+++ configure 2011-01-13 02:33:45.000000000 -0800
-@@ -34968,16 +34968,18 @@
- DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
- cat <<EOF >change-install-names
- #!/bin/sh
--libnames=\`cd \${1} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\`
--for i in \${libnames} ; do
-- ${HOST_PREFIX}install_name_tool -id \${1}/\${i} \${1}/\${i}
-- for dep in \${libnames} ; do
-- ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${1}/\${dep} \${1}/\${i}
-- done
-+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
-- DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${libdir} \$(wx_top_builddir)/lib"
-+ DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \${DESTDIR}\${bindir} \${libdir} \$(wx_top_builddir)/lib"
- fi
-
- HEADER_PAD_OPTION="-headerpad_max_install_names"
---- configure.in.orig 2011-01-13 02:34:15.000000000 -0800
-+++ configure.in 2011-01-13 02:32:44.000000000 -0800
-@@ -3989,16 +3989,18 @@
- DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
- cat <<EOF >change-install-names
- #!/bin/sh
--libnames=\`cd \${1} ; ls -1 | grep '\.[[0-9]][[0-9]]*\.dylib\$'\`
--for i in \${libnames} ; do
-- ${HOST_PREFIX}install_name_tool -id \${1}/\${i} \${1}/\${i}
-- for dep in \${libnames} ; do
-- ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${1}/\${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 \${libdir} \$(wx_top_builddir)/lib"
-+ 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:
---- configure.orig 2011-01-13 02:34:25.000000000 -0800
-+++ configure 2011-01-13 02:33:45.000000000 -0800
-@@ -34968,16 +34968,18 @@
- DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
- cat <<EOF >change-install-names
- #!/bin/sh
--libnames=\`cd \${1} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\`
--for i in \${libnames} ; do
-- ${HOST_PREFIX}install_name_tool -id \${1}/\${i} \${1}/\${i}
-- for dep in \${libnames} ; do
-- ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${1}/\${dep} \${1}/\${i}
-- done
-+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
-- DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${libdir} \$(wx_top_builddir)/lib"
-+ DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \${DESTDIR}\${bindir} \${libdir} \$(wx_top_builddir)/lib"
- fi
-
- HEADER_PAD_OPTION="-headerpad_max_install_names"
---- configure.in.orig 2011-01-13 02:34:15.000000000 -0800
-+++ configure.in 2011-01-13 02:32:44.000000000 -0800
-@@ -3989,16 +3989,18 @@
- DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
- cat <<EOF >change-install-names
- #!/bin/sh
--libnames=\`cd \${1} ; ls -1 | grep '\.[[0-9]][[0-9]]*\.dylib\$'\`
--for i in \${libnames} ; do
-- ${HOST_PREFIX}install_name_tool -id \${1}/\${i} \${1}/\${i}
-- for dep in \${libnames} ; do
-- ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${1}/\${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 \${libdir} \$(wx_top_builddir)/lib"
-+ 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/20110612/5d36bcf0/attachment.html>
More information about the macports-changes
mailing list