gettext-libdir.patch

   1 --- gettext-0.20.1/gettext-runtime/gnulib-m4/lib-prefix.m4.orig 2019-06-18 17:53:08.859806346 +0200
   2 +++ gettext-0.20.1/gettext-runtime/gnulib-m4/lib-prefix.m4      2019-06-18 18:56:16.922617983 +0200
   3 @@ -225,12 +225,14 @@
   4                 if test -d "$searchdir"; then
   5                   case "$searchdir" in
   6                     */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
   7 +                   */libx32/ | */libx32 ) acl_libdirstem=libx32 ;;
   8                     */../ | */.. )
   9                       # Better ignore directories of this form. They are misleading.
  10                       ;;
  11                     *) searchdir=`cd "$searchdir" && pwd`
  12                        case "$searchdir" in
  13                          */lib64 ) acl_libdirstem=lib64 ;;
  14 +                        */libx32 ) acl_libdirstem=libx32 ;;
  15                        esac ;;
  16                   esac
  17                 fi
  18 --- gettext-0.19.8.1/gettext-runtime/gnulib-m4/lib-link.m4.orig 2016-06-11 14:59:32.000000000 +0200
  19 +++ gettext-0.19.8.1/gettext-runtime/gnulib-m4/lib-link.m4      2017-02-05 14:27:31.840415976 +0100
  20 @@ -370,7 +370,12 @@
  21            fi
  22            if test "X$found_dir" != "X"; then
  23              dnl Found the library.
  24 +
  25 +            if test "X$found_dir" = "X/usr/$acl_libdirstem" || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
  26 +            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
  27 +            else
  28              LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
  29 +            fi
  30              if test "X$found_so" != "X"; then
  31                dnl Linking with a shared library. We attempt to hardcode its
  32                dnl directory into the executable's runpath, unless it's the
  33 --- gettext-0.20.1/gettext-tools/gnulib-m4/lib-prefix.m4.orig   2016-06-11 14:59:32.000000000 +0200
  34 +++ gettext-0.20.1/gettext-tools/gnulib-m4/lib-prefix.m4        2017-02-05 14:26:12.237083553 +0100
  35 @@ -225,12 +225,14 @@
  36                 if test -d "$searchdir"; then
  37                   case "$searchdir" in
  38                     */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
  39 +                   */libx32/ | */libx32 ) acl_libdirstem=libx32 ;;
  40                     */../ | */.. )
  41                       # Better ignore directories of this form. They are misleading.
  42                       ;;
  43                     *) searchdir=`cd "$searchdir" && pwd`
  44                        case "$searchdir" in
  45                          */lib64 ) acl_libdirstem=lib64 ;;
  46 +                        */libx32 ) acl_libdirstem=libx32 ;;
  47                        esac ;;
  48                   esac
  49                 fi
  50 --- gettext-0.19.8.1/gettext-tools/gnulib-m4/lib-link.m4.orig   2016-06-11 14:59:32.000000000 +0200
  51 +++ gettext-0.19.8.1/gettext-tools/gnulib-m4/lib-link.m4        2017-02-05 14:27:31.840415976 +0100
  52 @@ -370,7 +370,12 @@
  53            fi
  54            if test "X$found_dir" != "X"; then
  55              dnl Found the library.
  56 +
  57 +            if test "X$found_dir" = "X/usr/$acl_libdirstem" || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
  58 +            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
  59 +            else
  60              LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
  61 +            fi
  62              if test "X$found_so" != "X"; then
  63                dnl Linking with a shared library. We attempt to hardcode its
  64                dnl directory into the executable's runpath, unless it's the