Date: Sun, 9 Aug 2015 11:42:06 +0000 (UTC) From: Ed Schouten <ed@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r393779 - in head: devel/cloudabi-cloudlibc devel/cloudabi-compiler-rt devel/cloudabi-libc++ devel/cloudabi-libc++abi devel/cloudabi-libunwind sysutils/cloudabi-utils Message-ID: <201508091142.t79Bg6wB094883@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ed (src committer) Date: Sun Aug 9 11:42:05 2015 New Revision: 393779 URL: https://svnweb.freebsd.org/changeset/ports/393779 Log: Upgrade the CloudABI toolchain and utilities. A new version of cloudlibc and cloudabi-utils has been released, to catch up with ABI changes (due to the import into FreeBSD HEAD). Bump these ports up to v0.4. While there, upgrade the LLVM packages. It looks like the LLVM project is finally releasing tarballs itself, meaning we can use those instead of requiring me to host them myself. Update the ports to use a common Makefile (cloudabi-libc++/Makefile.common) to set the PORTVERSION, MASTER_SITES, etc. Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D3332 Added: head/devel/cloudabi-libc++/Makefile.common (contents, props changed) Deleted: head/devel/cloudabi-compiler-rt/distinfo head/devel/cloudabi-libc++abi/distinfo head/devel/cloudabi-libunwind/distinfo Modified: head/devel/cloudabi-cloudlibc/Makefile head/devel/cloudabi-cloudlibc/distinfo head/devel/cloudabi-cloudlibc/pkg-plist head/devel/cloudabi-compiler-rt/Makefile head/devel/cloudabi-libc++/Makefile head/devel/cloudabi-libc++/distinfo head/devel/cloudabi-libc++/pkg-plist head/devel/cloudabi-libc++abi/Makefile head/devel/cloudabi-libunwind/Makefile head/sysutils/cloudabi-utils/Makefile head/sysutils/cloudabi-utils/distinfo Modified: head/devel/cloudabi-cloudlibc/Makefile ============================================================================== --- head/devel/cloudabi-cloudlibc/Makefile Sun Aug 9 11:41:56 2015 (r393778) +++ head/devel/cloudabi-cloudlibc/Makefile Sun Aug 9 11:42:05 2015 (r393779) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= cloudlibc -PORTVERSION= 0.3 +PORTVERSION= 0.4 CATEGORIES= devel MASTER_SITES= https://nuxi.nl/distfiles/cloudlibc/ PKGNAMEPREFIX= cloudabi- Modified: head/devel/cloudabi-cloudlibc/distinfo ============================================================================== --- head/devel/cloudabi-cloudlibc/distinfo Sun Aug 9 11:41:56 2015 (r393778) +++ head/devel/cloudabi-cloudlibc/distinfo Sun Aug 9 11:42:05 2015 (r393779) @@ -1,2 +1,2 @@ -SHA256 (cloudlibc-0.3.tar.xz) = 3355c8c7c90bcfa27a2707f7ac4af6db76b9c0df1e702d5ff7e45c77e1e6e39f -SIZE (cloudlibc-0.3.tar.xz) = 631364 +SHA256 (cloudlibc-0.4.tar.xz) = ec9892519a2c1711005f7ab7cc4d7f98278ab4f3fcce0466fe57bd4e902b06b1 +SIZE (cloudlibc-0.4.tar.xz) = 633100 Modified: head/devel/cloudabi-cloudlibc/pkg-plist ============================================================================== --- head/devel/cloudabi-cloudlibc/pkg-plist Sun Aug 9 11:41:56 2015 (r393778) +++ head/devel/cloudabi-cloudlibc/pkg-plist Sun Aug 9 11:42:05 2015 (r393779) @@ -1,6 +1,7 @@ x86_64-unknown-cloudabi/include/_/arch/x86-64/fenv.h x86_64-unknown-cloudabi/include/_/arch/x86-64/setjmp.h x86_64-unknown-cloudabi/include/_/cdefs.h +x86_64-unknown-cloudabi/include/_/endian.h x86_64-unknown-cloudabi/include/_/limits.h x86_64-unknown-cloudabi/include/_/struct/in_addr.h x86_64-unknown-cloudabi/include/_/struct/iovec.h Modified: head/devel/cloudabi-compiler-rt/Makefile ============================================================================== --- head/devel/cloudabi-compiler-rt/Makefile Sun Aug 9 11:41:56 2015 (r393778) +++ head/devel/cloudabi-compiler-rt/Makefile Sun Aug 9 11:42:05 2015 (r393779) @@ -2,25 +2,16 @@ # $FreeBSD$ PORTNAME= compiler-rt -DISTVERSION= 0.242897 CATEGORIES= devel -MASTER_SITES= https://nuxi.nl/distfiles/compiler-rt/ -PKGNAMEPREFIX= cloudabi- MAINTAINER= ed@FreeBSD.org COMMENT= Compiler runtime library for CloudABI LICENSE= MIT -BUILD_DEPENDS= x86_64-unknown-cloudabi-ar:${PORTSDIR}/devel/cloudabi-binutils \ - x86_64-unknown-cloudabi-cc:${PORTSDIR}/lang/cloudabi-clang \ - ${LOCALBASE}/x86_64-unknown-cloudabi/lib/libc.a:${PORTSDIR}/devel/cloudabi-cloudlibc - -USES= tar:xz - PLIST_FILES= x86_64-unknown-cloudabi/lib/libcompiler_rt.a -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/lib/builtins +WRKSRC= ${WRKDIR}/${DISTNAME}/lib/builtins # Do not use the CMake build rules provided by compiler-rt. The CMake build # rules shipped with compiler-rt depend both on a standard C++ library and a @@ -69,4 +60,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/libcompiler_rt.a \ ${STAGEDIR}${PREFIX}/x86_64-unknown-cloudabi/lib/ +.include "${.CURDIR}/../cloudabi-libc++/Makefile.common" + .include <bsd.port.mk> Modified: head/devel/cloudabi-libc++/Makefile ============================================================================== --- head/devel/cloudabi-libc++/Makefile Sun Aug 9 11:41:56 2015 (r393778) +++ head/devel/cloudabi-libc++/Makefile Sun Aug 9 11:42:05 2015 (r393779) @@ -2,25 +2,16 @@ # $FreeBSD$ PORTNAME= libc++ -PORTVERSION= 0.242897 CATEGORIES= devel -MASTER_SITES= https://nuxi.nl/distfiles/libc++/:libcxx \ - https://nuxi.nl/distfiles/libc++abi/:libcxxabi -PKGNAMEPREFIX= cloudabi- -DISTFILES= libc++-${PORTVERSION}${EXTRACT_SUFX}:libcxx \ - libc++abi-${PORTVERSION}${EXTRACT_SUFX}:libcxxabi +DISTNAME= libcxx-${DISTVERSION}.src +DISTFILES= libcxx-${DISTVERSION}.src${EXTRACT_SUFX} \ + libcxxabi-${DISTVERSION}.src${EXTRACT_SUFX} MAINTAINER= ed@FreeBSD.org COMMENT= C++ standard template library for CloudABI LICENSE= MIT -BUILD_DEPENDS= x86_64-unknown-cloudabi-ar:${PORTSDIR}/devel/cloudabi-binutils \ - x86_64-unknown-cloudabi-c++:${PORTSDIR}/lang/cloudabi-clang \ - ${LOCALBASE}/x86_64-unknown-cloudabi/lib/libc.a:${PORTSDIR}/devel/cloudabi-cloudlibc - -USES= tar:xz - SRCFILES= algorithm bind chrono condition_variable debug exception \ future hash ios iostream locale memory mutex new optional \ random regex shared_mutex stdexcept string strstream \ @@ -30,7 +21,7 @@ do-build: .for f in ${SRCFILES} ${LOCALBASE}/bin/x86_64-unknown-cloudabi-c++ \ -g -O2 -nostdinc++ -std=c++11 -I${WRKSRC}/include \ - -I${WRKDIR}/libc++abi-${PORTVERSION}/include \ + -I${WRKDIR}/libcxxabi-${DISTVERSION}.src/include \ -D_LIBCPP_BUILD_STATIC -DLIBCXX_BUILDING_LIBCXXABI \ -c -o ${WRKSRC}/$f.o ${WRKSRC}/src/$f.cpp .endfor @@ -45,4 +36,6 @@ do-install: @${CP} -r ${WRKSRC}/include \ ${STAGEDIR}${PREFIX}/x86_64-unknown-cloudabi/include/c++/v1 +.include "${.CURDIR}/Makefile.common" + .include <bsd.port.mk> Added: head/devel/cloudabi-libc++/Makefile.common ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/cloudabi-libc++/Makefile.common Sun Aug 9 11:42:05 2015 (r393779) @@ -0,0 +1,18 @@ +# $FreeBSD$ + +DISTVERSION= 3.7.0rc1 +MASTER_SITES= http://llvm.org/${PRE_}releases/${LLVM_RELEASE}/${RCDIR}/ +PKGNAMEPREFIX= cloudabi- +DISTNAME?= ${PORTNAME}-${DISTVERSION}.src +DISTINFO_FILE= ${.CURDIR}/../cloudabi-libc++/distinfo + +BUILD_DEPENDS+= x86_64-unknown-cloudabi-ar:${PORTSDIR}/devel/cloudabi-binutils \ + x86_64-unknown-cloudabi-c++:${PORTSDIR}/lang/cloudabi-clang \ + ${LOCALBASE}/x86_64-unknown-cloudabi/lib/libc.a:${PORTSDIR}/devel/cloudabi-cloudlibc + +LLVM_RELEASE= ${DISTVERSION:C/rc.*//} +RCDIR= ${DISTVERSION:S/${LLVM_RELEASE}//:C|(rc.*)|\1/|} +PRE_= ${DISTVERSION:C/.*rc.*/pre-/:N*[0-9]*} +LLVM_SUFFIX= ${DISTVERSION:R:S/.//} + +USES= tar:xz Modified: head/devel/cloudabi-libc++/distinfo ============================================================================== --- head/devel/cloudabi-libc++/distinfo Sun Aug 9 11:41:56 2015 (r393778) +++ head/devel/cloudabi-libc++/distinfo Sun Aug 9 11:42:05 2015 (r393779) @@ -1,4 +1,8 @@ -SHA256 (libc++-0.242897.tar.xz) = 74cb39fe8972bd4a8cc993719e1f3e18ff0fcef1deb61289bd9e1ad0270d48fb -SIZE (libc++-0.242897.tar.xz) = 966600 -SHA256 (libc++abi-0.242897.tar.xz) = f8a6502e5c2601fd1fad62ccb4b63639e21161bfe905d9b081628ce40baa3550 -SIZE (libc++abi-0.242897.tar.xz) = 506740 +SHA256 (compiler-rt-3.7.0rc1.src.tar.xz) = bafe3216bee62051ceed91d7eaaccd85f07b1a20e55c8adcfd8d7eea8d7bf211 +SIZE (compiler-rt-3.7.0rc1.src.tar.xz) = 1191260 +SHA256 (libcxx-3.7.0rc1.src.tar.xz) = 9207bb09c83fe8ab6262861f5e5294243763917635cc73579ea333efcf72e686 +SIZE (libcxx-3.7.0rc1.src.tar.xz) = 996500 +SHA256 (libcxxabi-3.7.0rc1.src.tar.xz) = db9bb2f2f71b3b46b91836541f3f55be4a53d977543ff64c2aefc9232d8c17ea +SIZE (libcxxabi-3.7.0rc1.src.tar.xz) = 507276 +SHA256 (libunwind-3.7.0rc1.src.tar.xz) = 2d52487c3fc4dc2968bb1295d2da541fe667c8e044be0fc1e661f0e49fd01247 +SIZE (libunwind-3.7.0rc1.src.tar.xz) = 59328 Modified: head/devel/cloudabi-libc++/pkg-plist ============================================================================== --- head/devel/cloudabi-libc++/pkg-plist Sun Aug 9 11:41:56 2015 (r393778) +++ head/devel/cloudabi-libc++/pkg-plist Sun Aug 9 11:42:05 2015 (r393779) @@ -54,7 +54,6 @@ x86_64-unknown-cloudabi/include/c++/v1/e x86_64-unknown-cloudabi/include/c++/v1/experimental/algorithm x86_64-unknown-cloudabi/include/c++/v1/experimental/chrono x86_64-unknown-cloudabi/include/c++/v1/experimental/dynarray -x86_64-unknown-cloudabi/include/c++/v1/experimental/functional x86_64-unknown-cloudabi/include/c++/v1/experimental/optional x86_64-unknown-cloudabi/include/c++/v1/experimental/ratio x86_64-unknown-cloudabi/include/c++/v1/experimental/string_view Modified: head/devel/cloudabi-libc++abi/Makefile ============================================================================== --- head/devel/cloudabi-libc++abi/Makefile Sun Aug 9 11:41:56 2015 (r393778) +++ head/devel/cloudabi-libc++abi/Makefile Sun Aug 9 11:42:05 2015 (r393779) @@ -2,25 +2,17 @@ # $FreeBSD$ PORTNAME= libc++abi -PORTVERSION= 0.242897 CATEGORIES= devel -MASTER_SITES= https://nuxi.nl/distfiles/libc++abi/:libcxxabi \ - https://nuxi.nl/distfiles/libunwind/:libunwind -PKGNAMEPREFIX= cloudabi- -DISTFILES= libc++abi-${PORTVERSION}${EXTRACT_SUFX}:libcxxabi \ - libunwind-${PORTVERSION}${EXTRACT_SUFX}:libunwind +DISTNAME= libcxxabi-${DISTVERSION}.src +DISTFILES= libcxxabi-${DISTVERSION}.src${EXTRACT_SUFX} \ + libunwind-${DISTVERSION}.src${EXTRACT_SUFX} MAINTAINER= ed@FreeBSD.org COMMENT= C++ standard library support for CloudABI LICENSE= MIT -BUILD_DEPENDS= x86_64-unknown-cloudabi-ar:${PORTSDIR}/devel/cloudabi-binutils \ - x86_64-unknown-cloudabi-c++:${PORTSDIR}/lang/cloudabi-clang \ - ${LOCALBASE}/x86_64-unknown-cloudabi/lib/libc.a:${PORTSDIR}/devel/cloudabi-cloudlibc \ - ${LOCALBASE}/x86_64-unknown-cloudabi/lib/libc++.a:${PORTSDIR}/devel/cloudabi-libc++ - -USES= tar:xz +BUILD_DEPENDS= ${LOCALBASE}/x86_64-unknown-cloudabi/lib/libc++.a:${PORTSDIR}/devel/cloudabi-libc++ PLIST_FILES= x86_64-unknown-cloudabi/lib/libc++abi.a @@ -34,7 +26,7 @@ do-build: .for f in ${SRCFILES} ${LOCALBASE}/bin/x86_64-unknown-cloudabi-c++ \ -O2 -std=c++11 -I${WRKSRC}/include \ - -I${WRKDIR}/libunwind-${PORTVERSION}/include \ + -I${WRKDIR}/libunwind-${DISTVERSION}.src/include \ -c -o ${WRKSRC}/$f.o ${WRKSRC}/src/$f.cpp .endfor cd ${WRKSRC}; ${LOCALBASE}/bin/x86_64-unknown-cloudabi-ar -rcs \ @@ -45,4 +37,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/libc++abi.a \ ${STAGEDIR}${PREFIX}/x86_64-unknown-cloudabi/lib/ +.include "${.CURDIR}/../cloudabi-libc++/Makefile.common" + .include <bsd.port.mk> Modified: head/devel/cloudabi-libunwind/Makefile ============================================================================== --- head/devel/cloudabi-libunwind/Makefile Sun Aug 9 11:41:56 2015 (r393778) +++ head/devel/cloudabi-libunwind/Makefile Sun Aug 9 11:42:05 2015 (r393779) @@ -2,25 +2,16 @@ # $FreeBSD$ PORTNAME= libunwind -PORTVERSION= 0.242897 CATEGORIES= devel -MASTER_SITES= https://nuxi.nl/distfiles/libc++abi/:libcxxabi \ - https://nuxi.nl/distfiles/libunwind/:libunwind -PKGNAMEPREFIX= cloudabi- -DISTFILES= libc++abi-${PORTVERSION}${EXTRACT_SUFX}:libcxxabi \ - libunwind-${PORTVERSION}${EXTRACT_SUFX}:libunwind +DISTFILES= libcxxabi-${DISTVERSION}.src${EXTRACT_SUFX} \ + libunwind-${DISTVERSION}.src${EXTRACT_SUFX} MAINTAINER= ed@FreeBSD.org -COMMENT= C++ standard library support for CloudABI +COMMENT= C++ exception handling for CloudABI LICENSE= MIT -BUILD_DEPENDS= x86_64-unknown-cloudabi-ar:${PORTSDIR}/devel/cloudabi-binutils \ - x86_64-unknown-cloudabi-c++:${PORTSDIR}/lang/cloudabi-clang \ - ${LOCALBASE}/x86_64-unknown-cloudabi/lib/libc.a:${PORTSDIR}/devel/cloudabi-cloudlibc \ - ${LOCALBASE}/x86_64-unknown-cloudabi/lib/libc++.a:${PORTSDIR}/devel/cloudabi-libc++ - -USES= tar:xz +BUILD_DEPENDS= ${LOCALBASE}/x86_64-unknown-cloudabi/lib/libc++.a:${PORTSDIR}/devel/cloudabi-libc++ PLIST_FILES= x86_64-unknown-cloudabi/lib/libunwind.a @@ -32,7 +23,7 @@ do-build: .for f in ${SRCFILES} ${LOCALBASE}/bin/x86_64-unknown-cloudabi-c++ \ -O2 -std=c++11 -I${WRKSRC}/include \ - -I${WRKDIR}/libc++abi-${PORTVERSION}/include \ + -I${WRKDIR}/libcxxabi-${DISTVERSION}.src/include \ -c -o ${WRKSRC}/$f.o ${WRKSRC}/src/$f .endfor cd ${WRKSRC}; ${LOCALBASE}/bin/x86_64-unknown-cloudabi-ar -rcs \ @@ -43,4 +34,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/libunwind.a \ ${STAGEDIR}${PREFIX}/x86_64-unknown-cloudabi/lib/ +.include "${.CURDIR}/../cloudabi-libc++/Makefile.common" + .include <bsd.port.mk> Modified: head/sysutils/cloudabi-utils/Makefile ============================================================================== --- head/sysutils/cloudabi-utils/Makefile Sun Aug 9 11:41:56 2015 (r393778) +++ head/sysutils/cloudabi-utils/Makefile Sun Aug 9 11:42:05 2015 (r393779) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= cloudabi-utils -PORTVERSION= 0.3 +PORTVERSION= 0.4 CATEGORIES= sysutils MASTER_SITES= https://nuxi.nl/distfiles/cloudabi-utils/ Modified: head/sysutils/cloudabi-utils/distinfo ============================================================================== --- head/sysutils/cloudabi-utils/distinfo Sun Aug 9 11:41:56 2015 (r393778) +++ head/sysutils/cloudabi-utils/distinfo Sun Aug 9 11:42:05 2015 (r393779) @@ -1,2 +1,2 @@ -SHA256 (cloudabi-utils-0.3.tar.xz) = fd9349387ca48291e8d2fc23841bfbf5df6d312fec7d74ae91570c6cc78e1fc4 -SIZE (cloudabi-utils-0.3.tar.xz) = 13124 +SHA256 (cloudabi-utils-0.4.tar.xz) = e9e587b6aa6ec0e9059b003ffce5cfafe767daa35ddb6d93e2f2a809e2931e96 +SIZE (cloudabi-utils-0.4.tar.xz) = 13152
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508091142.t79Bg6wB094883>