diff options
author | Dirk Meyer <dinoex@FreeBSD.org> | 2011-12-13 18:05:25 +0000 |
---|---|---|
committer | Dirk Meyer <dinoex@FreeBSD.org> | 2011-12-13 18:05:25 +0000 |
commit | 89f151ea473c42f8b28b589cd73c5f7b49615f96 (patch) | |
tree | 1de993613721f6f56c2bb4b51caa85b9ca84a71d /lang/libobjc2 | |
parent | - Update WWW (diff) |
- update to 1.6
- fix build with clang
Notes
Notes:
svn path=/head/; revision=287312
Diffstat (limited to 'lang/libobjc2')
-rw-r--r-- | lang/libobjc2/Makefile | 8 | ||||
-rw-r--r-- | lang/libobjc2/distinfo | 4 | ||||
-rw-r--r-- | lang/libobjc2/files/patch-Makefile | 91 |
3 files changed, 54 insertions, 49 deletions
diff --git a/lang/libobjc2/Makefile b/lang/libobjc2/Makefile index b39349f67722..e9b16695c68b 100644 --- a/lang/libobjc2/Makefile +++ b/lang/libobjc2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libobjc2 -PORTVERSION= 1.5.1 +PORTVERSION= 1.6 CATEGORIES= lang devel gnustep MASTER_SITES= http://download.gna.org/gnustep/ @@ -24,7 +24,7 @@ PLIST_SUB= SHLIB=${SHLIB_VERSION} OPTIONS= NSOBJECT_ROOT "Root class is NSObject not Object" On \ LIBDISPATCH "Build with libdispatch from ports" Off -SHLIB_VERSION?= 15 +SHLIB_VERSION?= 16 .include <bsd.port.options.mk> @@ -43,6 +43,9 @@ CPPFLAGS+= -DGNUSTEP .include <bsd.port.pre.mk> .if ${OSVERSION} >= 900000 +.if defined(CC) && ${CC} == "clang" +# all done +.else V:= 42 _GCC_BUILD_DEPENDS:= gcc${V} _GCC_PORT_DEPENDS:= gcc${V} @@ -54,6 +57,7 @@ LDFLAGS+= -L${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS} BUILD_DEPENDS+= ${_GCC_PORT_DEPENDS}:${PORTSDIR}/lang/${_GCC_BUILD_DEPENDS} RUN_DEPENDS+= ${_GCC_PORT_DEPENDS}:${PORTSDIR}/lang/${_GCC_BUILD_DEPENDS} .endif +.endif .if (${ARCH} == i386) || (${ARCH} == i486) CFLAGS+= -march=i586 diff --git a/lang/libobjc2/distinfo b/lang/libobjc2/distinfo index 39a0ae102dd8..7b7b19e37bd3 100644 --- a/lang/libobjc2/distinfo +++ b/lang/libobjc2/distinfo @@ -1,2 +1,2 @@ -SHA256 (libobjc2-1.5.1.tar.bz2) = ca4b7c55f33cf7ffb015b24134b77470c050411399abe179aa46c41b6d17f61e -SIZE (libobjc2-1.5.1.tar.bz2) = 101262 +SHA256 (libobjc2-1.6.tar.bz2) = cad4556d612e871f60ae19531474045075fab3ffab055f76140e3fed30a0c51d +SIZE (libobjc2-1.6.tar.bz2) = 114767 diff --git a/lang/libobjc2/files/patch-Makefile b/lang/libobjc2/files/patch-Makefile index c8bcd01ecb12..a166e23fe443 100644 --- a/lang/libobjc2/files/patch-Makefile +++ b/lang/libobjc2/files/patch-Makefile @@ -1,58 +1,59 @@ ---- Makefile.orig 2011-07-10 19:20:10.000000000 +0200 -+++ Makefile 2011-10-19 19:41:37.000000000 +0200 -@@ -5,7 +5,7 @@ - MAJOR_VERSION = 1 - MINOR_VERSION = 5 +--- Makefile.orig 2011-11-23 13:43:16.000000000 +0100 ++++ Makefile 2011-12-10 08:20:33.000000000 +0100 +@@ -5,13 +5,13 @@ + MAJOR_VERSION = 4 + MINOR_VERSION = 6 SUBMINOR_VERSION = 0 -VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION) +VERSION = $(SHLIB_VERSION) - CFLAGS += -std=gnu99 -fPIC - CXXFLAGS += -fPIC -@@ -50,25 +50,29 @@ + LIBOBJCLIBNAME=objc + LIBOBJC=libobjc + LIBOBJCXX=libobjcxx + +-SILENT=@ ++SILENT= + + CFLAGS += -std=gnu99 -fPIC -fexceptions + CXXFLAGS += -fPIC -fexceptions +@@ -62,21 +62,24 @@ selector_table.o\ sendmsg2.o\ statics_loader.o\ - toydispatch.o + -+ +.if !defined(WITHOUT_TOYDISPATCH) +OBJECTS+= toydispatch.o +.endif - all: libobjc.a libobjcxx.so.$(VERSION) - - libobjcxx.so.$(VERSION): libobjc.so.$(VERSION) $(OBJCXX_OBJECTS) - @echo Linking shared Objective-C++ runtime library... -- @$(CXX) -Wl,-shared -o $@ $(OBJCXX_OBJECTS) -lobjc -+ $(LD) $(LDFLAGS) -shared -o $@ $(OBJCXX_OBJECTS) -lobjc - - libobjc.so.$(VERSION): $(OBJECTS) - @echo Linking shared Objective-C runtime library... -- @ld -shared -o $@ $(OBJECTS) -+ $(LD) $(LDFLAGS) -shared -o $@ $(OBJECTS) - - libobjc.a: $(OBJECTS) - @echo Linking static Objective-C runtime library... -- @ld -r -s -o $@ $(OBJECTS) -+ $(LD) $(LDFLAGS) -r -s -o $@ $(OBJECTS) - - .cc.o: - @echo Compiling `basename $<`... -- @$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@ -+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@ - - .c.o: - @echo Compiling `basename $<`... -@@ -86,11 +90,7 @@ - @install -m 444 libobjc.a $(LIB_DIR) - @echo Creating symbolic links... - @ln -sf $(LIB_DIR)/libobjc.so.$(VERSION) $(LIB_DIR)/libobjc.so -- @ln -sf $(LIB_DIR)/libobjc.so.$(VERSION) $(LIB_DIR)/libobjc.so.$(MAJOR_VERSION) -- @ln -sf $(LIB_DIR)/libobjc.so.$(VERSION) $(LIB_DIR)/libobjc.so.$(MAJOR_VERSION).$(MINOR_VERSION) - @ln -sf $(LIB_DIR)/libobjcxx.so.$(VERSION) $(LIB_DIR)/libobjcxx.so -- @ln -sf $(LIB_DIR)/libobjcxx.so.$(VERSION) $(LIB_DIR)/libobjcxx.so.$(MAJOR_VERSION) -- @ln -sf $(LIB_DIR)/libobjcxx.so.$(VERSION) $(LIB_DIR)/libobjcxx.so.$(MAJOR_VERSION).$(MINOR_VERSION) - @echo Installing headers... - @install -d $(HEADER_DIR)/objc - @install -m 444 objc/*.h $(HEADER_DIR)/objc + all: $(LIBOBJC).a $(LIBOBJCXX).so.$(VERSION) + + $(LIBOBJCXX).so.$(VERSION): $(LIBOBJC).so.$(VERSION) $(OBJCXX_OBJECTS) + $(SILENT)echo Linking shared Objective-C++ runtime library... +- $(SILENT)$(CXX) -shared -o $@ $(OBJCXX_OBJECTS) ++ $(SILENT)$(LD) $(LDFLAGS) -shared -o $@ $(OBJCXX_OBJECTS) + + $(LIBOBJC).so.$(VERSION): $(OBJECTS) + $(SILENT)echo Linking shared Objective-C runtime library... +- $(SILENT)$(CC) -shared -rdynamic -o $@ $(OBJECTS) ++ $(SILENT)$(LD) $(LDFLAGS) -shared -o $@ $(OBJECTS) + + $(LIBOBJC).a: $(OBJECTS) + $(SILENT)echo Linking static Objective-C runtime library... +- $(SILENT)ld -r -s -o $@ $(OBJECTS) ++ $(SILENT)$(LD) $(LDFLAGS) -r -s -o $@ $(OBJECTS) + + .cc.o: Makefile + $(SILENT)echo Compiling `basename $<`... +@@ -108,11 +111,7 @@ + fi + $(SILENT)echo Creating symbolic links... + $(SILENT)ln -sf $(LIB_DIR)/$(LIBOBJC).so.$(VERSION) $(LIB_DIR)/$(LIBOBJC).so +- $(SILENT)ln -sf $(LIB_DIR)/$(LIBOBJC).so.$(VERSION) $(LIB_DIR)/$(LIBOBJC).so.$(MAJOR_VERSION) +- $(SILENT)ln -sf $(LIB_DIR)/$(LIBOBJC).so.$(VERSION) $(LIB_DIR)/$(LIBOBJC).so.$(MAJOR_VERSION).$(MINOR_VERSION) + $(SILENT)ln -sf $(LIB_DIR)/$(LIBOBJCXX).so.$(VERSION) $(LIB_DIR)/$(LIBOBJCXX).so +- $(SILENT)ln -sf $(LIB_DIR)/$(LIBOBJCXX).so.$(VERSION) $(LIB_DIR)/$(LIBOBJCXX).so.$(MAJOR_VERSION) +- $(SILENT)ln -sf $(LIB_DIR)/$(LIBOBJCXX).so.$(VERSION) $(LIB_DIR)/$(LIBOBJCXX).so.$(MAJOR_VERSION).$(MINOR_VERSION) + $(SILENT)echo Installing headers... + $(SILENT)install -d $(HEADER_DIR)/objc + $(SILENT)install -m 444 objc/*.h $(HEADER_DIR)/objc |