jpeg-libtool.patch 2.1 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566
  1. --- jpeg/configure
  2. +++ jpeg/configure
  3. @@ -1559,7 +1559,7 @@
  4. if test "x$LTSTATIC" = xno; then
  5. disable_static="--disable-static"
  6. fi
  7. - $srcdir/ltconfig $disable_shared $disable_static $srcdir/ltmain.sh
  8. + $srcdir/ltconfig $disable_shared $disable_static $srcdir/ltmain.sh $CHOST
  9. fi
  10. # Select memory manager depending on user input.
  11. --- jpeg/ltconfig
  12. +++ jpeg/ltconfig
  13. @@ -299,6 +299,7 @@
  14. # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
  15. case "$host_os" in
  16. linux-gnu*) ;;
  17. +linux-uclibc*) ;;
  18. linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
  19. esac
  20. @@ -553,7 +553,9 @@
  21. # On HP-UX, both CC and GCC only warn that PIC is supported... then they
  22. # create non-PIC objects. So, if there were any warnings, we assume that
  23. # PIC is not supported.
  24. + # Make sure we only test warnings on HP-UX (pic_flag == +Z) or we can
  25. + # easily break Linux builds http://bugs.gentoo.org/70947
  26. - if test -s conftest.err; then
  27. + if test -s conftest.err -a "$pic_flag" = "+Z"; then
  28. echo "$ac_t"no 1>&6
  29. can_build_shared=no
  30. pic_flag=
  31. @@ -1210,7 +1210,6 @@
  32. else
  33. # Only the GNU ld.so supports shared libraries on MkLinux.
  34. case "$host_cpu" in
  35. - powerpc*) dynamic_linker=no ;;
  36. *) dynamic_linker='Linux ld.so' ;;
  37. esac
  38. fi
  39. @@ -1259,6 +1260,25 @@
  40. fi
  41. ;;
  42. +linux-uclibc*)
  43. + version_type=linux
  44. + need_lib_prefix=no
  45. + need_version=no
  46. + library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so'
  47. + soname_spec='${libname}${release}.so.$major'
  48. + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
  49. + shlibpath_var=LD_LIBRARY_PATH
  50. + shlibpath_overrides_runpath=no
  51. + deplibs_check_method=pass_all
  52. + # This implies no fast_install, which is unacceptable.
  53. + # Some rework will be needed to allow for fast_install
  54. + # before this can be enabled.
  55. + # Note: copied from linux-gnu, and may not be appropriate.
  56. + hardcode_into_libs=yes
  57. + # Assume using the uClibc dynamic linker.
  58. + dynamic_linker="uClibc ld.so"
  59. + ;;
  60. +
  61. netbsd* | openbsd*)
  62. version_type=sunos
  63. library_names_spec='${libname}${release}.so.$versuffix'