Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/database
In directory
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv17873/10.3/unstable/main/finkinfo/database
Added Files:
javasqlite.info javasqlite.patch
Log Message:
New package from tracker # 1184743
--- NEW FILE: javasqlite.patch ---
--- javasqlite-20041029-orig/configure.in Fri Oct 29 14:01:26 2004
+++ javasqlite-20041029/configure.in Sun Apr 17 11:00:16 2005
@@ -224,6 +244,9 @@
linux* )
JNIINCLUDE="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
;;
+ darwin* )
+ JNIINCLUDE="-I/System/Library/Frameworks/JavaVM.framework/Headers"
+ ;;
*)
JNIINCLUDE="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/${build_os}"
AC_MSG_WARN([setting generic JNI include file directives!])
@@ -250,5 +253,20 @@
AC_SUBST(JDBCVER)
AC_SUBST(NATIVE_LIB_DIR)
-AC_OUTPUT(Makefile)
+##########
+# Figure out, what kind which native lib we need
+#
+case $build_os in
+ darwin* )
+ NATIVE_LIB="libsqlite_jni.jnilib"
+ ;;
+ *)
+ NATIVE_LIB="libsqlite_jni.la"
+ ;;
+esac
+AC_MSG_RESULT([setting JNI lib: $NATIVE_LIB])
+AC_SUBST(NATIVE_LIB)
+
+
+AC_OUTPUT(Makefile)
--- javasqlite-20041029-orig/Makefile.in Mon Sep 20 07:37:17 2004
+++ javasqlite-20041029/Makefile.in Sun Apr 17 11:02:15 2005
@@ -78,7 +78,7 @@
SQLite/ProgressHandler.java \
SQLite/StringEncoder.java
-all: sqlite.jar libsqlite_jni.la
+all: sqlite.jar @NATIVE_LIB@
SQLite/Constants.java: native/mkconst
native/mkconst > SQLite/Constants.java
@@ -98,16 +98,20 @@
$(LIBTOOL) $(CC) -o libsqlite_jni.la sqlite_jni.lo \
-rpath $(NATIVE_LIB_DIR) $(LIBS)
+libsqlite_jni.jnilib: sqlite_jni.lo
+ $(LIBTOOL) $(CC) -o libsqlite_jni.jnilib -bundle sqlite_jni.lo \
+ $(NATVIE_LIB) $(LIBS)
+
native/mkconst: native/mkconst.c
$(LIBTOOL) $(CC) $(SQLITE_INC) $(SQLITE3_INC) \
[EMAIL PROTECTED]@ [EMAIL PROTECTED]@ \
-o native/mkconst native/mkconst.c $(LIBS)
test:
$(JAVAC) test.java
clean:
- $(RM) SQLite/*.class SQLite/@JDBCVER@/*.class *.lo *.la *.o \
+ $(RM) SQLite/*.class SQLite/@JDBCVER@/*.class *.lo *.la *.o *.jnilib\
native/sqlite_jni.h native/mkconst \
SQLite/Constants.java \
test.class sqlite.jar conftest*
--- javasqlite-20041029-orig/native/sqlite_jni.c Thu Oct 28 10:17:42 2004
+++ javasqlite-20041029/native/sqlite_jni.c Sun Apr 17 09:09:50 2005
@@ -9,7 +9,7 @@
#if HAVE_SQLITE3
#include "sqlite3.h"
#define HAVE_SQLITE_COMPILE 1
-#define HAVE_SQLITE_PROGRESS_HANDLER 1
+// #define HAVE_SQLITE_PROGRESS_HANDLER 1
#define HAVE_SQLITE_TRACE 1
#endif
--- javasqlite-20060714/SQLite/Database.java 2004-09-20 18:03:45.000000000
+0200
+++ javasqlite-20060714-patched/SQLite/Database.java 2006-10-22
18:26:16.000000000 +0200
@@ -396,8 +396,8 @@
static {
try {
- System.loadLibrary("sqlite_jni");
+ System.load( "/FINKPATH/lib/libsqlite_jni.jnilib" );
internal_init();
} catch (Throwable t) {
System.err.println("Unable to load sqlite: " + t);
}
--- NEW FILE: javasqlite.info ---
Package: javasqlite
Version: 20060714
Revision: 1
Type: java(1.4)
Depends: sqlite-shlibs, sqlite3-shlibs
BuildDepends: sqlite-dev, sqlite3-dev, system-java14-dev, autoconf (>= 2.60-1)
Source: http://www.ch-werner.de/javasqlite/javasqlite-%v.tar.gz
Source-MD5: ac9b2a256a657b2717659acea7f2e41a
PatchScript: <<
sed "s|FINKPATH|%p|" %a/%n.patch | patch -p1
autoconf
<<
ConfigureParams: --with-sqlite=%p --with-sqlite3=%p
JarFiles: sqlite.jar
DocFiles: license.terms doc/* db db3
InstallScript: <<
mkdir %i/lib
cp libsqlite_jni.jnilib %i/lib
<<
Description: SQLite Java Wrapper/JDBC Driver
DescPort: <<
Fixed small typos in configure.in and Makefile.
Removed faulty #define in native/sqlite_jni.c (its already a configure test)
Added detection of darwin and creation of jnilib to Makefile.in
<<
DescPackaging: <<
Native libsqlite_jni.jnilib is installed in %p/lib and loaded from there
using System.load() instead of System.loadLibrary()
<<
License: BSD
Homepage: http://www.ch-werner.de//javasqlite/
Maintainer: Matthias Ringwald <[EMAIL PROTECTED]>
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
