Advertisement
Guest User

mingw_zziplib_configure_patch

a guest
Aug 2nd, 2013
181
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 3.72 KB | None | 0 0
  1. diff -ru zziplib-0.13.62/configure patched/configure
  2. --- zziplib-0.13.62/configure   2012-03-11 21:28:52.000000000 +0100
  3. +++ patched/configure   2013-08-02 23:28:48.122420796 +0200
  4. @@ -5908,11 +5908,13 @@
  5.    # Base MSYS/MinGW do not provide the 'file' command needed by
  6.    # func_win32_libid shell function, so use a weaker test based on 'objdump',
  7.    # unless we find 'file', for example because we are cross-compiling.
  8. -  if ( file / ) >/dev/null 2>&1; then
  9. +  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
  10. +  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
  11.      lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
  12.      lt_cv_file_magic_cmd='func_win32_libid'
  13.    else
  14. -    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
  15. +    # Keep this pattern in sync with the one in func_win32_libid.
  16. +    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
  17.      lt_cv_file_magic_cmd='$OBJDUMP -f'
  18.    fi
  19.    ;;
  20. @@ -13724,7 +13726,7 @@
  21.  ZZIPLIB_LDFLAGS=""
  22.  case "$host_os" in mingw*)
  23.      # we may assume that the backend is gnu-ld but DLLs need full resolution
  24. -    ZZIPLIB_LDFLAGS="${wl}-no-undefined ${wl}-export-all-symbols -mconsole"
  25. +    ZZIPLIB_LDFLAGS="-no-undefined ${wl}-no-undefined ${wl}-export-all-symbols -mconsole"
  26.      RESOLVES=' '
  27.  ;; darwin*)
  28.      # darwin never uses gnu-ld but the linker can do it anyway
  29. diff -ru zziplib-0.13.62/configure.ac patched/configure.ac
  30. --- zziplib-0.13.62/configure.ac    2012-03-11 21:28:35.000000000 +0100
  31. +++ patched/configure.ac    2013-08-02 23:16:27.873550426 +0200
  32. @@ -294,7 +294,8 @@
  33.  ZZIPLIB_LDFLAGS=""
  34.  case "$host_os" in mingw*)
  35.      # we may assume that the backend is gnu-ld but DLLs need full resolution
  36. -    ZZIPLIB_LDFLAGS="${wl}-no-undefined ${wl}-export-all-symbols -mconsole"
  37. +    ZZIPLIB_LDFLAGS="-no-undefined ${wl}-no-undefined ${wl}-export-all-symbols -mconsole"
  38.      RESOLVES=' '
  39.  ;; darwin*)
  40.      # darwin never uses gnu-ld but the linker can do it anyway
  41. diff -ru zziplib-0.13.62/m4/libtool.m4 patched/m4/libtool.m4
  42. --- zziplib-0.13.62/m4/libtool.m4   2009-08-23 13:38:19.000000000 +0200
  43. +++ patched/m4/libtool.m4   2013-08-02 22:57:24.381209038 +0200
  44. @@ -2999,11 +2999,13 @@
  45.    # Base MSYS/MinGW do not provide the 'file' command needed by
  46.    # func_win32_libid shell function, so use a weaker test based on 'objdump',
  47.    # unless we find 'file', for example because we are cross-compiling.
  48. -  if ( file / ) >/dev/null 2>&1; then
  49. +  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
  50. +  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
  51.      lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
  52.      lt_cv_file_magic_cmd='func_win32_libid'
  53.    else
  54. -    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
  55. +    # Keep this pattern in sync with the one in func_win32_libid.
  56. +    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
  57.      lt_cv_file_magic_cmd='$OBJDUMP -f'
  58.    fi
  59.    ;;
  60. diff -ru zziplib-0.13.62/uses/ltmain.sh patched/uses/ltmain.sh
  61. --- zziplib-0.13.62/uses/ltmain.sh  2009-08-23 13:38:18.000000000 +0200
  62. +++ patched/uses/ltmain.sh  2013-08-02 23:36:33.609957248 +0200
  63. @@ -2560,7 +2560,7 @@
  64.      ;;
  65.    *ar\ archive*) # could be an import, or static
  66.      if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
  67. -       $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
  68. +       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null ; then
  69.        win32_nmres=`eval $NM -f posix -A $1 |
  70.     $SED -n -e '
  71.         1,100{
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement