ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-28 09:39:00 +00:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity
9424b6f998
openwrt/package/libs/elfutils/patches/003-libintl-compatibility.patch

73 lines
1.5 KiB
Diff
Raw Normal View History

elfutils: bump to 0.173 - Removed hacks to use standalone argp as upstream now detects it nicely. - As we are already installing files, use files from PKG_INSTALL_DIR and not PKG_BUILD_DIR - Only changes Makefile.am as PKG_FIXUP:=autoreconf is in use Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
2018-06-17 09:08:51 +00:00
--- a/libelf/libelfP.h
+++ b/libelf/libelfP.h
elfutils: bump to 0.169 Removed patches (now upstream): - 004-maybe-uninitialized.patch - 007-fix_TEMP_FAILURE_RETRY.patch Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
2017-05-05 23:05:56 +00:00
@@ -39,6 +39,9 @@
elfutils: bump to 0.162 Besides source.tgz, 001-elfutils-portability.patch (provided by upstream project) where updated. Other patches where updated to fix hulk warnings and minor conflicts. Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com> SVN-Revision: 45984
2015-06-15 07:46:21 +00:00
#include <stdio.h>
elfutils: import package from packages.git elfutils is required by perf. So we'll move this package from packages.git and make it part of the core distribution. Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> SVN-Revision: 45969
2015-06-14 17:43:40 +00:00
#include <string.h>
+#ifdef _ /* fix libintl-stub */
+#undef _
+#endif
/* gettext helper macros. */
#define _(Str) dgettext ("elfutils", Str)
elfutils: bump to 0.173 - Removed hacks to use standalone argp as upstream now detects it nicely. - As we are already installing files, use files from PKG_INSTALL_DIR and not PKG_BUILD_DIR - Only changes Makefile.am as PKG_FIXUP:=autoreconf is in use Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
2018-06-17 09:08:51 +00:00
--- a/libdw/libdwP.h
+++ b/libdw/libdwP.h
@@ -35,7 +35,9 @@
elfutils: import package from packages.git elfutils is required by perf. So we'll move this package from packages.git and make it part of the core distribution. Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> SVN-Revision: 45969
2015-06-14 17:43:40 +00:00
#include <libdw.h>
#include <dwarf.h>
-
+#ifdef _ /* fix libintl-stub */
+#undef _
+#endif
/* gettext helper macros. */
#define _(Str) dgettext ("elfutils", Str)
elfutils: bump to 0.173 - Removed hacks to use standalone argp as upstream now detects it nicely. - As we are already installing files, use files from PKG_INSTALL_DIR and not PKG_BUILD_DIR - Only changes Makefile.am as PKG_FIXUP:=autoreconf is in use Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
2018-06-17 09:08:51 +00:00
--- a/libdwfl/libdwflP.h
+++ b/libdwfl/libdwflP.h
elfutils: bump to 0.169 Removed patches (now upstream): - 004-maybe-uninitialized.patch - 007-fix_TEMP_FAILURE_RETRY.patch Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
2017-05-05 23:05:56 +00:00
@@ -43,6 +43,9 @@
elfutils: import package from packages.git elfutils is required by perf. So we'll move this package from packages.git and make it part of the core distribution. Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> SVN-Revision: 45969
2015-06-14 17:43:40 +00:00
typedef struct Dwfl_Process Dwfl_Process;
+#ifdef _ /* fix libintl-stub */
+#undef _
+#endif
/* gettext helper macros. */
#define _(Str) dgettext ("elfutils", Str)
elfutils: bump to 0.173 - Removed hacks to use standalone argp as upstream now detects it nicely. - As we are already installing files, use files from PKG_INSTALL_DIR and not PKG_BUILD_DIR - Only changes Makefile.am as PKG_FIXUP:=autoreconf is in use Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
2018-06-17 09:08:51 +00:00
--- a/libasm/libasmP.h
+++ b/libasm/libasmP.h
elfutils: bump to 0.167 Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
2016-10-14 00:02:47 +00:00
@@ -35,6 +35,9 @@
elfutils: import package from packages.git elfutils is required by perf. So we'll move this package from packages.git and make it part of the core distribution. Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> SVN-Revision: 45969
2015-06-14 17:43:40 +00:00
elfutils: bump to 0.167 Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
2016-10-14 00:02:47 +00:00
#include "libdwelf.h"
elfutils: import package from packages.git elfutils is required by perf. So we'll move this package from packages.git and make it part of the core distribution. Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> SVN-Revision: 45969
2015-06-14 17:43:40 +00:00
+#ifdef _ /* fix libintl-stub */
+#undef _
+#endif
/* gettext helper macros. */
#define _(Str) dgettext ("elfutils", Str)
elfutils: produce correct libelf.pc file when building with full nls When building with full lagnuage support, libelf.so will depend on and link with libintl.so so we need to change the pkg-config template to reflect this library dependency. Also change the Makefile to only pass --disable-nls to configure when the full nls support is actually disabled in the buildroot config. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-12-20 07:04:46 +00:00
--- a/config/libelf.pc.in
+++ b/config/libelf.pc.in
@@ -8,7 +8,7 @@ Description: elfutils libelf library to
Version: @VERSION@
URL: http://elfutils.org/
-Libs: -L${libdir} -lelf
+Libs: -L${libdir} -lelf @intl_LDFLAGS@
Cflags: -I${includedir}
Requires.private: zlib
--- a/configure.ac
+++ b/configure.ac
@@ -538,6 +538,9 @@ AC_CONFIG_FILES([config/libelf.pc config
AC_SUBST(USE_NLS, yes)
AM_PO_SUBDIRS
+case "$USE_NLS" in yes) intl_LDFLAGS="-lintl" ;; esac
+AC_SUBST([intl_LDFLAGS])
+
dnl Appended to the config.h file.
dnl We hide all kinds of configuration magic in lib/eu-config.h.
AH_BOTTOM([#include <eu-config.h>])
Reference in New Issue Copy Permalink