[csw-devel] SF.net SVN: gar:[6644] csw/mgar/pkg
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Thu Oct 1 15:16:29 CEST 2009
Revision: 6644
http://gar.svn.sourceforge.net/gar/?rev=6644&view=rev
Author: dmichelsen
Date: 2009-10-01 13:16:29 +0000 (Thu, 01 Oct 2009)
Log Message:
-----------
bdb33: Initial commit
Modified Paths:
--------------
csw/mgar/pkg/bdb33/trunk/Makefile
csw/mgar/pkg/bdb33/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/bdb33/
csw/mgar/pkg/bdb33/trunk/files/patch.3.3.11.1
csw/mgar/pkg/bdb33/trunk/files/patch.3.3.11.2
csw/mgar/pkg/bdb33/trunk/files/patch.64bit-libtool
Removed Paths:
-------------
csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.1.diff
csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.2.diff
csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.3.diff
csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.4.diff
csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.5.diff
csw/mgar/pkg/bdb33/trunk/files/patch.64bit-libtool.diff
Modified: csw/mgar/pkg/bdb33/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb42/trunk/Makefile 2009-09-30 15:07:42 UTC (rev 6625)
+++ csw/mgar/pkg/bdb33/trunk/Makefile 2009-10-01 13:16:29 UTC (rev 6644)
@@ -1,5 +1,5 @@
GARNAME = db
-GARVERSION = 4.2.52
+GARVERSION = 3.3.11
CATEGORIES = lib
DESCRIPTION = embedded database libraries and utilities
@@ -16,7 +16,7 @@
MASTER_SITES = http://download.oracle.com/berkeley-db/
DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
-PACKAGES = CSWbdb42 CSWbdb42-devel CSWbdb42-doc
+PACKAGES = CSWbdb33 CSWbdb33-devel CSWbdb33-doc
# We define upstream file regex so we can be notifed of new upstream software release
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
@@ -27,13 +27,13 @@
PATCHDIR = $(WORKSRC)/..
PATCHDIRLEVEL = 0
-PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*.diff))
+PATCHFILES += $(notdir $(wildcard $(FILEDIR)/patch.*))
BUILD64 = 1
CONFIGURE_SCRIPTS = dist
-prefix = $(BUILD_PREFIX)/bdb42
+prefix = $(BUILD_PREFIX)/bdb33
docdir = $(BUILD_PREFIX)/share/doc
CONFIGURE_ARGS = $(DIRPATHS)
@@ -50,38 +50,38 @@
CONFIGURE_ARGS += --with-tcl=$(libdir)
endif
-FIXCONFIG_DIRS = $(DESTDIR)$(prefix)/bdb42/lib
+FIXCONFIG_DIRS = $(DESTDIR)$(prefix)/bdb33/lib
# bdb tests are *very* time consuming
TEST_SCRIPTS =
NO_ISAEXEC = 1
-PACKAGES = CSWbdb42 CSWbdb42-devel CSWbdb42-doc
+PACKAGES = CSWbdb33 CSWbdb33-devel CSWbdb33-doc
-CATALOGNAME_CSWbdb42 = berkeleydb42
-CATALOGNAME_CSWbdb42-devel = berkeleydb42_devel
-CATALOGNAME_CSWbdb42-doc = berkeleydb42_doc
+CATALOGNAME_CSWbdb33 = berkeleydb33
+CATALOGNAME_CSWbdb33-devel = berkeleydb33_devel
+CATALOGNAME_CSWbdb33-doc = berkeleydb33_doc
-ARCHALL_CSWbdb42-doc = 1
+ARCHALL_CSWbdb33-doc = 1
-SPKG_DESC_CSWbdb42 = BerkeleyDB 4.2 embedded database libraries and utilities
-SPKG_DESC_CSWbdb42-devel = BerkeleyDB 4.2 development support
-SPKG_DESC_CSWbdb42-doc = BerkeleyDB 4.2 documentation
+SPKG_DESC_CSWbdb33 = BerkeleyDB 3.3 embedded database libraries and utilities
+SPKG_DESC_CSWbdb33-devel = BerkeleyDB 3.3 development support
+SPKG_DESC_CSWbdb33-doc = BerkeleyDB 3.3 documentation
-REQUIRED_PKGS_CSWbdb42-devel = CSWbdb42
-INCOMPATIBLE_PKGS_CSWbdb42-doc = CSWbdb42doc
+REQUIRED_PKGS_CSWbdb33-devel = CSWbdb33
+INCOMPATIBLE_PKGS_CSWbdb33-doc = CSWbdb33doc
LICENSE = LICENSE
# Leave the docs where they are for now
-#EXTRA_PAX_ARGS_isa-sparcv8 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb42/,p"
-#EXTRA_PAX_ARGS_isa-i386 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb42/,p"
+#EXTRA_PAX_ARGS_isa-sparcv8 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb33/,p"
+#EXTRA_PAX_ARGS_isa-i386 = -s ",^\.$(prefix)/docs/,$(docdir)/bdb33/,p"
-#PKGFILES_CSWbdb42-doc = $(PKGFILES_DOC)
-PKGFILES_CSWbdb42-doc = $(prefix)/docs/.*
+#PKGFILES_CSWbdb33-doc = $(PKGFILES_DOC)
+PKGFILES_CSWbdb33-doc = $(prefix)/docs/.*
-PKGFILES_CSWbdb42-devel = $(PKGFILES_DEVEL)
+PKGFILES_CSWbdb33-devel = $(PKGFILES_DEVEL)
include gar/category.mk
Modified: csw/mgar/pkg/bdb33/trunk/checksums
===================================================================
--- csw/mgar/pkg/bdb42/trunk/checksums 2009-09-30 15:07:42 UTC (rev 6625)
+++ csw/mgar/pkg/bdb33/trunk/checksums 2009-10-01 13:16:29 UTC (rev 6644)
@@ -1,7 +1,4 @@
-8b5cff6eb83972afdd8e0b821703c33c download/db-4.2.52.tar.gz
-1227f5f9ff43d48b5b1759e113a1c2d7 download/patch.4.2.52.1.diff
-3da7efd8d29919a9113e2f6f5166f5b7 download/patch.4.2.52.2.diff
-0bf9ebbe852652bed433e522928d40ec download/patch.4.2.52.3.diff
-9cfeff4dce0c11372c0b04b134f8faef download/patch.4.2.52.4.diff
-99836f962361da8936219cc193edc7ed download/patch.4.2.52.5.diff
-d49545b2691c511276b73bb6c3ec64c3 download/patch.64bit-libtool.diff
+b6ae24fa55713f17a9ac3219d987722c download/db-3.3.11.tar.gz
+a6c5fc6387c57361fbdf29ca63b597c3 download/patch.3.3.11.1
+fca939f74fc6555e1319626ceca35b33 download/patch.3.3.11.2
+d49545b2691c511276b73bb6c3ec64c3 download/patch.64bit-libtool
Added: csw/mgar/pkg/bdb33/trunk/files/patch.3.3.11.1
===================================================================
--- csw/mgar/pkg/bdb33/trunk/files/patch.3.3.11.1 (rev 0)
+++ csw/mgar/pkg/bdb33/trunk/files/patch.3.3.11.1 2009-10-01 13:16:29 UTC (rev 6644)
@@ -0,0 +1,96 @@
+*** db185/db185.c 2001/04/10 20:43:53 11.18
+--- db185/db185.c 2001/07/30 14:12:47
+***************
+*** 40,47 ****
+--- 40,52 ----
+
+ /*
+ * EXTERN: #define dbopen __db185_open
++ * EXTERN: #ifdef _DB185_INT_H_
+ * EXTERN: DB185 *__db185_open
+ * EXTERN: __P((const char *, int, int, DBTYPE, const void *));
++ * EXTERN: #else
++ * EXTERN: DB *__db185_open
++ * EXTERN: __P((const char *, int, int, DBTYPE, const void *));
++ * EXTERN: #endif
+ */
+ DB185 *
+ __db185_open(file, oflags, mode, type, openinfo)
+*** db185/db185_int.in 2001/04/10 20:43:54 11.9
+--- db185/db185_int.in 2001/07/30 14:12:47
+***************
+*** 39,46 ****
+ * $Id: patch.3.3.11.1,v 1.1 2003/01/10 13:43:30 mao Exp $
+ */
+
+! #ifndef _DB_185_H_
+! #define _DB_185_H_
+
+ /* Routine flags. */
+ #define R_CURSOR 1 /* del, put, seq */
+--- 39,46 ----
+ * $Id: patch.3.3.11.1,v 1.1 2003/01/10 13:43:30 mao Exp $
+ */
+
+! #ifndef _DB185_INT_H_
+! #define _DB185_INT_H_
+
+ /* Routine flags. */
+ #define R_CURSOR 1 /* del, put, seq */
+*** include_auto/db185_ext.in 2001/04/10 20:44:20 1.1
+--- include_auto/db185_ext.in 2001/07/30 14:12:48
+***************
+*** 3,11 ****
+ extern "C" {
+ #endif
+ #define dbopen __db185_open
+ DB185 *__db185_open __P((const char *, int, int, DBTYPE, const void *));
+ #if defined(__cplusplus)
+ }
+ #endif
+
+! #endif /* !_DB_185_H_ */
+--- 3,15 ----
+ extern "C" {
+ #endif
+ #define dbopen __db185_open
++ #ifdef _DB185_INT_H_
+ DB185 *__db185_open __P((const char *, int, int, DBTYPE, const void *));
++ #else
++ DB *__db185_open __P((const char *, int, int, DBTYPE, const void *));
++ #endif
+ #if defined(__cplusplus)
+ }
+ #endif
+
+! #endif /* _DB_185_H_ or _DB185_INT_H_ */
+*** include_auto/db185_uext.in 2001/04/10 20:44:20 1.1
+--- include_auto/db185_uext.in 2001/07/30 14:12:48
+***************
+*** 3,12 ****
+ extern "C" {
+ #endif
+ #define dbopen __db185_open at DB_VERSION_UNIQUE_NAME@
+ #define __db185_open __db185_open at DB_VERSION_UNIQUE_NAME@
+ DB185 *__db185_open __P((const char *, int, int, DBTYPE, const void *));
+ #if defined(__cplusplus)
+ }
+ #endif
+
+! #endif /* !_DB_185_H_ */
+--- 3,17 ----
+ extern "C" {
+ #endif
+ #define dbopen __db185_open at DB_VERSION_UNIQUE_NAME@
++ #ifdef _DB185_INT_H_
+ #define __db185_open __db185_open at DB_VERSION_UNIQUE_NAME@
+ DB185 *__db185_open __P((const char *, int, int, DBTYPE, const void *));
++ #else
++ #define __db185_open __db185_open at DB_VERSION_UNIQUE_NAME@
++ DB *__db185_open __P((const char *, int, int, DBTYPE, const void *));
++ #endif
+ #if defined(__cplusplus)
+ }
+ #endif
+
+! #endif /* _DB_185_H_ or _DB185_INT_H_ */
Added: csw/mgar/pkg/bdb33/trunk/files/patch.3.3.11.2
===================================================================
--- csw/mgar/pkg/bdb33/trunk/files/patch.3.3.11.2 (rev 0)
+++ csw/mgar/pkg/bdb33/trunk/files/patch.3.3.11.2 2009-10-01 13:16:29 UTC (rev 6644)
@@ -0,0 +1,15 @@
+*** build_vxworks/db.h.orig Mon Jul 30 09:49:54 2001
+--- build_vxworks/db.h Wed Dec 31 19:00:00 1969
+***************
+*** 32,37 ****
+--- 32,41 ----
+ extern "C" {
+ #endif
+
++ #ifndef HAVE_VXWORKS
++ #define HAVE_VXWORKS 1
++ #endif
++
+ /*
+ * XXX
+ * Handle function prototypes and the keyword "const". This steps on name
Deleted: csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.1.diff
===================================================================
--- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.1.diff 2009-09-30 15:07:42 UTC (rev 6625)
+++ csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.1.diff 2009-10-01 13:16:29 UTC (rev 6644)
@@ -1,36 +0,0 @@
-*** mp/mp_fget.c.orig 25 Sep 2003 02:15:16 -0000 11.81
---- mp/mp_fget.c 9 Dec 2003 19:06:28 -0000 11.82
-***************
-*** 440,446 ****
- c_mp->stat.st_pages--;
- alloc_bhp = NULL;
- R_UNLOCK(dbenv, &dbmp->reginfo[n_cache]);
-- MUTEX_LOCK(dbenv, &hp->hash_mutex);
-
- /*
- * We can't use the page we found in the pool if DB_MPOOL_NEW
---- 440,445 ----
-***************
-*** 455,460 ****
---- 454,462 ----
- b_incr = 0;
- goto alloc;
- }
-+
-+ /* We can use the page -- get the bucket lock. */
-+ MUTEX_LOCK(dbenv, &hp->hash_mutex);
- break;
- case SECOND_MISS:
- /*
-*** mp/mp_fput.c.orig 30 Sep 2003 17:12:00 -0000 11.48
---- mp/mp_fput.c 13 Dec 2003 00:08:29 -0000 11.49
-***************
-*** 285,290 ****
---- 285,291 ----
- bhp != NULL; bhp = SH_TAILQ_NEXT(bhp, hq, __bh))
- if (bhp->priority != UINT32_T_MAX &&
- bhp->priority > MPOOL_BASE_DECREMENT)
-+ bhp->priority -= MPOOL_BASE_DECREMENT;
- MUTEX_UNLOCK(dbenv, &hp->hash_mutex);
- }
- }
Deleted: csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.2.diff
===================================================================
--- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.2.diff 2009-09-30 15:07:42 UTC (rev 6625)
+++ csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.2.diff 2009-10-01 13:16:29 UTC (rev 6644)
@@ -1,45 +0,0 @@
-*** lock/lock.c.save 2004-01-30 10:48:33.000000000 -0800
---- lock/lock.c 2004-01-30 10:55:58.000000000 -0800
-***************
-*** 2216,2226 ****
- dp = (u_int8_t *)dp + \
- sizeof(db_pgno_t); \
- } while (0)
-! #define COPY_OBJ(dp, obj) do { \
-! memcpy(dp, obj->data, obj->size); \
-! dp = (u_int8_t *)dp + \
-! ALIGN(obj->size, \
-! sizeof(u_int32_t)); \
- } while (0)
-
- #define GET_COUNT(dp, count) do { \
---- 2216,2227 ----
- dp = (u_int8_t *)dp + \
- sizeof(db_pgno_t); \
- } while (0)
-! #define COPY_OBJ(dp, obj) do { \
-! memcpy(dp, \
-! (obj)->data, (obj)->size); \
-! dp = (u_int8_t *)dp + \
-! ALIGN((obj)->size, \
-! sizeof(u_int32_t)); \
- } while (0)
-
- #define GET_COUNT(dp, count) do { \
-***************
-*** 2339,2345 ****
- for (i = 0; i < nlocks; i = j) {
- PUT_PCOUNT(dp, obj[i].ulen);
- PUT_SIZE(dp, obj[i].size);
-! COPY_OBJ(dp, obj);
- lock = (DB_LOCK_ILOCK *)obj[i].data;
- for (j = i + 1; j <= i + obj[i].ulen; j++) {
- lock = (DB_LOCK_ILOCK *)obj[j].data;
---- 2340,2346 ----
- for (i = 0; i < nlocks; i = j) {
- PUT_PCOUNT(dp, obj[i].ulen);
- PUT_SIZE(dp, obj[i].size);
-! COPY_OBJ(dp, &obj[i]);
- lock = (DB_LOCK_ILOCK *)obj[i].data;
- for (j = i + 1; j <= i + obj[i].ulen; j++) {
- lock = (DB_LOCK_ILOCK *)obj[j].data;
Deleted: csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.3.diff
===================================================================
--- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.3.diff 2009-09-30 15:07:42 UTC (rev 6625)
+++ csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.3.diff 2009-10-01 13:16:29 UTC (rev 6644)
@@ -1,247 +0,0 @@
---- java/src/com/sleepycat/db/DbEnv.java 2003-12-03 16:26:27.000000000 -0500
-+++ java/src/com/sleepycat/db/DbEnv.java 2004-03-18 15:15:42.000000000 -0500
-@@ -61,7 +61,7 @@
- // Internally, the JNI layer creates a global reference to each DbEnv,
- // which can potentially be different to this. We keep a copy here so
- // we can clean up after destructors.
-- private Object dbenv_ref;
-+ private long dbenv_ref;
- private DbAppDispatch app_dispatch_handler;
- private DbEnvFeedbackHandler env_feedback_handler;
- private DbErrorHandler error_handler;
-@@ -94,7 +94,7 @@
- void cleanup() {
- swigCPtr = 0;
- db_java.deleteRef0(dbenv_ref);
-- dbenv_ref = null;
-+ dbenv_ref = 0L;
- }
-
-
---- java/src/com/sleepycat/db/Db.java 2003-12-03 16:26:25.000000000 -0500
-+++ java/src/com/sleepycat/db/Db.java 2004-03-18 15:15:55.000000000 -0500
-@@ -57,7 +57,7 @@
- // Internally, the JNI layer creates a global reference to each Db,
- // which can potentially be different to this. We keep a copy here so
- // we can clean up after destructors.
-- private Object db_ref;
-+ private long db_ref;
- private DbEnv dbenv;
- private boolean private_dbenv;
- private DbAppendRecno append_recno_handler;
-@@ -84,7 +84,7 @@
- private void cleanup() {
- swigCPtr = 0;
- db_java.deleteRef0(db_ref);
-- db_ref = null;
-+ db_ref = 0L;
- if (private_dbenv) {
- dbenv.cleanup();
- }
---- java/src/com/sleepycat/db/db_java.java 2003-12-03 16:10:54.000000000 -0500
-+++ java/src/com/sleepycat/db/db_java.java 2004-03-18 15:17:24.000000000 -0500
-@@ -14,15 +14,15 @@
- db_javaJNI.DbEnv_lock_vec(DbEnv.getCPtr(dbenv), locker, flags, list, offset, nlist);
- }
-
-- static Object initDbEnvRef0(DbEnv self, Object handle) {
-+ static long initDbEnvRef0(DbEnv self, Object handle) {
- return db_javaJNI.initDbEnvRef0(DbEnv.getCPtr(self), handle);
- }
-
-- static Object initDbRef0(Db self, Object handle) {
-+ static long initDbRef0(Db self, Object handle) {
- return db_javaJNI.initDbRef0(Db.getCPtr(self), handle);
- }
-
-- static void deleteRef0(Object ref) {
-+ static void deleteRef0(long ref) {
- db_javaJNI.deleteRef0(ref);
- }
-
---- java/src/com/sleepycat/db/db_javaJNI.java 2003-12-03 16:10:55.000000000 -0500
-+++ java/src/com/sleepycat/db/db_javaJNI.java 2004-03-18 15:16:18.000000000 -0500
-@@ -45,9 +45,9 @@
- static native final void initialize();
-
- public final static native void DbEnv_lock_vec(long jarg1, int jarg2, int jarg3, DbLockRequest[] jarg4, int jarg5, int jarg6) throws DbException;
-- final static native Object initDbEnvRef0(long jarg1, Object jarg2);
-- final static native Object initDbRef0(long jarg1, Object jarg2);
-- final static native void deleteRef0(Object jarg1);
-+ final static native long initDbEnvRef0(long jarg1, Object jarg2);
-+ final static native long initDbRef0(long jarg1, Object jarg2);
-+ final static native void deleteRef0(long jarg1);
- final static native long getDbEnv0(long jarg1);
- public final static native long new_Db(long jarg1, int jarg2) throws DbException;
- public final static native void Db_associate(long jarg1, long jarg2, long jarg3, DbSecondaryKeyCreate jarg4, int jarg5) throws DbException;
---- libdb_java/db_java.i 2003-11-17 15:00:52.000000000 -0500
-+++ libdb_java/db_java.i 2004-03-18 09:21:14.000000000 -0500
-@@ -53,7 +53,7 @@
- // Internally, the JNI layer creates a global reference to each DbEnv,
- // which can potentially be different to this. We keep a copy here so
- // we can clean up after destructors.
-- private Object dbenv_ref;
-+ private long dbenv_ref;
- private DbAppDispatch app_dispatch_handler;
- private DbEnvFeedbackHandler env_feedback_handler;
- private DbErrorHandler error_handler;
-@@ -76,7 +76,7 @@
- void cleanup() {
- swigCPtr = 0;
- db_java.deleteRef0(dbenv_ref);
-- dbenv_ref = null;
-+ dbenv_ref = 0L;
- }
-
- public synchronized void close(int flags) throws DbException {
-@@ -220,7 +220,7 @@
- // Internally, the JNI layer creates a global reference to each Db,
- // which can potentially be different to this. We keep a copy here so
- // we can clean up after destructors.
-- private Object db_ref;
-+ private long db_ref;
- private DbEnv dbenv;
- private boolean private_dbenv;
- private DbAppendRecno append_recno_handler;
-@@ -245,7 +245,7 @@
- private void cleanup() {
- swigCPtr = 0;
- db_java.deleteRef0(db_ref);
-- db_ref = null;
-+ db_ref = 0L;
- if (private_dbenv)
- dbenv.cleanup();
- dbenv = null;
-@@ -503,46 +503,42 @@
- }
- %}
-
--%native(initDbEnvRef0) jobject initDbEnvRef0(DB_ENV *self, void *handle);
--%native(initDbRef0) jobject initDbRef0(DB *self, void *handle);
--%native(deleteRef0) void deleteRef0(jobject ref);
-+%native(initDbEnvRef0) jlong initDbEnvRef0(DB_ENV *self, void *handle);
-+%native(initDbRef0) jlong initDbRef0(DB *self, void *handle);
-+%native(deleteRef0) void deleteRef0(jlong ref);
- %native(getDbEnv0) DB_ENV *getDbEnv0(DB *self);
-
- %{
--JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0(
-+JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0(
- JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) {
- DB_ENV *self = *(DB_ENV **)&jarg1;
-+ jlong ret;
- COMPQUIET(jcls, NULL);
-
- DB_ENV_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2);
- self->set_errpfx(self, (const char*)self);
-- return (jobject)DB_ENV_INTERNAL(self);
-+ *(jobject *)&ret = (jobject)DB_ENV_INTERNAL(self);
-+ return (ret);
- }
-
--JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0(
-+JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0(
- JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) {
- DB *self = *(DB **)&jarg1;
-+ jlong ret;
- COMPQUIET(jcls, NULL);
-
- DB_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2);
-- return (jobject)DB_INTERNAL(self);
-+ *(jobject *)&ret = (jobject)DB_INTERNAL(self);
-+ return (ret);
- }
-
- JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1javaJNI_deleteRef0(
-- JNIEnv *jenv, jclass jcls, jobject jref) {
-- COMPQUIET(jcls, NULL);
--
-- if (jref != NULL)
-- (*jenv)->DeleteGlobalRef(jenv, jref);
--}
--
--JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbRef0(
- JNIEnv *jenv, jclass jcls, jlong jarg1) {
-- DB *self = *(DB **)&jarg1;
-+ jobject jref = *(jobject *)&jarg1;
- COMPQUIET(jcls, NULL);
-- COMPQUIET(jenv, NULL);
-
-- return (jobject)DB_INTERNAL(self);
-+ if (jref != 0L)
-+ (*jenv)->DeleteGlobalRef(jenv, jref);
- }
-
- JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbEnv0(
-@@ -554,7 +550,7 @@
- COMPQUIET(jcls, NULL);
-
- *(DB_ENV **)&env_cptr = self->dbenv;
-- return env_cptr;
-+ return (env_cptr);
- }
-
- JNIEXPORT jboolean JNICALL
---- libdb_java/db_java_wrap.c 2003-12-03 16:10:36.000000000 -0500
-+++ libdb_java/db_java_wrap.c 2004-03-18 12:18:58.000000000 -0500
-@@ -1192,40 +1192,36 @@
- }
-
-
--JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0(
-+JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbEnvRef0(
- JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) {
- DB_ENV *self = *(DB_ENV **)&jarg1;
-+ jlong ret;
- COMPQUIET(jcls, NULL);
-
- DB_ENV_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2);
- self->set_errpfx(self, (const char*)self);
-- return (jobject)DB_ENV_INTERNAL(self);
-+ *(jobject *)&ret = (jobject)DB_ENV_INTERNAL(self);
-+ return (ret);
- }
-
--JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0(
-+JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_initDbRef0(
- JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg2) {
- DB *self = *(DB **)&jarg1;
-+ jlong ret;
- COMPQUIET(jcls, NULL);
-
- DB_INTERNAL(self) = (void *)(*jenv)->NewGlobalRef(jenv, jarg2);
-- return (jobject)DB_INTERNAL(self);
-+ *(jobject *)&ret = (jobject)DB_INTERNAL(self);
-+ return (ret);
- }
-
- JNIEXPORT void JNICALL Java_com_sleepycat_db_db_1javaJNI_deleteRef0(
-- JNIEnv *jenv, jclass jcls, jobject jref) {
-- COMPQUIET(jcls, NULL);
--
-- if (jref != NULL)
-- (*jenv)->DeleteGlobalRef(jenv, jref);
--}
--
--JNIEXPORT jobject JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbRef0(
- JNIEnv *jenv, jclass jcls, jlong jarg1) {
-- DB *self = *(DB **)&jarg1;
-+ jobject jref = *(jobject *)&jarg1;
- COMPQUIET(jcls, NULL);
-- COMPQUIET(jenv, NULL);
-
-- return (jobject)DB_INTERNAL(self);
-+ if (jref != 0L)
-+ (*jenv)->DeleteGlobalRef(jenv, jref);
- }
-
- JNIEXPORT jlong JNICALL Java_com_sleepycat_db_db_1javaJNI_getDbEnv0(
-@@ -1237,7 +1233,7 @@
- COMPQUIET(jcls, NULL);
-
- *(DB_ENV **)&env_cptr = self->dbenv;
-- return env_cptr;
-+ return (env_cptr);
- }
-
- JNIEXPORT jboolean JNICALL
Deleted: csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.4.diff
===================================================================
--- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.4.diff 2009-09-30 15:07:42 UTC (rev 6625)
+++ csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.4.diff 2009-10-01 13:16:29 UTC (rev 6644)
@@ -1,36 +0,0 @@
-*** btree/bt_rec.c.orig Tue Mar 22 09:41:49 2005
---- btree/bt_rec.c Tue Mar 22 09:42:11 2005
-***************
-*** 222,228 ****
- * previous-page pointer updated to our new page. The next
- * page must exist because we're redoing the operation.
- */
-! if (!rootsplit && !IS_ZERO_LSN(argp->nlsn)) {
- if ((ret =
- __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) {
- ret = __db_pgerr(file_dbp, argp->npgno, ret);
---- 222,228 ----
- * previous-page pointer updated to our new page. The next
- * page must exist because we're redoing the operation.
- */
-! if (!rootsplit && argp->npgno != PGNO_INVALID) {
- if ((ret =
- __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) {
- ret = __db_pgerr(file_dbp, argp->npgno, ret);
-***************
-*** 294,300 ****
- * possible that the next-page never existed, we ignore it as
- * if there's nothing to undo.
- */
-! if (!rootsplit && !IS_ZERO_LSN(argp->nlsn)) {
- if ((ret =
- __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) {
- np = NULL;
---- 294,300 ----
- * possible that the next-page never existed, we ignore it as
- * if there's nothing to undo.
- */
-! if (!rootsplit && argp->npgno != PGNO_INVALID) {
- if ((ret =
- __memp_fget(mpf, &argp->npgno, 0, &np)) != 0) {
- np = NULL;
Deleted: csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.5.diff
===================================================================
--- csw/mgar/pkg/bdb42/trunk/files/patch.4.2.52.5.diff 2009-09-30 15:07:42 UTC (rev 6625)
+++ csw/mgar/pkg/bdb33/trunk/files/patch.4.2.52.5.diff 2009-10-01 13:16:29 UTC (rev 6644)
@@ -1,24 +0,0 @@
-*** mp/mp_fget.c.orig 2003-09-25 08:29:02.000000000 -0700
---- mp/mp_fget.c 2006-05-26 14:58:02.246963204 -0700
-***************
-*** 553,560 ****
- */
- if (state != SECOND_MISS && bhp->ref == 1) {
- bhp->priority = UINT32_T_MAX;
-! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh);
-! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq);
- hp->hash_priority =
- SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority;
- }
---- 553,563 ----
- */
- if (state != SECOND_MISS && bhp->ref == 1) {
- bhp->priority = UINT32_T_MAX;
-! if (SH_TAILQ_FIRST(&hp->hash_bucket, __bh) !=
-! SH_TAILQ_LAST(&hp->hash_bucket, hq, __bh)) {
-! SH_TAILQ_REMOVE(&hp->hash_bucket, bhp, hq, __bh);
-! SH_TAILQ_INSERT_TAIL(&hp->hash_bucket, bhp, hq);
-! }
- hp->hash_priority =
- SH_TAILQ_FIRST(&hp->hash_bucket, __bh)->priority;
- }
Copied: csw/mgar/pkg/bdb33/trunk/files/patch.64bit-libtool (from rev 6625, csw/mgar/pkg/bdb42/trunk/files/patch.64bit-libtool.diff)
===================================================================
--- csw/mgar/pkg/bdb33/trunk/files/patch.64bit-libtool (rev 0)
+++ csw/mgar/pkg/bdb33/trunk/files/patch.64bit-libtool 2009-10-01 13:16:29 UTC (rev 6644)
@@ -0,0 +1,22 @@
+diff -Naur db-4.2.52.orig/dist/ltmain.sh db-4.2.52.patched/dist/ltmain.sh
+--- dist/ltmain.sh 2003-04-26 19:45:37.000000000 +0200
++++ dist/ltmain.sh 2009-09-30 15:15:43.792423773 +0200
+@@ -1298,7 +1298,7 @@
+ # but this is not reliable with gcc because gcc may use -mfoo to
+ # select a different linker, different libraries, etc, while
+ # -Wl,-mfoo simply passes -mfoo to the linker.
+- -m*)
++ -m*|-xarch=*)
+ # Unknown arguments in both finalize_command and compile_command need
+ # to be aesthetically quoted because they are evaled later.
+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+@@ -1309,9 +1309,7 @@
+ esac
+ compile_command="$compile_command $arg"
+ finalize_command="$finalize_command $arg"
+- if test "$with_gcc" = "yes" ; then
+ compiler_flags="$compiler_flags $arg"
+- fi
+ continue
+ ;;
+
Deleted: csw/mgar/pkg/bdb33/trunk/files/patch.64bit-libtool.diff
===================================================================
--- csw/mgar/pkg/bdb42/trunk/files/patch.64bit-libtool.diff 2009-09-30 15:07:42 UTC (rev 6625)
+++ csw/mgar/pkg/bdb33/trunk/files/patch.64bit-libtool.diff 2009-10-01 13:16:29 UTC (rev 6644)
@@ -1,22 +0,0 @@
-diff -Naur db-4.2.52.orig/dist/ltmain.sh db-4.2.52.patched/dist/ltmain.sh
---- dist/ltmain.sh 2003-04-26 19:45:37.000000000 +0200
-+++ dist/ltmain.sh 2009-09-30 15:15:43.792423773 +0200
-@@ -1298,7 +1298,7 @@
- # but this is not reliable with gcc because gcc may use -mfoo to
- # select a different linker, different libraries, etc, while
- # -Wl,-mfoo simply passes -mfoo to the linker.
-- -m*)
-+ -m*|-xarch=*)
- # Unknown arguments in both finalize_command and compile_command need
- # to be aesthetically quoted because they are evaled later.
- arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-@@ -1309,9 +1309,7 @@
- esac
- compile_command="$compile_command $arg"
- finalize_command="$finalize_command $arg"
-- if test "$with_gcc" = "yes" ; then
- compiler_flags="$compiler_flags $arg"
-- fi
- continue
- ;;
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list