Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/berkeleydb/patches/configure.patch
author Ivo Raisr <ivo.raisr@oracle.com>
Wed, 12 Oct 2016 00:33:37 -0700
branchs11u3-sru
changeset 7127 0d23504d93cf
parent 460 aded0f0f9594
permissions -rw-r--r--
PSARC/2016/221 PC/SC Lite smartcard middleware 24657567 pcsclite needs to deliver 32-bit libraries
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
460
aded0f0f9594 6961461 Integrate Berkeley DB into Solaris
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     1
 
--- db-5.1.25/dist/configure.orig	2011-08-04 15:02:16.786577345 -0700
aded0f0f9594 6961461 Integrate Berkeley DB into Solaris
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     2
 
+++ db-5.1.25/dist/configure	2011-08-04 15:02:45.349081448 -0700
aded0f0f9594 6961461 Integrate Berkeley DB into Solaris
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     3
 
@@ -25858,7 +25858,7 @@
aded0f0f9594 6961461 Integrate Berkeley DB into Solaris
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     4
 
   cd jdbc
aded0f0f9594 6961461 Integrate Berkeley DB into Solaris
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     5
 
   test ! -e Makefile.in.tmp && mv Makefile.in Makefile.in.tmp
aded0f0f9594 6961461 Integrate Berkeley DB into Solaris
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     6
 
   sed "s/@BDB_LIB@/$BDB_LIB/g" Makefile.in.tmp > Makefile.in
aded0f0f9594 6961461 Integrate Berkeley DB into Solaris
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     7
 
-  eval "\$SHELL ./configure --with-sqlite3=../../lang/sql/generated $jdbc_args $jdbc_flags"
aded0f0f9594 6961461 Integrate Berkeley DB into Solaris
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     8
 
+  eval "\$SHELL ./configure --with-sqlite3=/usr $jdbc_args $jdbc_flags"
aded0f0f9594 6961461 Integrate Berkeley DB into Solaris
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
     9
 
 fi
aded0f0f9594 6961461 Integrate Berkeley DB into Solaris
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    10
aded0f0f9594 6961461 Integrate Berkeley DB into Solaris
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff changeset 
    11
 
 fi
upstream/oracle/userland-gate