gettext-libdir.patch

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