diff options
| author | antoine <antoine@FreeBSD.org> | 2014-10-18 18:13:58 +0000 |
|---|---|---|
| committer | antoine <antoine@FreeBSD.org> | 2014-10-18 18:13:58 +0000 |
| commit | 8cf598269ab1c93d66ac62fa26f5277a08389c28 (patch) | |
| tree | 4412e7df553fd6be1c75918e852a6dc5fb6bf129 | |
| parent | 28bc4469a10f0dbaf23d039d54b7462b14264067 (diff) | |
| download | FreeBSD-ports-8cf598269ab1c93d66ac62fa26f5277a08389c28.zip FreeBSD-ports-8cf598269ab1c93d66ac62fa26f5277a08389c28.tar.gz | |
Switch from clang33 to clang34 for ports using compiler:*11*, objc or
gnustep on freebsd 8.4 and 9.1
PR: ports/193555
Differential Revision: https://reviews.freebsd.org/D935
Reviewed by: bapt
Exp-run: self
| -rw-r--r-- | Mk/Uses/compiler.mk | 24 | ||||
| -rw-r--r-- | Mk/Uses/objc.mk | 8 | ||||
| -rw-r--r-- | Mk/bsd.gnustep.mk | 8 | ||||
| -rw-r--r-- | lang/libobjc2/Makefile | 6 | ||||
| -rw-r--r-- | net/belle-sip/Makefile | 7 |
5 files changed, 29 insertions, 24 deletions
diff --git a/Mk/Uses/compiler.mk b/Mk/Uses/compiler.mk index 819e86e..a5bb4cb 100644 --- a/Mk/Uses/compiler.mk +++ b/Mk/Uses/compiler.mk @@ -150,10 +150,10 @@ CC= clang CXX= clang++ CHOSEN_COMPILER_TYPE= clang .else -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang33:${PORTSDIR}/lang/clang33 -CPP= ${LOCALBASE}/bin/clang-cpp33 -CC= ${LOCALBASE}/bin/clang33 -CXX= ${LOCALBASE}/bin/clang++33 +BUILD_DEPENDS+= ${LOCALBASE}/bin/clang34:${PORTSDIR}/lang/clang34 +CPP= ${LOCALBASE}/bin/clang-cpp34 +CC= ${LOCALBASE}/bin/clang34 +CXX= ${LOCALBASE}/bin/clang++34 CHOSEN_COMPILER_TYPE= clang .if ${OSVERSION} < 900033 USE_BINUTILS= yes @@ -176,11 +176,11 @@ CC= clang CXX= clang++ CHOSEN_COMPILER_TYPE= clang .else -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang33:${PORTSDIR}/lang/clang33 +BUILD_DEPENDS+= ${LOCALBASE}/bin/clang34:${PORTSDIR}/lang/clang34 CHOSEN_COMPILER_TYPE= clang -CPP= ${LOCALBASE}/bin/clang-cpp33 -CC= ${LOCALBASE}/bin/clang33 -CXX= ${LOCALBASE}/bin/clang++33 +CPP= ${LOCALBASE}/bin/clang-cpp34 +CC= ${LOCALBASE}/bin/clang34 +CXX= ${LOCALBASE}/bin/clang++34 .if ${OSVERSION} < 900033 USE_BINUTILS= yes LDFLAGS+= -B${LOCALBASE}/bin @@ -202,11 +202,11 @@ CC= clang CXX= clang++ CHOSEN_COMPILER_TYPE= clang .else -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang33:${PORTSDIR}/lang/clang33 +BUILD_DEPENDS+= ${LOCALBASE}/bin/clang34:${PORTSDIR}/lang/clang34 CHOSEN_COMPILER_TYPE= clang -CPP= ${LOCALBASE}/bin/clang-cpp33 -CC= ${LOCALBASE}/bin/clang33 -CXX= ${LOCALBASE}/bin/clang++33 +CPP= ${LOCALBASE}/bin/clang-cpp34 +CC= ${LOCALBASE}/bin/clang34 +CXX= ${LOCALBASE}/bin/clang++34 .if ${OSVERSION} < 900033 USE_BINUTILS= yes LDFLAGS+= -B${LOCALBASE}/bin diff --git a/Mk/Uses/objc.mk b/Mk/Uses/objc.mk index c499773..e22f007 100644 --- a/Mk/Uses/objc.mk +++ b/Mk/Uses/objc.mk @@ -45,10 +45,10 @@ CC= /usr/bin/clang CPP= /usr/bin/clang-cpp CXX= /usr/bin/clang++ .else -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang33:${PORTSDIR}/lang/clang33 -CPP= ${LOCALBASE}/bin/clang-cpp33 -CC= ${LOCALBASE}/bin/clang33 -CXX= ${LOCALBASE}/bin/clang++33 +BUILD_DEPENDS+= ${LOCALBASE}/bin/clang34:${PORTSDIR}/lang/clang34 +CPP= ${LOCALBASE}/bin/clang-cpp34 +CC= ${LOCALBASE}/bin/clang34 +CXX= ${LOCALBASE}/bin/clang++34 .if ${OSVERSION} < 900033 USE_BINUTILS= yes LDFLAGS+= -B${LOCALBASE}/bin diff --git a/Mk/bsd.gnustep.mk b/Mk/bsd.gnustep.mk index 2cd64b4..ca69657 100644 --- a/Mk/bsd.gnustep.mk +++ b/Mk/bsd.gnustep.mk @@ -173,10 +173,10 @@ _CLANG= 0 .endif .if ${_CLANG} < 33 -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang33:${PORTSDIR}/lang/clang33 -CPP= ${LOCALBASE}/bin/clang-cpp33 -CC= ${LOCALBASE}/bin/clang33 -CXX= ${LOCALBASE}/bin/clang++33 +BUILD_DEPENDS+= ${LOCALBASE}/bin/clang34:${PORTSDIR}/lang/clang34 +CPP= ${LOCALBASE}/bin/clang-cpp34 +CC= ${LOCALBASE}/bin/clang34 +CXX= ${LOCALBASE}/bin/clang++34 .else CPP= /usr/bin/clang-cpp CC= /usr/bin/clang diff --git a/lang/libobjc2/Makefile b/lang/libobjc2/Makefile index 9452ff5..92a230e 100644 --- a/lang/libobjc2/Makefile +++ b/lang/libobjc2/Makefile @@ -21,9 +21,9 @@ _CLANG!= if [ -f /usr/bin/clang ] ; then /usr/bin/clang --version | head -1 | \ ${SED} -e 's/.*clang version \([0-9]\)\.\([0-9]\).*/\1\2/' ; else ${ECHO} 0 ; fi .if ${_CLANG} < 33 -BUILD_DEPENDS+= ${LOCALBASE}/bin/clang33:${PORTSDIR}/lang/clang33 -CC= ${LOCALBASE}/bin/clang33 -CXX= ${LOCALBASE}/bin/clang++33 +BUILD_DEPENDS+= ${LOCALBASE}/bin/clang34:${PORTSDIR}/lang/clang34 +CC= ${LOCALBASE}/bin/clang34 +CXX= ${LOCALBASE}/bin/clang++34 .else CC= /usr/bin/clang CXX= /usr/bin/clang++ diff --git a/net/belle-sip/Makefile b/net/belle-sip/Makefile index f491d28..de68600 100644 --- a/net/belle-sip/Makefile +++ b/net/belle-sip/Makefile @@ -38,10 +38,15 @@ POLARSSL_LIB_DEPENDS= libpolarssl.so:${PORTSDIR}/security/polarssl post-extract: @${CP} ${DISTDIR}/antlr-3.4-complete.jar ${WRKDIR}/antlr-complete.jar +.include <bsd.port.pre.mk> + post-patch: @${REINPLACE_CMD} -e 's|%%WRKDIR%%|${WRKDIR}|' -e 's|-lrt||' \ ${WRKSRC}/configure +.if ${CHOSEN_COMPILER_TYPE} == clang && (${OSVERSION} < 902512 || (${OSVERSION} >= 1000000 && ${OSVERSION} < 1000707)) + @${REINPLACE_CMD} 's, -fms-extensions,,' ${WRKSRC}/configure +.endif @${REINPLACE_CMD} -e 's|-timezone||' \ ${WRKSRC}/src/belle_sip_headers_impl.c -.include <bsd.port.mk> +.include <bsd.port.post.mk> |
