kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Upgrade the CloudABI toolchain and utilities.

Browse source 
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
This commit is contained in:
Ed Schouten 2015-08-09 11:42:05 +00:00
parent f575dbf44e
commit ac0f2013b4
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=393779
15 changed files with 56 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
devel/cloudabi-cloudlibc/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= cloudlibc
PORTVERSION= 0.3
PORTVERSION= 0.4
CATEGORIES= devel
MASTER_SITES= https://nuxi.nl/distfiles/cloudlibc/
PKGNAMEPREFIX= cloudabi-

4
devel/cloudabi-cloudlibc/distinfo
View file

@ -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

1
devel/cloudabi-cloudlibc/pkg-plist
View file

@ -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

13
devel/cloudabi-compiler-rt/Makefile
View file

@ -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>

2
devel/cloudabi-compiler-rt/distinfo
View file

@ -1,2 +0,0 @@
SHA256 (compiler-rt-0.242897.tar.xz) = db856e9c700b854e96ac76768aefb302ab03be49d158d2d34efcb2c984f9af68
SIZE (compiler-rt-0.242897.tar.xz) = 1166932

19
devel/cloudabi-libc++/Makefile
View file

@ -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>

18
devel/cloudabi-libc++/Makefile.common Normal file
View file

@ -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

12
devel/cloudabi-libc++/distinfo
View file

@ -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

1
devel/cloudabi-libc++/pkg-plist
View file

@ -54,7 +54,6 @@ x86_64-unknown-cloudabi/include/c++/v1/experimental/__config
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

20
devel/cloudabi-libc++abi/Makefile
View file

@ -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>

4
devel/cloudabi-libc++abi/distinfo
View file

@ -1,4 +0,0 @@
SHA256 (libc++abi-0.242897.tar.xz) = f8a6502e5c2601fd1fad62ccb4b63639e21161bfe905d9b081628ce40baa3550
SIZE (libc++abi-0.242897.tar.xz) = 506740
SHA256 (libunwind-0.242897.tar.xz) = 943882e8122c02ca852a989e3a496ad945228ab9102eb6d6f266cae0b50c11a2
SIZE (libunwind-0.242897.tar.xz) = 59348

21
devel/cloudabi-libunwind/Makefile
View file

@ -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>

4
devel/cloudabi-libunwind/distinfo
View file

@ -1,4 +0,0 @@
SHA256 (libc++abi-0.242897.tar.xz) = f8a6502e5c2601fd1fad62ccb4b63639e21161bfe905d9b081628ce40baa3550
SIZE (libc++abi-0.242897.tar.xz) = 506740
SHA256 (libunwind-0.242897.tar.xz) = 943882e8122c02ca852a989e3a496ad945228ab9102eb6d6f266cae0b50c11a2
SIZE (libunwind-0.242897.tar.xz) = 59348

2
sysutils/cloudabi-utils/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= cloudabi-utils
PORTVERSION= 0.3
PORTVERSION= 0.4
CATEGORIES= sysutils
MASTER_SITES= https://nuxi.nl/distfiles/cloudabi-utils/

4
sysutils/cloudabi-utils/distinfo
View file

@ -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