[arch-commits] CVS update of extra/office/openoffice-base (1 file)

andyrtr at archlinux.org andyrtr at archlinux.org
Sat Aug 25 07:18:19 EDT 2007


    Date: Saturday, August 25, 2007 @ 07:18:19
  Author: andyrtr
    Path: /home/cvs-extra/extra/office/openoffice-base

   Added: internal-db-no-java_oog680_m1.diff (1.1)

updatepkg 2.3.0 prerelease oog680_m2


------------------------------------+
 internal-db-no-java_oog680_m1.diff |  363 +++++++++++++++++++++++++++++++++++
 1 file changed, 363 insertions(+)


Index: extra/office/openoffice-base/internal-db-no-java_oog680_m1.diff
diff -u /dev/null extra/office/openoffice-base/internal-db-no-java_oog680_m1.diff:1.1
--- /dev/null	Sat Aug 25 07:18:19 2007
+++ extra/office/openoffice-base/internal-db-no-java_oog680_m1.diff	Sat Aug 25 07:18:19 2007
@@ -0,0 +1,363 @@
+--- berkeleydb/db-4.2.52.patch
++++ berkeleydb/db-4.2.52.patch
+@@ -566,233 +566,6 @@
+ ! SLOFILES= $(SLO)$/hsearch.obj
+ ! 
+ ! .INCLUDE :  target.mk
+-*** misc/db-4.2.52.NC/libdb_java/makefile.mk	2007-02-19 16:12:18.000000000 +0100
+---- misc/build/db-4.2.52.NC/libdb_java/makefile.mk	2007-02-19 16:12:12.000000000 +0100
+-***************
+-*** 1 ****
+-! dummy
+---- 1,29 ----
+-! PRJ=..$/..$/..$/..$/..
+-! 
+-! PRJNAME=berkeleydb
+-! TARGET=libdb_java42
+-! 
+-! EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
+-! 
+-! .INCLUDE :  settings.mk
+-! 
+-! CDEFS+=-DDB_USE_DLL
+-! 
+-! INCPRE=..$/build_win32 ..$/
+-! 
+-! .IF "$(SOLAR_JAVA)"!=""
+-! SLOFILES= \
+-!             $(SLO)$/db_java_wrap.obj
+-! .ELSE
+-! dummy:
+-! 	@echo "Nothing to build for OS $(OS)"
+-! 
+-! .ENDIF
+-! 
+-! $(CLASSDIR)$/db.jar : ALLTAR
+-!     echo compiling Berkeley DB classes
+-!     $(JAVAC) -g -d ..$/..$/..$/..$/class -classpath ..$/..$/..$/..$/class ..$/java$/src$/com$/sleepycat$/db$/*.java ..$/java$/src$/com$/sleepycat$/db$/release$/*.java ..$/java$/src$/com$/sleepycat$/bdb$/bind$/*.java ..$/java$/src$/com$/sleepycat$/bdb$/bind$/serial$/*.java ..$/java$/src$/com$/sleepycat$/bdb$/bind$/tuple$/*.java ..$/java$/src$/com$/sleepycat$/bdb$/*.java ..$/java$/src$/com$/sleepycat$/bdb$/collection$/*.java ..$/java$/src$/com$/sleepycat$/bdb$/factory$/*.java ..$/java$/src$/com$/sleepycat$/bdb$/util$/*.java
+-!     $(JAVAC) -g -d ..$/..$/..$/..$/class -classpath ..$/..$/..$/..$/class ..$/examples_java$/src$/com$/sleepycat$/examples$/db$/*.java ..$/examples_java$/src$/com$/sleepycat$/examples$/bdb$/access$/*.java ..$/examples_java$/src$/com$/sleepycat$/examples$/bdb$/helloworld$/*.java ..$/examples_java$/src$/com$/sleepycat$/examples$/bdb$/shipment$/basic$/*.java ..$/examples_java$/src$/com$/sleepycat$/examples$/bdb$/shipment$/entity$/*.java ..$/examples_java$/src$/com$/sleepycat$/examples$/bdb$/shipment$/tuple$/*.java ..$/examples_java$/src$/com$/sleepycat$/examples$/bdb$/shipment$/sentity$/*.java ..$/examples_java$/src$/com$/sleepycat$/examples$/bdb$/shipment$/marshal$/*.java ..$/examples_java$/src$/com$/sleepycat$/examples$/bdb$/shipment$/factory$/*.java
+-!     cd ..$/..$/..$/..$/class && jar cvf db.jar com$/sleepycat$/db com$/sleepycat$/bdb
+-! 
+-! .INCLUDE :  target.mk
+-*** misc/db-4.2.52.NC/libdb_java42.dxp	2007-02-19 16:12:18.000000000 +0100
+---- misc/build/db-4.2.52.NC/libdb_java42.dxp	2007-02-19 16:12:12.000000000 +0100
+-***************
+-*** 1 ****
+-! dummy
+---- 1,186 ----
+-! _Java_com_sleepycat_db_DbUtil_is_1big_1endian at 8
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1close0 at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1dbremove at 36
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1dbrename at 40
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1err at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1errx at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1cachesize at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1cachesize_1ncache at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1data_1dirs at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1encrypt_1flags at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1flags at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1home at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1lg_1bsize at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1lg_1dir at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1lg_1max at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1lg_1regionmax at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1lk_1conflicts at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1lk_1detect at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1lk_1max_1lockers at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1lk_1max_1locks at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1lk_1max_1objects at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1mp_1mmapsize at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1open_1flags at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1rep_1limit at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1shm_1key at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1tas_1spins at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1timeout at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1tmp_1dir at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1tx_1max at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1tx_1timestamp at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1verbose at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1version_1major at 8
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1version_1minor at 8
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1version_1patch at 8
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1get_1version_1string at 8
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1lock_1detect at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1lock_1get at 32
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1lock_1id at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1lock_1id_1free at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1lock_1put at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1lock_1stat at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1lock_1vec at 36
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1log_1archive at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1log_1compare at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1log_1cursor at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1log_1file at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1log_1flush at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1log_1put at 32
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1log_1stat at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1memp_1fstat at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1memp_1stat at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1memp_1trickle at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1open0 at 28
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1remove0 at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1rep_1elect at 28
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1rep_1process_1message at 36
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1rep_1start at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1rep_1stat at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1setErrorHandler at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1setFeedbackHandler at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1setPanicHandler at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1app_1dispatch at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1cachesize at 28
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1data_1dir at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1encrypt at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1flags at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1lg_1bsize at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1lg_1dir at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1lg_1max at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1lg_1regionmax at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1lk_1conflicts at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1lk_1detect at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1lk_1max_1lockers at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1lk_1max_1locks at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1lk_1max_1objects at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1mp_1mmapsize at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1rep_1limit at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1rep_1transport at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1rpc_1server at 44
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1shm_1key at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1tas_1spins at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1timeout at 28
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1tmp_1dir at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1tx_1max at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1tx_1timestamp0 at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1set_1verbose at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1strerror at 12
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1txn_1begin at 28
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1txn_1checkpoint at 28
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1txn_1recover at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_DbEnv_1txn_1stat at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbLogc_1close0 at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbLogc_1get at 32
+-! _Java_com_sleepycat_db_db_1javaJNI_DbLsn_1get_1file at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbLsn_1get_1offset at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbMpoolFile_1get_1flags at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbMpoolFile_1get_1maxsize at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbMpoolFile_1get_1priority at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbMpoolFile_1set_1flags at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_DbMpoolFile_1set_1maxsize at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_DbMpoolFile_1set_1priority at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbTxn_1abort0 at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbTxn_1commit0 at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbTxn_1discard0 at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbTxn_1id at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_DbTxn_1prepare at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_DbTxn_1set_1timeout at 28
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1associate at 40
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1close0 at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1cursor at 28
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1del at 32
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1err at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1errx at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1_1SWIG_10 at 36
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1_1SWIG_11 at 40
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1bt_1minkey at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1byteswapped at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1cachesize at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1cachesize_1ncache at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1dbname at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1encrypt_1flags at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1filename at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1flags at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1flags_1raw at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1h_1ffactor at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1h_1nelem at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1lorder at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1mpf at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1open_1flags at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1pagesize at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1q_1extentsize at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1re_1delim at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1re_1len at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1re_1pad at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1re_1source at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1transactional at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1get_1type at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1join at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1key_1range at 36
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1open0 at 44
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1put at 36
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1remove0 at 28
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1rename0 at 32
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1setFeedbackHandler at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1set_1append_1recno at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1set_1bt_1compare at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1set_1bt_1maxkey at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1set_1bt_1minkey at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1set_1bt_1prefix at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1set_1cachesize at 28
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1set_1dup_1compare at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1set_1encrypt at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1set_1flags at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1set_1h_1ffactor at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1set_1h_1hash at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1set_1h_1nelem at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1set_1lorder at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1set_1pagesize at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1set_1q_1extentsize at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1set_1re_1delim at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1set_1re_1len at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1set_1re_1pad at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1set_1re_1source at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1stat at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1sync at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1truncate at 28
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1upgrade at 24
+-! _Java_com_sleepycat_db_db_1javaJNI_Db_1verify0 at 32
+-! _Java_com_sleepycat_db_db_1javaJNI_Dbc_1close0 at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_Dbc_1count at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Dbc_1del at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Dbc_1dup at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_Dbc_1get_1_1SWIG_10 at 28
+-! _Java_com_sleepycat_db_db_1javaJNI_Dbc_1get_1_1SWIG_11 at 32
+-! _Java_com_sleepycat_db_db_1javaJNI_Dbc_1put at 28
+-! _Java_com_sleepycat_db_db_1javaJNI_deleteRef0 at 12
+-! _Java_com_sleepycat_db_db_1javaJNI_delete_1DbLock at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_delete_1DbLsn at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_getDbEnv0 at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_getDbRef0 at 16
+-! _Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0 at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_initDbRef0 at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_initialize at 8
+-! _Java_com_sleepycat_db_db_1javaJNI_new_1Db at 20
+-! _Java_com_sleepycat_db_db_1javaJNI_new_1DbEnv at 12
+-! _Java_com_sleepycat_db_db_1javaJNI_new_1DbLsn at 16
+ *** misc/db-4.2.52.NC/lock/makefile.mk	2007-02-19 16:12:18.000000000 +0100
+ --- misc/build/db-4.2.52.NC/lock/makefile.mk	2007-02-19 16:12:12.000000000 +0100
+ ***************
+--- berkeleydb/makefile.mk
++++ berkeleydb/makefile.mk
+@@ -57,10 +57,10 @@
+ 	makefile.mk btree$/makefile.mk clib$/makefile.mk common$/makefile.mk  \
+ 	cxx$/makefile.mk db$/makefile.mk dbm$/makefile.mk dbreg$/makefile.mk  \
+ 	db_printlog$/makefile.mk env$/makefile.mk fileops$/makefile.mk hash$/makefile.mk  \
+-	hmac$/makefile.mk hsearch$/makefile.mk libdb_java$/makefile.mk lock$/makefile.mk  \
++	hmac$/makefile.mk hsearch$/makefile.mk lock$/makefile.mk  \
+ 	log$/makefile.mk mp$/makefile.mk mutex$/makefile.mk os$/makefile.mk  \
+ 	os_win32$/makefile.mk qam$/makefile.mk rep$/makefile.mk txn$/makefile.mk  \
+-	xa$/makefile.mk libdb42.dxp libdb_java42.dxp
++	xa$/makefile.mk libdb42.dxp
+ 
+ 
+ 
+@@ -100,10 +100,7 @@
+ CONFIGURE_ACTION= \
+ 	..$/dist$/configure
+ CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185
+-.IF "$(SOLAR_JAVA)"!=""
+-CONFIGURE_FLAGS+=--enable-java
+-ARCH_FLAGS+=-I$(JAVA_HOME)/include
+-.ENDIF
++
+ # just pass ARCH_FLAGS to native build
+ CFLAGS+:=$(ARCH_FLAGS)
+ CXXFLAGS+:=$(ARCH_FLAGS)
+@@ -119,15 +116,6 @@
+ .ENDIF
+ 
+ OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*$(DLLPOST)
+-.IF "$(OS)"=="MACOSX"
+-OUT2LIB+=$(BUILD_DIR)$/.libs$/libdb_java*jnilib
+-.ENDIF	# "$(OS)"=="MACOSX"
+-
+-.IF "$(SOLAR_JAVA)"!=""
+-OUT2BIN=$(BUILD_DIR)$/db.jar
+-OUT2CLASS=$(BUILD_DIR)$/db.jar
+-.ENDIF
+-
+ OUT2INC= \
+ 	$(BUILD_DIR)$/db.h
+ 
+@@ -146,9 +134,6 @@
+ .ELSE
+ CONFIGURE_FLAGS+=LDFLAGS="-no-undefined -L$(SOLARVER)/$(INPATH)/lib -L$(SOLARVER)/$(INPATH)/bin -L$(COMPATH)/lib"
+ .ENDIF
+-.IF "$(SOLAR_JAVA)"!=""
+-CONFIGURE_FLAGS+=--enable-java
+-.ENDIF
+ 
+ BUILD_DIR=$(CONFIGURE_DIR)
+ BUILD_DIR_OUT=$(CONFIGURE_DIR)
+@@ -178,12 +163,8 @@
+ 
+ BUILD_DIR_OUT=build_win32
+ #OUT2LIB= \
+-#	$(BUILD_DIR_OUT)$/Release$/libdb_java42.lib \
+ #	$(BUILD_DIR_OUT)$/Release$/libdb42.lib
+-#OUT2BIN=$(BUILD_DIR_OUT)$/Release$/db.jar \
+-#	$(BUILD_DIR_OUT)$/Release$/libdb_java42.dll \
+-#	$(BUILD_DIR_OUT)$/Release$/libdb42.dll
+-#OUT2CLASS=$(BUILD_DIR_OUT)$/Release$/db.jar
++#OUT2BIN=$(BUILD_DIR_OUT)$/Release$/libdb42.dll
+ OUT2INC= \
+ 	$(BUILD_DIR_OUT)$/db.h
+ .ENDIF
+--- berkeleydb/prj/d.lst
++++ berkeleydb/prj/d.lst
+@@ -5,17 +5,11 @@
+ ..\%__SRC%\inc\db.h %_DEST%\inc%_EXT%\berkeleydb\db.h
+ 
+ ..\%__SRC%\lib\libdb42.lib %_DEST%\lib%_EXT%\libdb42.lib
+-..\%__SRC%\lib\libdb_java42.lib %_DEST%\lib%_EXT%\libdb_java42.lib
+ 
+ ..\%__SRC%\lib\libdb-4.2.so %_DEST%\lib%_EXT%\libdb-4.2.so
+-..\%__SRC%\lib\libdb_java-4.2.so %_DEST%\lib%_EXT%\libdb_java-4.2.so
+ 
+ ..\%__SRC%\lib\libdb-4.2.dylib %_DEST%\lib%_EXT%\libdb-4.2.dylib
+-..\%__SRC%\lib\libdb_java-4.2.jnilib %_DEST%\lib%_EXT%\libdb_java-4.2.jnilib
+ 
+ ..\%__SRC%\bin\libdb42.dll %_DEST%\bin%_EXT%\libdb42.dll
+-..\%__SRC%\bin\libdb_java42.dll %_DEST%\bin%_EXT%\libdb_java42.dll
+ ..\%__SRC%\bin\libdb_cxx42.dll %_DEST%\bin%_EXT%\libdb_cxx42.dll
+ 
+-..\%__SRC%\bin\db.jar %_DEST%\bin%_EXT%\db.jar
+-..\%__SRC%\class\db.jar %_DEST%\bin%_EXT%\db.jar
+--- config_office/set_soenv.in
++++ config_office/set_soenv.in
+@@ -1814,7 +1814,6 @@
+ ToFile( "SYSTEM_DB",         "@SYSTEM_DB@",        "e" );
+ ToFile( "DB_VERSION",        "@DB_VERSION@",       "e" );
+ ToFile( "DB_INCLUDES",       "@DB_INCLUDES@",      "e" );
+-ToFile( "DB_JAR",            "@DB_JAR@",           "e" );
+ ToFile( "SYSTEM_HSQLDB",     "@SYSTEM_HSQLDB@",    "e" );
+ ToFile( "HSQLDB_JAR",        "@HSQLDB_JAR@",       "e" );
+ ToFile( "SYSTEM_BSH",        "@SYSTEM_BSH@",       "e" );
+--- scp2/source/ooo/file_library_ooo.scp
++++ scp2/source/ooo/file_library_ooo.scp
+@@ -596,27 +596,6 @@
+ 
+ STD_LIB_FILE_PATCH( gid_File_Lib_Dbfile , file)
+ 
+-#ifdef SOLAR_JAVA
+-#ifndef SYSTEM_DB
+-
+-File gid_File_Lib_Dbjava
+-    TXT_FILE_BODY;
+-    Styles = (PACKED);
+-    Dir = gid_Dir_Program;
+-  #ifdef UNX
+-    #ifdef MACOSX
+-        Name = "libdb_java-4.2.jnilib";
+-    #else
+-    	Name = STRING(CONCAT2(libdb_java-4.2,UNXSUFFIX));
+-    #endif
+- #else
+-    Name = "libdb_java42.dll";
+-  #endif
+-End
+-
+-#endif
+-#endif
+-
+ File gid_File_Lib_Dbodbcbase
+     TXT_FILE_BODY;
+   #ifdef UNX




More information about the arch-commits mailing list