* [Buildroot] [PATCH 1/1] package/rpm: fix build with NLS
@ 2019-04-25 16:53 Fabrice Fontaine
2019-04-25 19:53 ` Thomas Petazzoni
2019-04-26 13:03 ` Peter Korsgaard
0 siblings, 2 replies; 6+ messages in thread
From: Fabrice Fontaine @ 2019-04-25 16:53 UTC (permalink / raw)
To: buildroot
Fixes:
- http://autobuild.buildroot.org/results/26e20e19d878811d90fce52eb0951ee4d8b59068
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
...ile.am-rpm2-cpio-archive-needs-lintl.patch | 51 +++++++++++++++++++
package/rpm/rpm.mk | 2 +
2 files changed, 53 insertions(+)
create mode 100644 package/rpm/0003-Makefile.am-rpm2-cpio-archive-needs-lintl.patch
diff --git a/package/rpm/0003-Makefile.am-rpm2-cpio-archive-needs-lintl.patch b/package/rpm/0003-Makefile.am-rpm2-cpio-archive-needs-lintl.patch
new file mode 100644
index 0000000000..14d1d37d05
--- /dev/null
+++ b/package/rpm/0003-Makefile.am-rpm2-cpio-archive-needs-lintl.patch
@@ -0,0 +1,51 @@
+From 317bc5263fcb31ce788c76fe1947b2e0783e4542 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Thu, 25 Apr 2019 18:49:24 +0200
+Subject: [PATCH] Makefile.am: rpm2{cpio,archive} needs lintl
+
+Add LIBINTL to rpm2{cpio,archive}_LDADD otherwise build fails on:
+
+/home/buildroot/autobuild/instance-2/output/host/bin/xtensa-linux-gcc -std=gnu99 -DHAVE_CONFIG_H -I. -I. -I./include/ -I./build -I./lib -I./rpmio -I./misc -DLOCALEDIR="\"/usr/share/locale\"" -DLIBRPMALIAS_FILENAME="\"rpmpopt-4.14.2.1\"" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/home/buildroot/autobuild/instance-2/output/host/xtensa-buildroot-linux-uclibc/sysroot/usr/include -fPIC -DPIC -D_REENTRANT -Wall -Wpointer-arith -Wmissing-prototypes -Wstrict-prototypes -fno-strict-aliasing -Wempty-body -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -Os -I/home/buildroot/autobuild/instance-2/output/host/xtensa-buildroot-linux-uclibc/sysroot/usr/include/beecrypt -c -o tools/rpmdeps.o tools/rpmdeps.c
+/home/buildroot/autobuild/instance-2/output/host/opt/ext-toolchain/bin/../lib/gcc/xtensa-buildroot-linux-uclibc/7.4.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: rpm2cpio.o: undefined reference to symbol 'libintl_dgettext'
+/home/buildroot/autobuild/instance-2/output/host/xtensa-buildroot-linux-uclibc/sysroot/usr/lib/libintl.so.8: error adding symbols: DSO missing from command line
+collect2: error: ld returned 1 exit status
+Makefile:962: recipe for target 'rpm2cpio' failed
+make[3]: *** [rpm2cpio] Error 1
+make[3]: *** Waiting for unfinished jobs....
+libtool: link: /home/buildroot/autobuild/instance-2/output/host/bin/xtensa-linux-gcc -std=gnu99 -fPIC -DPIC -D_REENTRANT -Wall -Wpointer-arith -Wmissing-prototypes -Wstrict-prototypes -fno-strict-aliasing -Wempty-body -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -Os -I/home/buildroot/autobuild/instance-2/output/host/xtensa-buildroot-linux-uclibc/sysroot/usr/include/beecrypt -o rpm2archive rpm2archive.o lib/.libs/librpm.so /home/buildroot/autobuild/instance-2/output/build/rpm-4.14.2.1/rpmio/.libs/librpmio.so -lcap -ldb rpmio/.libs/librpmio.so -lbeecrypt -lbz2 -lz -llzma -lpopt -larchive -lpthread -Wl,-rpath -Wl,/home/buildroot/autobuild/instance-2/output/build/rpm-4.14.2.1/lib/.libs -Wl,-rpath -Wl,/home/buildroot/autobuild/instance-2/output/build/rpm-4.14.2.1/rpmio/.libs
+/home/buildroot/autobuild/instance-2/output/host/opt/ext-toolchain/bin/../lib/gcc/xtensa-buildroot-linux-uclibc/7.4.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: rpm2archive.o: undefined reference to symbol 'libintl_dgettext'
+/home/buildroot/autobuild/instance-2/output/host/xtensa-buildroot-linux-uclibc/sysroot/usr/lib/libintl.so.8: error adding symbols: DSO missing from command line
+collect2: error: ld returned 1 exit status
+Makefile:958: recipe for target 'rpm2archive' failed
+
+Fixes:
+ - http://autobuild.buildroot.org/results/26e20e19d878811d90fce52eb0951ee4d8b59068
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status:
+https://github.com/rpm-software-management/rpm/pull/683]
+---
+ Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 057b7892c..e15240e60 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -145,11 +145,11 @@ rpmspec_LDADD += @WITH_POPT_LIB@
+
+ rpm2cpio_SOURCES = rpm2cpio.c debug.h system.h
+ rpm2cpio_LDADD = lib/librpm.la rpmio/librpmio.la
+-rpm2cpio_LDADD += @WITH_POPT_LIB@
++rpm2cpio_LDADD += @WITH_POPT_LIB@ @LIBINTL@
+
+ rpm2archive_SOURCES = rpm2archive.c debug.h system.h
+ rpm2archive_LDADD = lib/librpm.la rpmio/librpmio.la
+-rpm2archive_LDADD += @WITH_POPT_LIB@ @WITH_ARCHIVE_LIB@
++rpm2archive_LDADD += @WITH_POPT_LIB@ @WITH_ARCHIVE_LIB@ @LIBINTL@
+
+
+ if LIBELF
+--
+2.20.1
+
diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk
index 75a03abf4d..ddc6f1c6ad 100644
--- a/package/rpm/rpm.mk
+++ b/package/rpm/rpm.mk
@@ -20,6 +20,8 @@ RPM_DEPENDENCIES = \
$(TARGET_NLS_DEPENDENCIES)
RPM_LICENSE = GPL-2.0 or LGPL-2.0 (library only)
RPM_LICENSE_FILES = COPYING
+# We're patching Makefile.am
+RPM_AUTORECONF = YES
RPM_CONF_OPTS = \
--disable-python \
--
2.20.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/1] package/rpm: fix build with NLS
2019-04-25 16:53 [Buildroot] [PATCH 1/1] package/rpm: fix build with NLS Fabrice Fontaine
@ 2019-04-25 19:53 ` Thomas Petazzoni
2019-04-26 13:03 ` Peter Korsgaard
1 sibling, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2019-04-25 19:53 UTC (permalink / raw)
To: buildroot
On Thu, 25 Apr 2019 18:53:19 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
> Fixes:
> - http://autobuild.buildroot.org/results/26e20e19d878811d90fce52eb0951ee4d8b59068
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> ...ile.am-rpm2-cpio-archive-needs-lintl.patch | 51 +++++++++++++++++++
> package/rpm/rpm.mk | 2 +
> 2 files changed, 53 insertions(+)
> create mode 100644 package/rpm/0003-Makefile.am-rpm2-cpio-archive-needs-lintl.patch
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/1] package/rpm: fix build with NLS
2019-04-25 16:53 [Buildroot] [PATCH 1/1] package/rpm: fix build with NLS Fabrice Fontaine
2019-04-25 19:53 ` Thomas Petazzoni
@ 2019-04-26 13:03 ` Peter Korsgaard
1 sibling, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2019-04-26 13:03 UTC (permalink / raw)
To: buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> Fixes:
> - http://autobuild.buildroot.org/results/26e20e19d878811d90fce52eb0951ee4d8b59068
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Committed to 2019.02.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/1] package/rpm: fix build with NLS
@ 2019-05-12 12:12 Fabrice Fontaine
2019-05-12 20:18 ` Peter Korsgaard
2019-05-26 9:19 ` Peter Korsgaard
0 siblings, 2 replies; 6+ messages in thread
From: Fabrice Fontaine @ 2019-05-12 12:12 UTC (permalink / raw)
To: buildroot
Add TARGET_NLS_LIBS to LIBS to definitely fix linking with lintl instead
of calling autoreconf
Fixes:
- http://autobuild.buildroot.org/results/a1446b419f5f59f65fe80849182e38457de203b5
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/rpm/rpm.mk | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk
index 6d1068194a..bcdc8c5fee 100644
--- a/package/rpm/rpm.mk
+++ b/package/rpm/rpm.mk
@@ -20,8 +20,6 @@ RPM_DEPENDENCIES = \
$(TARGET_NLS_DEPENDENCIES)
RPM_LICENSE = GPL-2.0 or LGPL-2.0 (library only)
RPM_LICENSE_FILES = COPYING
-# Needed to fix an issue with -lintl linking
-RPM_AUTORECONF = YES
RPM_CONF_OPTS = \
--disable-python \
@@ -95,6 +93,7 @@ endif
# ac_cv_prog_cc_c99: RPM uses non-standard GCC extensions (ex. `asm`).
RPM_CONF_ENV = \
ac_cv_prog_cc_c99='-std=gnu99' \
- CFLAGS="$(TARGET_CFLAGS) $(RPM_CFLAGS)"
+ CFLAGS="$(TARGET_CFLAGS) $(RPM_CFLAGS)" \
+ LIBS=$(TARGET_NLS_LIBS)
$(eval $(autotools-package))
--
2.20.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/1] package/rpm: fix build with NLS
2019-05-12 12:12 Fabrice Fontaine
@ 2019-05-12 20:18 ` Peter Korsgaard
2019-05-26 9:19 ` Peter Korsgaard
1 sibling, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2019-05-12 20:18 UTC (permalink / raw)
To: buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> Add TARGET_NLS_LIBS to LIBS to definitely fix linking with lintl instead
> of calling autoreconf
> Fixes:
> - http://autobuild.buildroot.org/results/a1446b419f5f59f65fe80849182e38457de203b5
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/1] package/rpm: fix build with NLS
2019-05-12 12:12 Fabrice Fontaine
2019-05-12 20:18 ` Peter Korsgaard
@ 2019-05-26 9:19 ` Peter Korsgaard
1 sibling, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2019-05-26 9:19 UTC (permalink / raw)
To: buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> Add TARGET_NLS_LIBS to LIBS to definitely fix linking with lintl instead
> of calling autoreconf
> Fixes:
> - http://autobuild.buildroot.org/results/a1446b419f5f59f65fe80849182e38457de203b5
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Committed to 2019.02.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-05-26 9:19 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-25 16:53 [Buildroot] [PATCH 1/1] package/rpm: fix build with NLS Fabrice Fontaine
2019-04-25 19:53 ` Thomas Petazzoni
2019-04-26 13:03 ` Peter Korsgaard
-- strict thread matches above, loose matches on Subject: below --
2019-05-12 12:12 Fabrice Fontaine
2019-05-12 20:18 ` Peter Korsgaard
2019-05-26 9:19 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox