Index: head/lang/v8/Makefile =================================================================== --- head/lang/v8/Makefile (revision 342487) +++ head/lang/v8/Makefile (revision 342488) @@ -1,56 +1,56 @@ # Created by: siasia # $FreeBSD$ PORTNAME= v8 PORTVERSION= 3.18.5 CATEGORIES= lang MASTER_SITES= LOCAL/vanilla MAINTAINER= vanilla@FreeBSD.org COMMENT= Google\'s open source JavaScript engine BUILD_DEPENDS= python:${PORTSDIR}/lang/python LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo -CONFLICTS= v8-devel-* +CONFLICTS= v8-3.24.* -USES= gmake +USES= gmake compiler USE_XZ= yes USE_PYTHON= 2 USE_LDCONFIG= yes ALL_TARGET= native MAKE_ARGS= library=shared +MAKE_ENV+= CC.host=${CC} CXX.host=${CXX} LINK.host=${CXX} LINK.target=${CXX} .include -.if ${CC:T:Mclang} == "clang" || ${CXX:T:Mclang++} == "clang++" || ${OSVERSION} >= 1000024 -_CLANG!= clang --version | ${HEAD} -1 | ${SED} -e 's/.*clang version \([0-9]\)\.\([0-9]\).*/\1\2/' +.if ${COMPILER_TYPE} == clang MAKE_ENV+= LINK=clang++ CFLAGS+= -Wno-unused-private-field -.if ${_CLANG} >= 33 +.if ${COMPILER_VERSION} >= 33 CFLAGS+= -Wno-nested-anon-types -Wno-unused-function .endif .else MAKE_ARGS+= strictaliasing=off USE_GCC= any .endif ONLY_FOR_ARCHS= i386 amd64 post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ ${WRKSRC}/build/common.gypi ${WRKSRC}/tools/gyp/v8.gyp @${REINPLACE_CMD} -e '1 s|${SETENV} python|&2|' ${WRKSRC}/build/gyp/gyp do-install: ${INSTALL_PROGRAM} ${WRKSRC}/out/native/d8 ${STAGEDIR}/${PREFIX}/bin/d8 ${INSTALL_LIB} -m 755 ${WRKSRC}/out/native/lib.target/libv8.so ${STAGEDIR}/${PREFIX}/lib/libv8.so.1 ${LN} -sf ${PREFIX}/lib/libv8.so.1 ${STAGEDIR}/${PREFIX}/lib/libv8.so ${INSTALL_DATA} ${WRKSRC}/include/v8.h ${STAGEDIR}/${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/include/v8-debug.h ${STAGEDIR}/${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/include/v8-preparser.h ${STAGEDIR}/${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/include/v8-profiler.h ${STAGEDIR}/${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/include/v8-testing.h ${STAGEDIR}/${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/include/v8stdint.h ${STAGEDIR}/${PREFIX}/include .include Index: head/lang/v8-devel/Makefile =================================================================== --- head/lang/v8-devel/Makefile (revision 342487) +++ head/lang/v8-devel/Makefile (revision 342488) @@ -1,60 +1,59 @@ # Created by: siasia # $FreeBSD$ PORTNAME= v8 -PORTVERSION= 3.24.7 +PORTVERSION= 3.24.30 CATEGORIES= lang MASTER_SITES= LOCAL/vanilla PKGNAMESUFFIX= -devel MAINTAINER= vanilla@FreeBSD.org COMMENT= Google\'s open source JavaScript engine BUILD_DEPENDS= python:${PORTSDIR}/lang/python LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \ libicui18n.so:${PORTSDIR}/devel/icu CONFLICTS= v8-3.19.* -USES= gmake shebangfix +USES= gmake shebangfix compiler SHEBANG_LANG= sh SHEBANG_FILES= ${WRKSRC}/build/gyp/gyp USE_XZ= yes USE_PYTHON= 2 USE_LDCONFIG= yes ALL_TARGET= native MAKE_ARGS= library=shared use_system_icu=on MAKE_ENV+= CC.host=${CC} CXX.host=${CXX} LINK.host=${CXX} LINK.target=${CXX} sh_OLD_CMD= /bin/bash sh_CMD= ${SH} .include -.if ${CC:T:Mclang} == "clang" || ${CXX:T:Mclang++} == "clang++" || ${OSVERSION} >= 1000024 -_CLANG!= ${CC} --version | ${HEAD} -1 | ${SED} -e 's/.*clang version \([0-9]\)\.\([0-9]\).*/\1\2/' +.if ${COMPILER_TYPE} == clang MAKE_ENV+= LINK=clang++ AR=/usr/bin/ar MAKE_ARGS+= clang=on CFLAGS+= -Wno-unused-private-field -Wno-unused-variable -.if ${_CLANG} >= 33 +.if ${COMPILER_VERSION} >= 33 CFLAGS+= -Wno-nested-anon-types -Wno-unused-function .endif .else MAKE_ARGS+= strictaliasing=off USE_GCC= any .endif ONLY_FOR_ARCHS= i386 amd64 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/out/native/d8 ${STAGEDIR}${PREFIX}/bin/d8 ${INSTALL_LIB} -m 755 ${WRKSRC}/out/native/lib.target/libv8.so ${STAGEDIR}${PREFIX}/lib/libv8.so.1 ${LN} -sf ${PREFIX}/lib/libv8.so.1 ${STAGEDIR}${PREFIX}/lib/libv8.so ${INSTALL_DATA} ${WRKSRC}/include/v8.h ${STAGEDIR}${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/include/v8-debug.h ${STAGEDIR}${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/include/v8-platform.h ${STAGEDIR}${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/include/v8-profiler.h ${STAGEDIR}${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/include/v8-testing.h ${STAGEDIR}${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/include/v8config.h ${STAGEDIR}${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/include/v8stdint.h ${STAGEDIR}${PREFIX}/include .include Index: head/lang/v8-devel/distinfo =================================================================== --- head/lang/v8-devel/distinfo (revision 342487) +++ head/lang/v8-devel/distinfo (revision 342488) @@ -1,2 +1,2 @@ -SHA256 (v8-3.24.7.tar.xz) = 4007211042d1e34d88af30025aa9536d2556da0f3bb744e5290e33698939086b -SIZE (v8-3.24.7.tar.xz) = 35186840 +SHA256 (v8-3.24.30.tar.xz) = 9178700254290e38eb7085e44d879ffbc7871dd1eeacebb7c08cb1c49924e22a +SIZE (v8-3.24.30.tar.xz) = 34185612 Index: head/lang/v8-devel/files/patch-Makefile =================================================================== --- head/lang/v8-devel/files/patch-Makefile (revision 342487) +++ head/lang/v8-devel/files/patch-Makefile (revision 342488) @@ -1,26 +1,46 @@ ---- Makefile.orig 2013-10-24 23:26:16.000000000 +0800 -+++ Makefile 2013-10-25 10:19:26.000000000 +0800 +--- Makefile.orig 2014-02-04 10:07:31.000000000 +0800 ++++ Makefile 2014-02-04 17:01:29.349287737 +0800 @@ -52,6 +52,14 @@ endif ifdef console GYPFLAGS += -Dconsole=$(console) endif +# clang=on +ifeq ($(clang), on) + GYPFLAGS += -Dclang=1 +endif +# use_system_icu=on +ifeq ($(use_system_icu), on) + GYPFLAGS += -Duse_system_icu=1 +endif # disassembler=on ifeq ($(disassembler), on) GYPFLAGS += -Dv8_enable_disassembler=1 -@@ -223,7 +231,7 @@ NACL_ARCHES = nacl_ia32 nacl_x64 +@@ -233,7 +241,7 @@ NACL_ARCHES = nacl_ia32 nacl_x64 # List of files that trigger Makefile regeneration: GYPFILES = build/all.gyp build/features.gypi build/standalone.gypi \ build/toolchain.gypi samples/samples.gyp src/d8.gyp \ - test/cctest/cctest.gyp tools/gyp/v8.gyp + tools/gyp/v8.gyp # If vtunejit=on, the v8vtune.gyp will be appended. ifeq ($(vtunejit), on) +@@ -386,8 +394,7 @@ clean: $(addsuffix .clean, $(ARCHES) $(A + # GYP file generation targets. + OUT_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(BUILDS)) + $(OUT_MAKEFILES): $(GYPFILES) $(ENVFILE) +- PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(PYTHONPATH)" \ +- PYTHONPATH="$(shell pwd)/build/gyp/pylib:$(PYTHONPATH)" \ ++ PYTHONPATH="$(shell pwd)/build/gyp/pylib:$(shell pwd)/tools/generate_shim_headers:$(PYTHONPATH)" \ + GYP_GENERATORS=make \ + build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \ + -Ibuild/standalone.gypi --depth=. \ +@@ -396,8 +403,7 @@ $(OUT_MAKEFILES): $(GYPFILES) $(ENVFILE) + -S$(suffix $(basename $@))$(suffix $@) $(GYPFLAGS) + + $(OUTDIR)/Makefile.native: $(GYPFILES) $(ENVFILE) +- PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(PYTHONPATH)" \ +- PYTHONPATH="$(shell pwd)/build/gyp/pylib:$(PYTHONPATH)" \ ++ PYTHONPATH="$(shell pwd)/build/gyp/pylib:$(shell pwd)/tools/generate_shim_headers:$(PYTHONPATH)" \ + GYP_GENERATORS=make \ + build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \ + -Ibuild/standalone.gypi --depth=. -S.native $(GYPFLAGS)