[oe-commits] Stanislav Brabec : navit: Modules .so files must go to the main package, modules .la can go away.
GIT User account
git at amethyst.openembedded.net
Thu Apr 16 20:44:45 UTC 2009
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 0ff8efdbbf261377eefe6dc1d6da9defd523b2f4
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=0ff8efdbbf261377eefe6dc1d6da9defd523b2f4
Author: Stanislav Brabec <utx at penguin.cz>
Date: Thu Apr 16 20:37:53 2009 +0000
navit: Modules .so files must go to the main package, modules .la can go away.
---
recipes/navit/navit.inc | 4 +++-
recipes/navit/navit_0.0.4.bb | 2 +-
recipes/navit/navit_0.1.0.bb | 2 +-
recipes/navit/navit_svn.bb | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/recipes/navit/navit.inc b/recipes/navit/navit.inc
index 8db0595..8ad439d 100644
--- a/recipes/navit/navit.inc
+++ b/recipes/navit/navit.inc
@@ -10,8 +10,8 @@ EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap -
PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale"
+FILES_${PN} += "${libdir}/${PN}/*/*.so"
FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug"
-FILES_${PN}-dev += "${libdir}/${PN}/*/*.so ${libdir}/${PN}/*/*.la"
SRC_URI_append = " \
file://navit.desktop \
@@ -27,4 +27,6 @@ do_install_append() {
mv ${D}${bindir}/navit ${D}${bindir}/navit.real
install -m 0755 ${WORKDIR}/navit.launcher ${D}${bindir}/navit
+
+ rm ${D}${libdir}/${PN}/*/*.la
}
diff --git a/recipes/navit/navit_0.0.4.bb b/recipes/navit/navit_0.0.4.bb
index f22d35e..dbb83d9 100644
--- a/recipes/navit/navit_0.0.4.bb
+++ b/recipes/navit/navit_0.0.4.bb
@@ -1,6 +1,6 @@
require navit.inc
-PR = "r1"
+PR = "r2"
SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz"
diff --git a/recipes/navit/navit_0.1.0.bb b/recipes/navit/navit_0.1.0.bb
index f1dfb1c..5162fa0 100644
--- a/recipes/navit/navit_0.1.0.bb
+++ b/recipes/navit/navit_0.1.0.bb
@@ -1,5 +1,5 @@
require navit.inc
-PR = "r0"
+PR = "r1"
SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz"
diff --git a/recipes/navit/navit_svn.bb b/recipes/navit/navit_svn.bb
index df712a0..833eb47 100644
--- a/recipes/navit/navit_svn.bb
+++ b/recipes/navit/navit_svn.bb
@@ -1,7 +1,7 @@
require navit.inc
PV = "0.1.0+svnrev${SRCREV}"
-PR = "r1"
+PR = "r2"
DEFAULT_PREFERENCE = "-1"
More information about the Openembedded-commits
mailing list