OpenSDE Packages Database (without history before r20070)
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

135 lines
5.4 KiB

  1. # --- T2-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # T2 SDE: package/.../libtool/multilib.patch
  5. # Copyright (C) 2006 The T2 SDE Project
  6. #
  7. # More information can be found in the files COPYING and README.
  8. #
  9. # This patch file is dual-licensed. It is available under the license the
  10. # patched project is licensed under, as long as it is an OpenSource license
  11. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12. # of the GNU General Public License as published by the Free Software
  13. # Foundation; either version 2 of the License, or (at your option) any later
  14. # version.
  15. # --- T2-COPYRIGHT-NOTE-END ---
  16. Multilib support for libtool on linux systems:
  17. libsuff is either set by environment variable LIBSUFF, or from libdir
  18. or by checking the compiler ABI (the latter one is taken from
  19. libtool-1.5.18-multilib.patch by RedHat).
  20. --jsaw
  21. diff -ur libtool-1.5.22/libtool.m4 libtool-1.5.22-T2/libtool.m4
  22. --- libtool-1.5.22/libtool.m4 2005-12-18 22:53:17.000000000 +0100
  23. +++ libtool-1.5.22-T2/libtool.m4 2006-03-07 10:44:33.000000000 +0100
  24. @@ -1572,10 +1572,46 @@
  25. # before this can be enabled.
  26. hardcode_into_libs=yes
  27. + # Check for libdir suffix (libsuff)
  28. + # If the environment varialbe LIBSUFF is set, use it as libsuff,
  29. + # or try to find out the suffix by checking the $libdir var, or
  30. + # use the compiler ABI
  31. + libsuffixes="64|32|nofp"
  32. + if test x${LIBSUFF-none} = xnone; then
  33. + case "${libdir##*/lib}" in
  34. + $libsuffixes) libsuff=${libdir##*/lib} ;;
  35. + *) # try checking compiler ABI, support libsuff=64 only
  36. + # (this check is copied from RetHat libtool-1.5.18-multilib.patch)
  37. + case "$host_cpu" in
  38. + x86_64*|s390x*|powerpc64*)
  39. + echo '[#]line __oline__ "configure"' > conftest.$ac_ext
  40. + if AC_TRY_EVAL(ac_compile); then
  41. + case `/usr/bin/file conftest.$ac_objext` in
  42. + *64-bit*)
  43. + libsuff=64
  44. + ;;
  45. + esac
  46. + fi
  47. + rm -rf conftest*
  48. + esac
  49. + ;;
  50. + esac
  51. + else
  52. + libsuff=$LIBSUFF
  53. + fi
  54. + libsuffixes=`$echo " $libsuffixes " | ${SED} -e "s%|% %g" -e "s% $libsuff % %g"`
  55. + # add remaining libsuffixes to notinst_path, if libsuff!=""
  56. + if test x$libsuff != x; then
  57. + global_notinst_path="$global_notinst_path .*/lib"
  58. + for suff in $libsuffixes; do
  59. + global_notinst_path="$global_notinst_path .*/lib$suff"
  60. + done
  61. + fi
  62. +
  63. # Append ld.so.conf contents to the search path
  64. if test -f /etc/ld.so.conf; then
  65. lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
  66. - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
  67. + sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
  68. fi
  69. # We used to test for /lib/ld.so.1 and disable shared libraries on
  70. @@ -4399,6 +4435,9 @@
  71. # The coded name of the library, if different from the real name.
  72. soname_spec=$lt_soname_spec
  73. +# paths that contain not-installed libtool libraries
  74. +global_notinst_path="$global_notinst_path"
  75. +
  76. # Commands used to build and install an old-style archive.
  77. RANLIB=$lt_RANLIB
  78. old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
  79. diff -ur libtool-1.5.22/ltmain.in libtool-1.5.22-T2/ltmain.in
  80. --- libtool-1.5.22/ltmain.in 2005-12-18 22:43:52.000000000 +0100
  81. +++ libtool-1.5.22-T2/ltmain.in 2006-03-07 10:43:43.000000000 +0100
  82. @@ -1117,7 +1117,7 @@
  83. no_install=no
  84. objs=
  85. non_pic_objects=
  86. - notinst_path= # paths that contain not-installed libtool libraries
  87. + notinst_path="$global_notinst_path" # paths that contain not-installed libtool libraries
  88. precious_files_regex=
  89. prefer_static_libs=no
  90. preload=no
  91. @@ -3411,9 +3411,9 @@
  92. # Eliminate all temporary directories.
  93. for path in $notinst_path; do
  94. - lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
  95. - deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
  96. - dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
  97. + lib_search_path=`$echo " $lib_search_path " | ${SED} -e "s% $path % %g"`
  98. + deplibs=`$echo " $deplibs " | ${SED} -e "s% -L$path % %g"`
  99. + dependency_libs=`$echo " $dependency_libs " | ${SED} -e "s% -L$path % %g"`
  100. done
  101. if test -n "$xrpath"; then
  102. diff -ur libtool-1.5.22/ltmain.sh libtool-1.5.22-T2/ltmain.sh
  103. --- libtool-1.5.22/ltmain.sh 2005-12-18 23:14:54.000000000 +0100
  104. +++ libtool-1.5.22-T2/ltmain.sh 2006-03-07 10:45:54.000000000 +0100
  105. @@ -1117,7 +1117,7 @@
  106. no_install=no
  107. objs=
  108. non_pic_objects=
  109. - notinst_path= # paths that contain not-installed libtool libraries
  110. + notinst_path="$global_notinst_path" # paths that contain not-installed libtool libraries
  111. precious_files_regex=
  112. prefer_static_libs=no
  113. preload=no
  114. @@ -3411,9 +3411,9 @@
  115. # Eliminate all temporary directories.
  116. for path in $notinst_path; do
  117. - lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
  118. - deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
  119. - dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
  120. + lib_search_path=`$echo " $lib_search_path " | ${SED} -e "s% $path % %g"`
  121. + deplibs=`$echo " $deplibs " | ${SED} -e "s% -L$path % %g"`
  122. + dependency_libs=`$echo " $dependency_libs " | ${SED} -e "s% -L$path % %g"`
  123. done
  124. if test -n "$xrpath"; then