diff options
| author | Chen Qi <Qi.Chen@windriver.com> | 2016-03-18 13:20:47 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-20 22:57:57 +0000 |
| commit | 6b43539e6624113acbcd06b11cfe8cfe6586244f (patch) | |
| tree | 34a1ab123904c6e5d5ab7b9fe52b31f7a1c8c3b8 /meta/recipes-devtools | |
| parent | 8e84211e06e0612359b73c311dbaed8f70230f3b (diff) | |
| download | openembedded-core-6b43539e6624113acbcd06b11cfe8cfe6586244f.tar.gz openembedded-core-6b43539e6624113acbcd06b11cfe8cfe6586244f.tar.bz2 openembedded-core-6b43539e6624113acbcd06b11cfe8cfe6586244f.zip | |
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.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-devtools')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-fix-lua-tests-compilation-failure.patch | 43 | ||||
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4.16.bb | 2 |
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 @@ +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 + 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 += " \ 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 = " \ |