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

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