+2010-02-20 Kevin Rosenberg <kevin@rosenberg.net>
+ * Makefile.common, uffi/Makefile, db-mysql/Makefile:
+ Better support OS X Snow Leopard by building universal
+ (x86_64,i386) dylib bundles
+
2010-02-08 Kevin Rosenberg <kevin@rosenberg.net>
* Version 5.0.2
* sql/database.lisp: Fix missing slot-accessor
UNAME=$(shell uname)
UNAME_A=$(shell uname -a)
+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_DARWIN64=$(shell expr "$(DARWIN_LIBC)" : '.*x86_64.*')
OS_CYGWIN=$(shell expr "$(UNAME)" : '.*CYGWIN.*')
OS_LINUX=$(shell expr "$(UNAME)" : '.*Linux.*')
OS_LINUX64=$(shell expr "$(UNAME_A)" : '.*Linux.*x86_64.*')
object=$(base).o
shared_lib=$(base).so
shared64_lib=$(base)64.so
-
+dylib=$(base).dylib
.PHONY: all
all: $(shared_lib)
cc $(CFLAGS) -KPIC -c $(source) -o $(object)
cc -G $(object) $(LDFLAGS) -o $(shared_lib)
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
+ else
ifneq ($(OS_DARWIN),0)
- cc $(CFLAGS) -dynamic -c $(source) -o $(object)
- ld -bundle /usr/lib/bundle1.o -flat_namespace -undefined suppress -o $(base).dylib $(object)
- ld -bundle /usr/lib/bundle1.o $(LDFLAGS) -flat_namespace -undefined suppress /usr/lib/libz.dylib -o z.dylib
+ 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)
endif
endif
endif
+endif
endif
rm -f $(object)
.PHONY: distclean
distclean: clean
- rm -f $(base).dylib $(base).dylib $(base).so $(base).o
+ @rm -f $(dylib) $(shared_lib) $(shared64_lib) $(object) z.dylib
object=$(base).o
shared_lib=$(base).so
shared64_lib=$(base)64.so
+dylib=$(base).dylib
.PHONY: all
all: $(shared_lib)
cc -KPIC -c $(source) -o $(object)
cc -G $(object) -o $(shared_lib)
else
- ifneq ($(OS_DARWIN),0)
- cc -dynamic -c $(source) -o $(object)
- ld -bundle /usr/lib/bundle1.o -flat_namespace -undefined suppress -o $(base).dylib $(object)
- ld -bundle /usr/lib/bundle1.o -flat_namespace -undefined suppress /usr/lib/libz.dylib -o z.dylib
+ ifneq ($(OS_DARWIN64),0)
+ cc -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 -c $(source) -o $(object)
- ld -shared -soname=$(base) $(LDFLAGS) $(object) -o $(shared_lib)
+ ifneq ($(OS_DARWIN),0)
+ cc -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 -fPIC -DPIC -c $(source) -o $(object)
- ld -shared -soname=$(base) -lc $(object) -o $(shared64_lib)
- rm -f $(object)
- @echo "Ensure that you have multiarch i386 build tools if you want to build 32-bit library"
- -gcc -m32 -fPIC -DPIC -c $(source) -o $(object)
- -ld -melf_i386 -shared -soname=$(base) -lc $(object) -o $(shared_lib)
+ ifneq ($(OS_CYGWIN),0)
+ gcc -c $(source) -o $(object)
+ ld -shared -soname=$(base) $(LDFLAGS) $(object) -o $(shared_lib)
else
- gcc -fPIC -DPIC -c $(source) -o $(object)
- ld -shared -soname=$(base) -lc $(object) -o $(shared_lib)
+ ifneq ($(OS_LINUX64),0)
+ gcc -fPIC -DPIC -c $(source) -o $(object)
+ ld -shared -soname=$(base) -lc $(object) -o $(shared64_lib)
+ rm -f $(object)
+ @echo "Ensure that you have multiarch i386 build tools if you want to build 32-bit library"
+ -gcc -m32 -fPIC -DPIC -c $(source) -o $(object)
+ -ld -melf_i386 -shared -soname=$(base) -lc $(object) -o $(shared_lib)
+ else
+ gcc -fPIC -DPIC -c $(source) -o $(object)
+ ld -shared -soname=$(base) -lc $(object) -o $(shared_lib)
endif
endif
endif
endif
+endif
endif
rm -f $(object)
.PHONY: distclean
distclean: clean
- rm -f $(base).dylib $(base).dylib $(base).so $(base).o
+ @rm -f $(dylib) $(shared_lib) $(shared64_lib) $(object) z.dylib