Ticket #26410: patch-configure-change_install_names.diff

File patch-configure-change_install_names.diff, 2.6 KB (added by stevecheckoway (Stephen Checkoway), 13 years ago)

Patch to generated change_install_names script

  • configure

    old new  
    3496834968            DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
    3496934969            cat <<EOF >change-install-names
    3497034970#!/bin/sh
    34971 libnames=\`cd \${1} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\`
    34972 for i in \${libnames} ; do
    34973     ${HOST_PREFIX}install_name_tool -id \${1}/\${i} \${1}/\${i}
    34974     for dep in \${libnames} ; do
    34975         ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${1}/\${dep} \${1}/\${i}
    34976     done
     34971libnames=\`find \$4  -type f -a -regex '.*\.[0-9]+\.dylib' -exec basename '{}' \;\`
     34972changes=''
     34973for dep in \$libnames; do
     34974    changes="\$changes -change \$4/\$dep \$3/\$dep"
    3497734975done
     34976for i in \$libnames; do
     34977    ${HOST_PREFIX}install_name_tool \$changes -id \$3/\$i \$1/\$i
     34978done
     34979${HOST_PREFIX}install_name_tool \$changes \$2/wxrc-2.9
    3497834980EOF
    3497934981            chmod +x change-install-names
    34980             DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${libdir} \$(wx_top_builddir)/lib"
     34982            DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \${DESTDIR}\${bindir} \${libdir} \$(wx_top_builddir)/lib"
    3498134983        fi
    3498234984
    3498334985                                        HEADER_PAD_OPTION="-headerpad_max_install_names"

  • configure.in

    old new  
    39893989            DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
    39903990            cat <<EOF >change-install-names
    39913991#!/bin/sh
    3992 libnames=\`cd \${1} ; ls -1 | grep '\.[[0-9]][[0-9]]*\.dylib\$'\`
    3993 for i in \${libnames} ; do
    3994     ${HOST_PREFIX}install_name_tool -id \${1}/\${i} \${1}/\${i}
    3995     for dep in \${libnames} ; do
    3996         ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${1}/\${dep} \${1}/\${i}
    3997     done
     3992libnames=\`find \$4  -type f -a -regex '.*\.[0-9]+\.dylib' -exec basename '{}' \;\`
     3993changes=''
     3994for dep in \$libnames; do
     3995    changes="\$changes -change \$4/\$dep \$3/\$dep"
    39983996done
     3997for i in \$libnames; do
     3998    ${HOST_PREFIX}install_name_tool \$changes -id \$3/\$i \$1/\$i
     3999done
     4000${HOST_PREFIX}install_name_tool \$changes \$2/wxrc-2.9
    39994001EOF
    40004002            chmod +x change-install-names
    4001             DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${libdir} \$(wx_top_builddir)/lib"
     4003            DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \${DESTDIR}\${bindir} \${libdir} \$(wx_top_builddir)/lib"
    40024004        fi
    40034005
    40044006        dnl the HEADER_PAD_OPTION is required by some wx samples to avoid the error: