1ba73d551e
Fixes: - http://autobuild.buildroot.org/results/26e20e19d878811d90fce52eb0951ee4d8b59068 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
52 lines
3.8 KiB
Diff
52 lines
3.8 KiB
Diff
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
|
|
|