sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

rpm: fix error when 'lua' is enabled 

Fix the following compilation error when 'lua' is enabled in PACKAGECONFIG.

  | gcc: error: lib21.c: No such file or directory
  | gcc: fatal error: no input files

Modify FILES for dev package to avoid installed-not-shipped error.

(From OE-Core rev: 6b43539e6624113acbcd06b11cfe8cfe6586244f)

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Chen Qi 2016-03-18 13:20:47 +08:00 committed by Richard Purdie
parent a31301ec02
commit 1969332422
2 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
meta/recipes-devtools/rpm/rpm/rpm-fix-lua-tests-compilation-failure.patch Normal file
View File

@ -0,0 +1,43 @@
Upstream-Status: Pending
Subject: lua: fix to build test libs correctly
This patch fixes errors like below.
| gcc: error: lib21.c: No such file or directory
| gcc: fatal error: no input files
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
lua/tests/libs/Makefile.am | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lua/tests/libs/Makefile.am b/lua/tests/libs/Makefile.am
index 19d1a0b..1e5de72 100644
--- a/lua/tests/libs/Makefile.am
+++ b/lua/tests/libs/Makefile.am
@@ -28,16 +28,16 @@ clean:
rm -f lib1.so lib11.so lib2.so lib21.so lib2-v2.so
lib1.so: lib1.c
- $(CC) $(CFLAGS) -o lib1.so lib1.c
+ $(CC) $(CFLAGS) -o lib1.so $(top_srcdir)/lua/tests/libs/lib1.c
lib11.so: lib11.c
- $(CC) $(CFLAGS) -o lib11.so lib11.c
+ $(CC) $(CFLAGS) -o lib11.so $(top_srcdir)/lua/tests/libs/lib11.c
lib2.so: lib2.c
- $(CC) $(CFLAGS) -o lib2.so lib2.c
+ $(CC) $(CFLAGS) -o lib2.so $(top_srcdir)/lua/tests/libs/lib2.c
lib21.so: lib21.c
- $(CC) $(CFLAGS) -o lib21.so lib21.c
+ $(CC) $(CFLAGS) -o lib21.so $(top_srcdir)/lua/tests/libs/lib21.c
lib2-v2.so: lib2.so
mv lib2.so ./lib2-v2.so
--
1.9.1

2
meta/recipes-devtools/rpm/rpm_5.4.16.bb
View File

@ -113,6 +113,7 @@ SRC_URI += " \
file://rpm-python-tagname.patch \
file://rpm-python-AddErase.patch \
file://rpm-rpmpgp-popt.patch \
file://rpm-fix-lua-tests-compilation-failure.patch \
"
# OE specific changes
@ -494,6 +495,7 @@ FILES_${PN}-dev = "${includedir}/rpm \
${libdir}/rpm/lib/liblua.la \
${libdir}/pkgconfig/rpm.pc \
${libdir}/rpm/rpmdb_loadcvt \
${libdir}/rpm/include \
"
FILES_${PN}-staticdev = " \