summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schuster <thebohemian@gmx.net>2008-09-04 15:24:04 +0000
committerRobert Schuster <thebohemian@gmx.net>2008-09-04 15:24:04 +0000
commitf291151e4cb37e5e8e315c3ef37e2df0a6332bb0 (patch)
tree519e4072eb2118c1cc069ddaf95e69c897a9f156
parentd48c050212edcbe0faa9cf32511a232a90febac8 (diff)
javasqlite 20080130: Fixed packaging.
-rw-r--r--packages/javasqlite/javasqlite_20080130.bb38
1 files changed, 25 insertions, 13 deletions
diff --git a/packages/javasqlite/javasqlite_20080130.bb b/packages/javasqlite/javasqlite_20080130.bb
index a8ed2d5017..0b088e7354 100644
--- a/packages/javasqlite/javasqlite_20080130.bb
+++ b/packages/javasqlite/javasqlite_20080130.bb
@@ -2,14 +2,18 @@ DESCRIPTION = "JDBC driver for sqlite and sqlite3"
HOMEPAGE = "http://www.ch-werner.de/javasqlite"
LICENSE = "BSD"
+PR = "r2"
+
SRC_URI = "\
http://www.ch-werner.de/javasqlite/javasqlite-${PV}.tar.gz \
file://build-fix.patch;patch=1"
DEPENDS = "virtual/javac-native fastjar-native classpath-native javasqlite-mkconst-native classpath sqlite sqlite3"
-RDEPENDS_${PN} = "${PN}-jni"
+RDEPENDS_${JPN} = "lib${PN}-jni"
+
+inherit java-library autotools
-inherit autotools java
+JARFILENAME = "sqlite.jar"
# jamvm-native unfortunately contains non-generificed java/lang/reflect classes
# which are accessed in this package. Work around this by setting the bootclasspath
@@ -17,19 +21,19 @@ inherit autotools java
export JAVACFLAGS="-bootclasspath ${STAGING_DATADIR}/classpath/glibj.zip -source 5.0"
EXTRA_OECONF = " \
- --with-jni-incdir=${STAGING_INCDIR}/classpath \
+ --with-jni-incdir=${STAGING_INCDIR}/classpath \
--with-jardir=${datadir_java} \
--with-target-native-libdir=${libdir_jni} \
--with-sqlite-incdir=${STAGING_INCDIR} \
--with-sqlite-libdir=${STAGING_LIBDIR} \
--with-sqlite3-incdir=${STAGING_INCDIR} \
--with-sqlite3-libdir=${STAGING_LIBDIR} \
- --with-java=${STAGING_BINDIR_NATIVE}/java \
- --with-javac=${STAGING_BINDIR_NATIVE}/javac \
- --with-jar=${STAGING_BINDIR_NATIVE}/gjar \
- --with-javah=${STAGING_BINDIR_NATIVE}/gjavah \
- --with-javadoc=true \
- "
+ --with-java=${STAGING_BINDIR_NATIVE}/java \
+ --with-javac=${STAGING_BINDIR_NATIVE}/javac \
+ --with-jar=${STAGING_BINDIR_NATIVE}/gjar \
+ --with-javah=${STAGING_BINDIR_NATIVE}/gjavah \
+ --with-javadoc=true \
+ "
do_configurepre() {
sed -i -e "s|wrong-libtool|${TARGET_SYS}-libtool|" Makefile.in
@@ -38,9 +42,17 @@ do_configurepre() {
addtask configurepre after do_patch before do_configure
do_compile_prepend() {
- # Injects a cross-compiled mkconst binary into the build
- cp ${STAGING_BINDIR_NATIVE}/javasqlite-mkconst-${PV} native/mkconst
- touch native/mkconst
+ # Injects a cross-compiled mkconst binary into the build
+ cp ${STAGING_BINDIR_NATIVE}/javasqlite-mkconst-${PV} native/mkconst
+ touch native/mkconst
}
-PACKAGES = "${PN}-jni"
+do_install_append() {
+ rm ${D}${libdir_jni}/libsqlite_jni.la
+ rm ${D}${libdir_jni}/libsqlite_jni.a
+}
+
+PACKAGES = "lib${PN}-jni lib${PN}-jni-dbg"
+
+FILES_lib${PN}-jni = "${libdir_jni}/lib*.so*"
+FILES_lib${PN}-jni-dbg = "${libdir_jni}/.debug/lib*.so*"