Date: Mon, 21 Mar 2016 21:11:11 +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: r411619 - in head: . devel/cloudabi-toolchain devel/cloudabi-toolchain/files lang lang/cloudabi-clang Message-ID: <201603212111.u2LLBBii024680@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ed (src committer) Date: Mon Mar 21 21:11:11 2016 New Revision: 411619 URL: https://svnweb.freebsd.org/changeset/ports/411619 Log: Merge cloudabi-clang with cloudabi-toolchain and install more useful tools. Now that the previous changes to the cloudabi-clang package brought in more LLVM tools, the package actually became a misnomer. Most of the tools that it installed are not part of Clang, but of LLVM instead. My plans of extending it to also install wrappers around man(1) and pkgconf(1) would make the naming even worse. The only reason that the cloudabi-clang package was created in the first place, was because we still had some of the core CloudABI libraries part of FreeBSD Ports. Now that these libraries are part of their own package collection, it makes more sense to squash this package together with cloudabi-toolchain. The nice thing about installing a wrapper around pkgconf(1) named ${gnu_triple}-pkg-config is that Autoconf now automatically picks it up. Running ./configure --host=${gnu_triple} is enough to make it detect the cross compiled libraries it depends on. Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D5697 Added: head/devel/cloudabi-toolchain/files/ head/devel/cloudabi-toolchain/files/man.in (contents, props changed) head/devel/cloudabi-toolchain/files/pkg-config.in (contents, props changed) Deleted: head/lang/cloudabi-clang/ Modified: head/MOVED head/devel/cloudabi-toolchain/Makefile head/lang/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Mon Mar 21 20:41:22 2016 (r411618) +++ head/MOVED Mon Mar 21 21:11:11 2016 (r411619) @@ -8238,3 +8238,4 @@ www/eaccelerator||2016-03-20|Has expired devel/pecl-inclued||2016-03-20|Has expired: cannot be installed: doesn't work with lang/php56 port (doesn't support PHP 5.5 5.6 70) security/pecl-taint||2016-03-20|Has expired: cannot be installed: doesn't work with lang/php56 port (doesn't support PHP 5.5 5.6 70) net/libnids-libnet11|net/libnids|2016-03-20|Same content +lang/cloudabi-clang|devel/cloudabi-toolchain|2016-03-21|Merged Modified: head/devel/cloudabi-toolchain/Makefile ============================================================================== --- head/devel/cloudabi-toolchain/Makefile Mon Mar 21 20:41:22 2016 (r411618) +++ head/devel/cloudabi-toolchain/Makefile Mon Mar 21 21:11:11 2016 (r411619) @@ -2,18 +2,59 @@ # $FreeBSD$ PORTNAME= cloudabi-toolchain -PORTVERSION= 1.2 +PORTVERSION= 1.3 CATEGORIES= devel +MASTER_SITES= # None +DISTFILES= # None MAINTAINER= ed@FreeBSD.org COMMENT= C and C++ toolchain for CloudABI -USES= metaport +LICENSE= MIT -LIBDIR= ${LOCALBASE}/x86_64-unknown-cloudabi/lib - -RUN_DEPENDS+= aarch64-unknown-cloudabi-ld:${PORTSDIR}/devel/cloudabi-binutils-aarch64 \ - x86_64-unknown-cloudabi-ld:${PORTSDIR}/devel/cloudabi-binutils-x86_64 \ - x86_64-unknown-cloudabi-cc:${PORTSDIR}/lang/cloudabi-clang +RUN_DEPENDS= clang${LLVM_SUFFIX}:${PORTSDIR}/devel/llvm${LLVM_SUFFIX} \ + pkgconf:${PORTSDIR}/devel/pkgconf \ + aarch64-unknown-cloudabi-ld:${PORTSDIR}/devel/cloudabi-binutils-aarch64 \ + x86_64-unknown-cloudabi-ld:${PORTSDIR}/devel/cloudabi-binutils-x86_64 + +LLVM_SUFFIX= 38 + +CLOUDABI_ARCHS= aarch64-unknown-cloudabi x86_64-unknown-cloudabi + +LLVM_TOOLS= ar nm objdump ranlib size +SHELL_TOOLS= man pkg-config + +.for arch in ${CLOUDABI_ARCHS} +. for tool in ${LLVM_TOOLS} ${SHELL_TOOLS} +PLIST_FILES+= bin/${arch}-${tool} +. endfor +PLIST_FILES+= bin/${arch}-cc bin/${arch}-c++ llvm${LLVM_SUFFIX}/${arch} +.endfor + +do-build: +.for arch in ${CLOUDABI_ARCHS} +. for tool in ${SHELL_TOOLS} + @${SED} -e 's:%%PREFIX%%:${PREFIX}:g' -e 's:%%ARCH%%:${arch}:g' \ + ${FILESDIR}/${tool}.in > ${WRKDIR}/${arch}-${tool} +. endfor +.endfor + +do-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/llvm${LLVM_SUFFIX} +.for arch in ${CLOUDABI_ARCHS} +. for tool in ${LLVM_TOOLS} + @${LN} -s ../llvm${LLVM_SUFFIX}/bin/llvm-${tool} \ + ${STAGEDIR}${PREFIX}/bin/${arch}-${tool} +. endfor +. for tool in ${SHELL_TOOLS} + @${INSTALL_SCRIPT} ${WRKDIR}/${arch}-${tool} \ + ${STAGEDIR}${PREFIX}/bin/${arch}-${tool} +. endfor + @${LN} -s ../llvm${LLVM_SUFFIX}/bin/clang \ + ${STAGEDIR}${PREFIX}/bin/${arch}-cc + @${LN} -s ../llvm${LLVM_SUFFIX}/bin/clang++ \ + ${STAGEDIR}${PREFIX}/bin/${arch}-c++ + @${LN} -s ../${arch} ${STAGEDIR}${PREFIX}/llvm${LLVM_SUFFIX}/${arch} +.endfor .include <bsd.port.mk> Added: head/devel/cloudabi-toolchain/files/man.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/cloudabi-toolchain/files/man.in Mon Mar 21 21:11:11 2016 (r411619) @@ -0,0 +1,2 @@ +#!/bin/sh +MANPATH=%%PREFIX%%/%%ARCH%%/share/man man "$@" Added: head/devel/cloudabi-toolchain/files/pkg-config.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/cloudabi-toolchain/files/pkg-config.in Mon Mar 21 21:11:11 2016 (r411619) @@ -0,0 +1,2 @@ +#!/bin/sh +PKG_CONFIG_LIBDIR=%%PREFIX%%/%%ARCH%%/lib/pkgconfig %%PREFIX%%/bin/pkgconf "$@" Modified: head/lang/Makefile ============================================================================== --- head/lang/Makefile Mon Mar 21 20:41:22 2016 (r411618) +++ head/lang/Makefile Mon Mar 21 21:11:11 2016 (r411619) @@ -42,7 +42,6 @@ SUBDIR += clang38 SUBDIR += clojure SUBDIR += clojure-mode.el - SUBDIR += cloudabi-clang SUBDIR += clover SUBDIR += cmucl SUBDIR += cmucl-extra
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603212111.u2LLBBii024680>