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-configure

    r24325 r66262  
    1 --- configure   2005-05-16 19:03:35.000000000 +0900
    2 +++ configure   2007-04-22 10:26:45.000000000 +0900
    3 @@ -7485,6 +7485,9 @@
    4      linux* )
    5          JNIINCLUDE="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
    6          ;;
    7 +    darwin* )
    8 +        JNIINCLUDE="-I/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers/ -framework JavaVM"
    9 +        ;;
    10      *)
    11          JNIINCLUDE="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/${build_os}"
    12          { echo "$as_me:$LINENO: WARNING: setting generic JNI include file directives!" >&5
     1--- configure.orig      2009-04-30 04:10:00.000000000 -0700
     2+++ configure   2009-09-10 17:27:23.000000000 -0700
     3@@ -9021,11 +9021,11 @@
     4 fi
     5 
     6 if test -n "$JAVA_HOME" ; then
     7-  JAVA_RUN=$JAVA_HOME/bin/java
     8-  JAVAC=$JAVA_HOME/bin/javac
     9-  JAVAH="$JAVA_HOME/bin/javah -jni"
     10-  JAR=$JAVA_HOME/bin/jar
     11-  JAVADOC=$JAVA_HOME/bin/javadoc
     12+  JAVA_RUN=$JAVA_HOME/Commands/java
     13+  JAVAC=$JAVA_HOME/Commands/javac
     14+  JAVAH="$JAVA_HOME/Commands/javah -jni"
     15+  JAR=$JAVA_HOME/Commands/jar
     16+  JAVADOC=$JAVA_HOME/Commands/javadoc
     17 else
     18   JAVA_RUN=`which java`
     19   JAVAC=`which javac`
     20@@ -9050,6 +9050,9 @@
     21   linux*)
     22     JNIINCLUDE="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
     23     ;;
     24+  darwin* )
     25+    JNIINCLUDE="-I/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers/ -framework JavaVM"
     26+    ;;
     27   freebsd*)
     28     JNIINCLUDE="-I$JAVA_HOME/include -I$JAVA_HOME/include/freebsd"
     29     ;;
Note: See TracChangeset for help on using the changeset viewer.