Version 5.0.3: Full foreign string internationalization support

diff --git a/ChangeLog b/ChangeLog
index aef72fc84dfeb81ed5d3dd67c4bccfa7582ae204..c09321237b4908a204901ee907dffb7d2d153db6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,10 @@
 2010-02-11  Kevin Rosenberg <kevin@rosenberg.net>
 2010-02-11  Kevin Rosenberg <kevin@rosenberg.net>

+       * Version 5.0.3

        * multiple-files: Further internationalization. Change
        UFFI:CONVERT-RAW-FIELD and UFFI:CONVERT-FROM-FOREIGN-STRINGS
        invocations to use the foreign character set encoding of the
        * multiple-files: Further internationalization. Change
        UFFI:CONVERT-RAW-FIELD and UFFI:CONVERT-FROM-FOREIGN-STRINGS
        invocations to use the foreign character set encoding of the

-       database object.
+       database object. Requires UFFI v.1.8.6
+       * Makefile.common: Fix OS_DARWIN64 setting

 
 2010-02-11  Nathan Bird  <nathan@acceleration.net>
        * MSSQL: better support for fddl 'date type.
 
 2010-02-11  Nathan Bird  <nathan@acceleration.net>
        * MSSQL: better support for fddl 'date type.

diff --git a/Makefile.common b/Makefile.common
index 30be60ead65f4a9f89626ccd1e2ff1a4ef7a2e80..455f5a47061d8b4ee18ca9701764931983a60628 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -5,7 +5,11 @@ DARWIN_LIBC=$(shell file /usr/lib/libc.dylib)
 OS_AIX=$(shell expr "$(UNAME)" : '.*AIX.*')
 OS_SUNOS=$(shell expr "$(UNAME)" : '.*SunOS.*')
 OS_DARWIN=$(shell expr "$(UNAME)" : '.*Darwin.*')
 OS_AIX=$(shell expr "$(UNAME)" : '.*AIX.*')
 OS_SUNOS=$(shell expr "$(UNAME)" : '.*SunOS.*')
 OS_DARWIN=$(shell expr "$(UNAME)" : '.*Darwin.*')

-OS_DARWIN64=$(shell expr "$(DARWIN_LIBC)" : '.*x86_64.*')
+ifneq ($(OS_DARWIN),0) 
+  OS_DARWIN64=$(shell expr match "$(DARWIN_LIBC)" '.*x86_64.*')
+else
+  OS_DARWIN64=0
+endif

 OS_CYGWIN=$(shell expr "$(UNAME)" : '.*CYGWIN.*')
 OS_LINUX=$(shell expr "$(UNAME)" : '.*Linux.*')
 OS_LINUX64=$(shell expr "$(UNAME_A)" : '.*Linux.*x86_64.*')
 OS_CYGWIN=$(shell expr "$(UNAME)" : '.*CYGWIN.*')
 OS_LINUX=$(shell expr "$(UNAME)" : '.*Linux.*')
 OS_LINUX64=$(shell expr "$(UNAME_A)" : '.*Linux.*x86_64.*')

diff --git a/db-mysql/Makefile b/db-mysql/Makefile
index 9e2e2913cfcd0a78ab0c32670ae0b8a11d8f7fb2..4198ac8fcf37de153835725514d2c29affc0c6cd 100644 (file)
--- a/db-mysql/Makefile
+++ b/db-mysql/Makefile
@@ -49,30 +49,31 @@ else
     ifneq ($(OS_DARWIN64),0)
        cc $(CFLAGS) -arch x86_64 -arch i386 -bundle /usr/lib/bundle1.o -flat_namespace -undefined suppress $(source) -o $(dylib)
        cc -arch x86_64 -arch i386 -bundle /usr/lib/bundle1.o -flat_namespace -undefined suppress /usr/lib/libz.dylib -o z.dylib
     ifneq ($(OS_DARWIN64),0)
        cc $(CFLAGS) -arch x86_64 -arch i386 -bundle /usr/lib/bundle1.o -flat_namespace -undefined suppress $(source) -o $(dylib)
        cc -arch x86_64 -arch i386 -bundle /usr/lib/bundle1.o -flat_namespace -undefined suppress /usr/lib/libz.dylib -o z.dylib

+       @echo "D2:" $(OS_DARWIN64)

     else
     else

-    ifneq ($(OS_DARWIN),0)
-       cc $(CFLAGS)  -arch x86_64 -arch i386 -bundle /usr/lib/bundle1.o -flat_namespace -undefined suppress $(source) -o $(dylib)
-       cc -arch x86_64 -arch i386 -bundle /usr/lib/bundle1.o -flat_namespace -undefined suppress /usr/lib/libz.dylib -o z.dylib
-    else
-      ifneq ($(OS_CYGWIN),0)
-       gcc $(CFLAGS) -DWIN32 -c $(source) -o $(object)
-       ld -shared -soname=$(base)  $(object) $(LDFLAGS) -o $(shared_lib)
+      ifneq ($(OS_DARWIN),0)
+       cc $(CFLAGS) -arch i386 -bundle /usr/lib/bundle1.o -flat_namespace -undefined suppress $(source) -o $(dylib)
+       cc -arch i386 -bundle /usr/lib/bundle1.o -flat_namespace -undefined suppress /usr/lib/libz.dylib -o z.dylib

       else
       else

-        ifneq ($(OS_LINUX64),0)
-         gcc $(CFLAGS) -fPIC -c $(source) -o $(object)
-         ld -shared -soname=$(base) $(object) $(LDFLAGS) -o $(shared64_lib)
-         rm $(object)
-         @echo "Ensure that you have multiarch i386 build tools and libraries if you want to build 32-bit library"
-         -gcc $(CFLAGS32) -fPIC -c $(source) -o $(object)
-         -ld -shared -soname=$(base) $(object) $(LDFLAGS32) -o $(shared_lib)
+        ifneq ($(OS_CYGWIN),0)
+         gcc $(CFLAGS) -DWIN32 -c $(source) -o $(object)
+         ld -shared -soname=$(base)  $(object) $(LDFLAGS) -o $(shared_lib)

         else
         else

-         gcc $(CFLAGS) -fPIC -c $(source) -o $(object)
-         ld -shared -soname=$(base) $(object) $(LDFLAGS) -o $(shared_lib)
+          ifneq ($(OS_LINUX64),0)
+           gcc $(CFLAGS) -fPIC -c $(source) -o $(object)
+           ld -shared -soname=$(base) $(object) $(LDFLAGS) -o $(shared64_lib)
+           rm $(object)
+           @echo "Ensure that you have multiarch i386 build tools and libraries if you want to build 32-bit library"
+           -gcc $(CFLAGS32) -fPIC -c $(source) -o $(object)
+           -ld -shared -soname=$(base) $(object) $(LDFLAGS32) -o $(shared_lib)
+          else
+           gcc $(CFLAGS) -fPIC -c $(source) -o $(object)
+           ld -shared -soname=$(base) $(object) $(LDFLAGS) -o $(shared_lib)
+          endif

         endif
       endif
     endif
   endif
         endif
       endif
     endif
   endif

-endif

 endif
        rm -f $(object)
 
 endif
        rm -f $(object)
 

diff --git a/debian/changelog b/debian/changelog
index 846ec3282b0490985f734310c3ac482ffc53a966..23399bcdf12ad8556227a7b163af1becaacec97e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-sql (5.0.3-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Thu, 11 Feb 2010 15:18:04 -0700
+

 cl-sql (5.0.2-1) unstable; urgency=low
 
   * New upstream
 cl-sql (5.0.2-1) unstable; urgency=low
 
   * New upstream