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
- 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.
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.*')
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
- 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
- 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
- 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
rm -f $(object)