Page MenuHomeFreeBSD
Files F137428114

D935.id.diff
No OneTemporary
Actions

D935.id.diff
View Options

Index: head/Mk/Uses/compiler.mk
===================================================================
--- head/Mk/Uses/compiler.mk
+++ head/Mk/Uses/compiler.mk
@@ -150,10 +150,10 @@
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 @@
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 @@
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
Index: head/Mk/Uses/objc.mk
===================================================================
--- head/Mk/Uses/objc.mk
+++ head/Mk/Uses/objc.mk
@@ -45,10 +45,10 @@
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
Index: head/Mk/bsd.gnustep.mk
===================================================================
--- head/Mk/bsd.gnustep.mk
+++ head/Mk/bsd.gnustep.mk
@@ -173,10 +173,10 @@
.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
Index: head/lang/libobjc2/Makefile
===================================================================
--- head/lang/libobjc2/Makefile
+++ head/lang/libobjc2/Makefile
@@ -21,9 +21,9 @@
${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++
Index: head/net/belle-sip/Makefile
===================================================================
--- head/net/belle-sip/Makefile
+++ head/net/belle-sip/Makefile
@@ -38,10 +38,15 @@
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>

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 24, 9:05 AM (1 h, 50 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
26048579
Default Alt Text
D935.id.diff (4 KB)

Event Timeline