summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2016-03-18 13:20:47 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-20 23:12:29 +0000
commit1969332422d1086f5245a3b7de2c5d2b85de366e (patch)
treed94d40c7475e0f34bd107cd474d59037a98521f6 /meta
parenta31301ec02b5a6a5328ba5e8c71205cf6727e10b (diff)
downloadpoky-1969332422d1086f5245a3b7de2c5d2b85de366e.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-fix-lua-tests-compilation-failure.patch43
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.16.bb2
2 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-fix-lua-tests-compilation-failure.patch b/meta/recipes-devtools/rpm/rpm/rpm-fix-lua-tests-compilation-failure.patch
new file mode 100644
index 0000000000..1a08243ab1
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/rpm-fix-lua-tests-compilation-failure.patch
@@ -0,0 +1,43 @@
1Upstream-Status: Pending
2
3Subject: lua: fix to build test libs correctly
4
5This patch fixes errors like below.
6
7 | gcc: error: lib21.c: No such file or directory
8 | gcc: fatal error: no input files
9
10
11Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
12---
13 lua/tests/libs/Makefile.am | 8 ++++----
14 1 file changed, 4 insertions(+), 4 deletions(-)
15
16diff --git a/lua/tests/libs/Makefile.am b/lua/tests/libs/Makefile.am
17index 19d1a0b..1e5de72 100644
18--- a/lua/tests/libs/Makefile.am
19+++ b/lua/tests/libs/Makefile.am
20@@ -28,16 +28,16 @@ clean:
21 rm -f lib1.so lib11.so lib2.so lib21.so lib2-v2.so
22
23 lib1.so: lib1.c
24- $(CC) $(CFLAGS) -o lib1.so lib1.c
25+ $(CC) $(CFLAGS) -o lib1.so $(top_srcdir)/lua/tests/libs/lib1.c
26
27 lib11.so: lib11.c
28- $(CC) $(CFLAGS) -o lib11.so lib11.c
29+ $(CC) $(CFLAGS) -o lib11.so $(top_srcdir)/lua/tests/libs/lib11.c
30
31 lib2.so: lib2.c
32- $(CC) $(CFLAGS) -o lib2.so lib2.c
33+ $(CC) $(CFLAGS) -o lib2.so $(top_srcdir)/lua/tests/libs/lib2.c
34
35 lib21.so: lib21.c
36- $(CC) $(CFLAGS) -o lib21.so lib21.c
37+ $(CC) $(CFLAGS) -o lib21.so $(top_srcdir)/lua/tests/libs/lib21.c
38
39 lib2-v2.so: lib2.so
40 mv lib2.so ./lib2-v2.so
41--
421.9.1
43
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.16.bb b/meta/recipes-devtools/rpm/rpm_5.4.16.bb
index 5fea53f543..eba043e3af 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.16.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.16.bb
@@ -113,6 +113,7 @@ SRC_URI += " \
113 file://rpm-python-tagname.patch \ 113 file://rpm-python-tagname.patch \
114 file://rpm-python-AddErase.patch \ 114 file://rpm-python-AddErase.patch \
115 file://rpm-rpmpgp-popt.patch \ 115 file://rpm-rpmpgp-popt.patch \
116 file://rpm-fix-lua-tests-compilation-failure.patch \
116" 117"
117 118
118# OE specific changes 119# OE specific changes
@@ -494,6 +495,7 @@ FILES_${PN}-dev = "${includedir}/rpm \
494 ${libdir}/rpm/lib/liblua.la \ 495 ${libdir}/rpm/lib/liblua.la \
495 ${libdir}/pkgconfig/rpm.pc \ 496 ${libdir}/pkgconfig/rpm.pc \
496 ${libdir}/rpm/rpmdb_loadcvt \ 497 ${libdir}/rpm/rpmdb_loadcvt \
498 ${libdir}/rpm/include \
497 " 499 "
498 500
499FILES_${PN}-staticdev = " \ 501FILES_${PN}-staticdev = " \