Ignore:
Timestamp:
Apr 8, 2010, 4:23:39 AM (11 years ago)
Author:
ryandesign@…
Message:

javasqlite: update to 20100131 (see #19945) and turn off universal variant which doesn't produce universal software

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/java/javasqlite/files/patch-Makefile.in-jnilib

    r24325 r66262  
    1 --- Makefile.in 2007-04-22 10:59:59.000000000 +0900
    2 +++ Makefile.in 2007-04-22 11:06:25.000000000 +0900
    3 @@ -78,7 +78,7 @@
     1--- Makefile.in.orig    2009-04-21 00:34:35.000000000 -0700
     2+++ Makefile.in 2009-09-10 17:08:10.000000000 -0700
     3@@ -110,7 +110,7 @@
    44        SQLite/ProgressHandler.java \
    55        SQLite/StringEncoder.java
     
    88+all:   sqlite.jar libsqlite_jni.jnilib
    99 
    10  SQLite/Constants.java: native/mkconst
     10 SQLite/Constants.java: native/mkconst VERSION
    1111        native/mkconst > SQLite/Constants.java
    12 @@ -94,8 +94,8 @@
    13  sqlite_jni.lo: native/sqlite_jni.h native/sqlite_jni.c
    14         $(LIBTOOL) $(CC) -c $(CFLAGS) native/sqlite_jni.c
     12@@ -141,8 +141,8 @@
     13 $(SQLITE3_A10N_O):     $(SQLITE3_A10N_C)
     14        $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(SQLITE3_A10N_C)
    1515 
    16 -libsqlite_jni.la:      sqlite_jni.lo
    17 -       $(LIBTOOL) $(CC) -o libsqlite_jni.la sqlite_jni.lo \
    18 +libsqlite_jni.jnilib:  sqlite_jni.lo
    19 +       $(LIBTOOL) $(CC) -bundle -o libsqlite_jni.jnilib sqlite_jni.lo \
    20             -rpath $(NATIVE_LIB_DIR) $(LIBS)
     16-libsqlite_jni.la:      sqlite_jni.lo $(SQLITE3_A10N_O)
     17-       $(LIBTOOL) --mode=link $(CC) -o libsqlite_jni.la sqlite_jni.lo \
     18+libsqlite_jni.jnilib:  sqlite_jni.lo $(SQLITE3_A10N_O)
     19+       $(LIBTOOL) --mode=link $(CC) -bundle -o libsqlite_jni.jnilib sqlite_jni.lo \
     20            $(SQLITE3_A10N_O) -rpath $(NATIVE_LIB_DIR) \
     21            -module -avoid-version $(LIBS)
    2122 
    22  native/mkconst:        native/mkconst.c
    23 @@ -129,4 +129,4 @@
     23@@ -200,11 +200,11 @@
    2424        $(INSTALL) -d -m 755 $(DESTDIR)$(JAR_DIR)
    2525        $(INSTALL) -m 644 sqlite.jar $(DESTDIR)$(JAR_DIR)
    2626        $(INSTALL) -d -m 755 $(DESTDIR)$(NATIVE_LIB_DIR)
    27 -       $(LIBTOOL) $(INSTALL) libsqlite_jni.la $(DESTDIR)$(NATIVE_LIB_DIR)
    28 +       $(LIBTOOL) $(INSTALL) libsqlite_jni.jnilib $(DESTDIR)$(NATIVE_LIB_DIR)
     27-       $(LIBTOOL) --mode=install $(INSTALL) libsqlite_jni.la \
     28+       $(LIBTOOL) --mode=install $(INSTALL) libsqlite_jni.jnilib \
     29            $(DESTDIR)$(NATIVE_LIB_DIR)
     30 
     31 uninstall:
     32        $(RM) $(DESTDIR)$(JAR_DIR)/sqlite.jar
     33        $(LIBTOOL) --mode=uninstall $(RM) \
     34-           $(DESTDIR)$(NATIVE_LIB_DIR)/libsqlite_jni.la
     35+           $(DESTDIR)$(NATIVE_LIB_DIR)/libsqlite_jni.jnilib
     36 
Note: See TracChangeset for help on using the changeset viewer.