64bit cleanups / fixes

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1308 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-gdl1/GDLAccess/GNUmakefile.preamble b/sope-gdl1/GDLAccess/GNUmakefile.preamble
index a01419009b77b120de430c6ce9971f819ca46e1f..3c00014a52d1ff7b6ecceea77207f5856b222c02 100644 (file)
--- a/sope-gdl1/GDLAccess/GNUmakefile.preamble
+++ b/sope-gdl1/GDLAccess/GNUmakefile.preamble
@@ -46,11 +46,7 @@ ADDITIONAL_LIB_DIRS += \
        $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir))
 endif
 
-ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64)
-SYSTEM_LIB_DIR += -L/usr/local/lib64 -L/usr/lib64
-else
-SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
-endif
+SYSTEM_LIB_DIR += $(CONFIGURE_SYSTEM_LIB_DIR)
 
 
 # TODO: add prebinding address

diff --git a/sope-gdl1/GDLAccess/fhs.make b/sope-gdl1/GDLAccess/fhs.make
index e0879982049ae5fb4e6d833b7058a95caa11d7c1..66aa31bf8b47b25bd42e396fd239ccfdf00175a7 100644 (file)
--- a/sope-gdl1/GDLAccess/fhs.make
+++ b/sope-gdl1/GDLAccess/fhs.make
@@ -6,12 +6,7 @@ ifneq ($(FHS_INSTALL_ROOT),)
 
 FHS_INCLUDE_DIR=$(FHS_INSTALL_ROOT)/include/
 FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin/
-
-ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64)
-FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib64/
-else
-FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
-endif
+FHS_LIB_DIR=$(CONFIGURE_FHS_INSTALL_LIBDIR)
 
 NONFHS_LIBDIR="$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)/"
 NONFHS_LIBNAME="$(LIBRARY_NAME)$(LIBRARY_NAME_SUFFIX)$(SHARED_LIBEXT)"

diff --git a/sope-gdl1/GDLContentStore/GNUmakefile.preamble b/sope-gdl1/GDLContentStore/GNUmakefile.preamble
index e1624ee0ea69fda060fbf97d1cdb63cf027475d8..ada5aa195324198113d2b2e6ffcc2d91dda3c99a 100644 (file)
--- a/sope-gdl1/GDLContentStore/GNUmakefile.preamble
+++ b/sope-gdl1/GDLContentStore/GNUmakefile.preamble
@@ -63,11 +63,7 @@ ADDITIONAL_LIB_DIRS += \
        $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir))
 endif
 
-ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64)
-SYSTEM_LIB_DIR += -L/usr/local/lib64 -L/usr/lib64
-else
-SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
-endif
+SYSTEM_LIB_DIR += $(CONFIGURE_SYSTEM_LIB_DIR)
 
 
 # platform specific settings

diff --git a/sope-gdl1/GDLContentStore/fhs.make b/sope-gdl1/GDLContentStore/fhs.make
index f4caff91cd0ea08bd2cb4718a928f220e2b290ed..24d1e43fc9f19c40b248cd3360f168e20d19d0fc 100644 (file)
--- a/sope-gdl1/GDLContentStore/fhs.make
+++ b/sope-gdl1/GDLContentStore/fhs.make
@@ -7,13 +7,8 @@
 ifneq ($(FHS_INSTALL_ROOT),)
 
 FHS_INCLUDE_DIR=$(FHS_INSTALL_ROOT)/include/
-FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin/
-
-ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64)
-FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib64/
-else
-FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
-endif
+FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin
+FHS_LIB_DIR=$(CONFIGURE_FHS_INSTALL_LIBDIR)
 
 NONFHS_LIBDIR="$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)/"
 NONFHS_LIBNAME="$(LIBRARY_NAME)$(LIBRARY_NAME_SUFFIX)$(SHARED_LIBEXT)"

diff --git a/sope-gdl1/MySQL/GNUmakefile.preamble b/sope-gdl1/MySQL/GNUmakefile.preamble
index 5b1c29d07d5201d55ae900cb43ef24325f0dacce..fb3df4271a08a36bb508b76be00c595969258785 100644 (file)
--- a/sope-gdl1/MySQL/GNUmakefile.preamble
+++ b/sope-gdl1/MySQL/GNUmakefile.preamble
@@ -75,10 +75,4 @@ ADDITIONAL_LIB_DIRS += \
        $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir))
 endif
 
-
-ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64)
-SYSTEM_LIB_DIR += -L/usr/local/lib64 -L/usr/lib64
-else
-SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
-endif
-
+SYSTEM_LIB_DIR += $(CONFIGURE_SYSTEM_LIB_DIR)

diff --git a/sope-gdl1/MySQL/fhs.make b/sope-gdl1/MySQL/fhs.make
index d7a0a4d37d0027886cd6a62acaa7a50666eb9268..c673bf065f9faf0118df5069fcf52d898cde46bd 100644 (file)
--- a/sope-gdl1/MySQL/fhs.make
+++ b/sope-gdl1/MySQL/fhs.make
@@ -4,11 +4,7 @@
 
 ifneq ($(FHS_INSTALL_ROOT),)
 
-ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64)
-FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib64/
-else
-FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
-endif
+FHS_LIB_DIR=$(CONFIGURE_FHS_INSTALL_LIBDIR)
 FHS_DB_DIR=$(FHS_LIB_DIR)sope-$(SOPE_MAJOR_VERSION).$(SOPE_MINOR_VERSION)/dbadaptors/
 
 fhs-db-dirs ::

diff --git a/sope-gdl1/PostgreSQL/ChangeLog b/sope-gdl1/PostgreSQL/ChangeLog
index bc4936954a4551c0bba1aa235e1c146444f45a4d..941782ae5c3136df9f78f763b3477c46f4bb4cbf 100644 (file)
--- a/sope-gdl1/PostgreSQL/ChangeLog
+++ b/sope-gdl1/PostgreSQL/ChangeLog
@@ -1,5 +1,7 @@
 2006-07-04  Helge Hess  <helge.hess@opengroupware.org>
 
+       * fixed some 64bit issues (v4.5.47)
+
        * use %p for pointer formats, fixed gcc 4.1 warnings (v4.5.46)
 
 2005-08-16  Helge Hess  <helge.hess@opengroupware.org>

diff --git a/sope-gdl1/PostgreSQL/GNUmakefile.preamble b/sope-gdl1/PostgreSQL/GNUmakefile.preamble
index 2a84eb78007f1855491398f078ae13cc5914b321..1a728365ac216a10f9af079cacfff25013a0c100 100644 (file)
--- a/sope-gdl1/PostgreSQL/GNUmakefile.preamble
+++ b/sope-gdl1/PostgreSQL/GNUmakefile.preamble
@@ -81,11 +81,7 @@ ADDITIONAL_LIB_DIRS += \
 endif
 
 
-ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64)
-SYSTEM_LIB_DIR += -L/usr/local/lib64 -L/usr/lib64
-else
-SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
-endif
+SYSTEM_LIB_DIR += $(CONFIGURE_SYSTEM_LIB_DIR)
 
 # TODO: not necessary? covered by pg_config?
 #ifeq ($(FOUNDATION_LIB),apple)

diff --git a/sope-gdl1/PostgreSQL/NSString+PostgreSQL72.m b/sope-gdl1/PostgreSQL/NSString+PostgreSQL72.m
index 78d8ee40e9ebc6c196fbce4bdd0690ff50e0d147..20fc4656cc5c7a03bd18b2d4fcd2a91c3e564fed 100644 (file)
--- a/sope-gdl1/PostgreSQL/NSString+PostgreSQL72.m
+++ b/sope-gdl1/PostgreSQL/NSString+PostgreSQL72.m
@@ -126,12 +126,16 @@
 
 - (NSString *)_pgStripEndSpaces {
   if ([self length] > 0) {
-    NSCharacterSet  *spaceSet = [NSCharacterSet whitespaceCharacterSet];
-    NSMutableString *str      = [NSMutableString stringWithCapacity:[self length]];
-    IMP             charAtIndex;
+    NSCharacterSet  *spaceSet;
+    NSMutableString *str;
+    unichar         (*charAtIndex)(id, SEL, int);
     NSRange         range;
 
-    charAtIndex  = [self methodForSelector:@selector(characterAtIndex:)];
+    spaceSet = [NSCharacterSet whitespaceCharacterSet];
+    str      = [NSMutableString stringWithCapacity:[self length]];
+
+    charAtIndex  = (unichar (*)(id, SEL, int))
+      [self methodForSelector:@selector(characterAtIndex:)];
     range.length = 0;
 
     for (range.location = ([self length] - 1);
@@ -139,8 +143,7 @@
          range.location++, range.length++) {
       unichar c;
       
-      c = (unichar)(int)charAtIndex(self, @selector(characterAtIndex:),
-                                    range.location);
+      c = charAtIndex(self, @selector(characterAtIndex:), range.location);
       if (![spaceSet characterIsMember:c])
         break;
     }
@@ -154,7 +157,7 @@
   return AUTORELEASE([self copy]);
 }
  
-@end
+@end /* NSString(PostgreSQL72MiscStrings) */
 
 void __link_NSStringPostgreSQL72() {
   // used to force linking of object file

diff --git a/sope-gdl1/PostgreSQL/PostgreSQL72Channel.m b/sope-gdl1/PostgreSQL/PostgreSQL72Channel.m
index 4ea1fc3cee398435083cc609ed9234db80680619..994e345aaa6d6d9fc7e83ffe4c93cb6ba1d47cb9 100644 (file)
--- a/sope-gdl1/PostgreSQL/PostgreSQL72Channel.m
+++ b/sope-gdl1/PostgreSQL/PostgreSQL72Channel.m
@@ -227,7 +227,7 @@ static int openConnectionCount = 0;
 
   if (isDebuggingEnabled) {
     NSLog(@"PostgreSQL72 channel 0x%p opened (connection=%@)",
-          (unsigned)self, self->connection);
+          self, self->connection);
   }
   return YES;
 }
@@ -641,7 +641,7 @@ static int openConnectionCount = 0;
   }
 
   if (isDebuggingEnabled)
-    NSLog(@"PG0x%p SQL: %@", (unsigned)self, _expression);
+    NSLog(@"PG0x%p SQL: %@", self, _expression);
   
   [self _resetEvaluationState];
   

diff --git a/sope-gdl1/PostgreSQL/Version b/sope-gdl1/PostgreSQL/Version
index 324bcc303bb67bd062cccda921ba68a6dad080b9..6b9eee57f77267b3ba2cc3d82164fe0d908188bf 100644 (file)
--- a/sope-gdl1/PostgreSQL/Version
+++ b/sope-gdl1/PostgreSQL/Version
@@ -1,5 +1,5 @@
 # version file
 
-SUBMINOR_VERSION:=46
+SUBMINOR_VERSION:=47
 
 # v4.5.41 requires libGDLAccess v4.5.50

diff --git a/sope-gdl1/PostgreSQL/fhs.make b/sope-gdl1/PostgreSQL/fhs.make
index 01305296bf03f4c83bc42d45095fce13b4963349..c673bf065f9faf0118df5069fcf52d898cde46bd 100644 (file)
--- a/sope-gdl1/PostgreSQL/fhs.make
+++ b/sope-gdl1/PostgreSQL/fhs.make
@@ -4,12 +4,7 @@
 
 ifneq ($(FHS_INSTALL_ROOT),)
 
-ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64)
-FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib64/
-else
-FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
-endif
-
+FHS_LIB_DIR=$(CONFIGURE_FHS_INSTALL_LIBDIR)
 FHS_DB_DIR=$(FHS_LIB_DIR)sope-$(SOPE_MAJOR_VERSION).$(SOPE_MINOR_VERSION)/dbadaptors/
 
 fhs-db-dirs ::

diff --git a/sope-gdl1/SQLite3/GNUmakefile.preamble b/sope-gdl1/SQLite3/GNUmakefile.preamble
index 95c5ae01f30af1f6378ac8a27ffd0e2a4965f959..be450d6a67940ed6857ed21cf3c023757cdbac4a 100644 (file)
--- a/sope-gdl1/SQLite3/GNUmakefile.preamble
+++ b/sope-gdl1/SQLite3/GNUmakefile.preamble
@@ -73,8 +73,4 @@ ADDITIONAL_LIB_DIRS += \
        $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir))
 endif
 
-ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64)
-SYSTEM_LIB_DIR += -L/usr/local/lib64 -L/usr/lib64
-else
-SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
-endif
+SYSTEM_LIB_DIR += $(CONFIGURE_SYSTEM_LIB_DIR)

diff --git a/sope-gdl1/SQLite3/fhs.make b/sope-gdl1/SQLite3/fhs.make
index aae3415aa2f6ba7a01bc1bdbb4adac05521c38ec..c673bf065f9faf0118df5069fcf52d898cde46bd 100644 (file)
--- a/sope-gdl1/SQLite3/fhs.make
+++ b/sope-gdl1/SQLite3/fhs.make
@@ -4,12 +4,7 @@
 
 ifneq ($(FHS_INSTALL_ROOT),)
 
-ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64)
-SYSTEM_LIB_DIR += -L/usr/local/lib64
-else
-SYSTEM_LIB_DIR += -L/usr/local/lib
-endif
-
+FHS_LIB_DIR=$(CONFIGURE_FHS_INSTALL_LIBDIR)
 FHS_DB_DIR=$(FHS_LIB_DIR)sope-$(SOPE_MAJOR_VERSION).$(SOPE_MINOR_VERSION)/dbadaptors/
 
 fhs-db-dirs ::