package/libs/elfutils/patches/003-libintl-compatibility.patch

   1 --- a/config/libelf.pc.in
   2 +++ b/config/libelf.pc.in
   3 @@ -8,7 +8,7 @@ Description: elfutils libelf library to
   4  Version: @VERSION@
   5  URL: http://elfutils.org/
   6
   7 -Libs: -L${libdir} -lelf
   8 +Libs: -L${libdir} -lelf @intl_LDFLAGS@
   9  Cflags: -I${includedir}
  10
  11  Requires.private: zlib
  12 --- a/configure.ac
  13 +++ b/configure.ac
  14 @@ -586,6 +586,9 @@ AC_CONFIG_FILES([config/libelf.pc config
  15  AC_SUBST(USE_NLS, yes)
  16  AM_PO_SUBDIRS
  17
  18 +case "$USE_NLS" in yes) intl_LDFLAGS="-lintl" ;; esac
  19 +AC_SUBST([intl_LDFLAGS])
  20 +
  21  dnl Appended to the config.h file.
  22  dnl We hide all kinds of configuration magic in lib/eu-config.h.
  23  AH_BOTTOM([#include <eu-config.h>])
  24 --- a/libasm/libasmP.h
  25 +++ b/libasm/libasmP.h
  26 @@ -36,6 +36,9 @@
  27
  28  #include "libdwelf.h"
  29
  30 +#ifdef _ /* fix libintl-stub */
  31 +#undef _
  32 +#endif
  33  /* gettext helper macros.  */
  34  #define _(Str) dgettext ("elfutils", Str)
  35
  36 --- a/libdw/libdwP.h
  37 +++ b/libdw/libdwP.h
  38 @@ -37,6 +37,9 @@
  39  #include <dwarf.h>
  40  #include "atomics.h"
  41
  42 +#ifdef _ /* fix libintl-stub */
  43 +#undef _
  44 +#endif
  45
  46  /* gettext helper macros.  */
  47  #define _(Str) dgettext ("elfutils", Str)
  48 --- a/libdwfl/libdwflP.h
  49 +++ b/libdwfl/libdwflP.h
  50 @@ -44,6 +44,9 @@
  51
  52  typedef struct Dwfl_Process Dwfl_Process;
  53
  54 +#ifdef _ /* fix libintl-stub */
  55 +#undef _
  56 +#endif
  57  /* gettext helper macros.  */
  58  #define _(Str) dgettext ("elfutils", Str)
  59
  60 --- a/libelf/libelfP.h
  61 +++ b/libelf/libelfP.h
  62 @@ -39,6 +39,9 @@
  63  #include <stdio.h>
  64  #include <string.h>
  65
  66 +#ifdef _ /* fix libintl-stub */
  67 +#undef _
  68 +#endif
  69  /* gettext helper macros.  */
  70  #define _(Str) dgettext ("elfutils", Str)
  71