Date: Sat, 11 May 2019 10:45:36 +0000 (UTC) From: Mateusz Piotrowski <0mp@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r501246 - in head: . misc misc/rumprun misc/rumprun/files Message-ID: <201905111045.x4BAjaN8059073@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: 0mp Date: Sat May 11 10:45:36 2019 New Revision: 501246 URL: https://svnweb.freebsd.org/changeset/ports/501246 Log: Re-add misc/rumprun: Unikernel and toolchain for various platforms While here, tidy up the Makefile. PR: 230125 Submitted by: fabian.freyer@physik.tu-berlin.de Differential Revision: https://reviews.freebsd.org/D18750 Added: head/misc/rumprun/ - copied from r478727, head/misc/rumprun/ Deleted: head/misc/rumprun/files/patch-src-netbsd_sys_lib_libunwind_AddressSpace.hpp Modified: head/MOVED head/misc/Makefile head/misc/rumprun/Makefile head/misc/rumprun/distinfo head/misc/rumprun/files/patch-build-rr.sh head/misc/rumprun/pkg-descr Modified: head/MOVED ============================================================================== --- head/MOVED Sat May 11 10:34:39 2019 (r501245) +++ head/MOVED Sat May 11 10:45:36 2019 (r501246) @@ -10564,7 +10564,6 @@ science/ecs|science/code_saturne|2018-11-04|Code_Satur science/fvm|science/code_saturne|2018-11-04|Code_Saturne merged bft, ecs, fvm, mei and ncs science/mei|science/code_saturne|2018-11-04|Code_Saturne merged bft, ecs, fvm, mei and ncs x11-wm/cde|x11/cde|2018-11-05|Recategorise -misc/rumprun||2018-11-06|Has expired: "fails with current compilers" security/ossec-hids-client|security/ossec-hids-agent|2018-11-09|Agent is the name used in documentation graphics/ImageMagick|graphics/ImageMagick6|2018-11-10|Port renamed graphics/ImageMagick-nox11|graphics/ImageMagick6-nox11|2018-11-10|Port renamed Modified: head/misc/Makefile ============================================================================== --- head/misc/Makefile Sat May 11 10:34:39 2019 (r501245) +++ head/misc/Makefile Sat May 11 10:45:36 2019 (r501246) @@ -443,6 +443,7 @@ SUBDIR += rubygem-rabbit SUBDIR += rubygem-vpim SUBDIR += rump + SUBDIR += rumprun SUBDIR += sdformat SUBDIR += seabios SUBDIR += sent Modified: head/misc/rumprun/Makefile ============================================================================== --- head/misc/rumprun/Makefile Sat Sep 1 20:43:36 2018 (r478727) +++ head/misc/rumprun/Makefile Sat May 11 10:45:36 2019 (r501246) @@ -1,47 +1,45 @@ # $FreeBSD$ PORTNAME= rumprun -DISTVERSION= g20180105 -PORTREVISION= 2 +DISTVERSION= g20180408 CATEGORIES= misc MAINTAINER= fabian.freyer@physik.tu-berlin.de COMMENT= Unikernel and toolchain for various platforms LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= not yet ported to FreeBSD on other architectures -BROKEN= fails with current versions of GCC # PR 230125 - USES= gmake USE_GCC= any USE_GITHUB= yes GH_ACCOUNT= rumpkernel -GH_TUPLE= rumpkernel:buildrump.sh:9c9b022:buildrump/buildrump.sh \ - rumpkernel:src-netbsd:b8b951e:src/src-netbsd -GH_TAGNAME= 8fe40c8 +GH_TUPLE= rumpkernel:buildrump.sh:6cccd46:buildrump/buildrump.sh \ + rumpkernel:src-netbsd:b7a6451:src/src-netbsd +GH_TAGNAME= 085e6e0 -_BUILDRUMP_PROBE=${WRKSRC}/buildrump.sh/buildrump.sh probe -.include <bsd.port.options.mk> +PLIST_SUB= ARCH=${RUMPARCH} ABI=${RUMPABI} I386="${RUMPARCH:Mx86_64:S/x86_64/@comment /}" RUMPARCH= ${ARCH:S/amd64/x86_64/:S/i386/i486/} RUMPABI= ${ARCH:S/amd64/netbsd/:S/i386/netbsdelf/} -PLIST_SUB= ARCH=${RUMPARCH} ABI=${RUMPABI} -.if ${RUMPARCH:Mi486} -PLIST_SUB+= I386="" -.else -PLIST_SUB+= I386="@comment " -.endif - do-build: - cd ${WRKSRC}; ${SETENV} CC=${CC} ./build-rr.sh -d ${PREFIX} -o objdir hw build + # MAKE_ENV is not included here as buildrump.sh fails if certain + # environmental variables like CFLAGS are set. + cd ${BUILD_WRKSRC} && \ + ${SETENV} CC=${CC} ./build-rr.sh -j ${MAKE_JOBS_NUMBER} -o objdir hw build do-install: - ${SED} -i -e 's/^RRDEST=.*$$/RRDEST=\"${STAGEDIR:S/\//\\\//g}${PREFIX:S/\//\\\//g}\"/' ${WRKSRC}/objdir/config.sh - cd ${WRKSRC}; ${SETENV} CC=${CC} ./build-rr.sh -o objdir hw install + # Set the destination directory for the install target. + ${REINPLACE_CMD} -e 's|^RRDEST=.*$$|RRDEST=\"${STAGEDIR:S,/,\\/,g}${PREFIX:S,/,\\/,g}\"|' \ + ${WRKSRC}/objdir/config.sh + + cd ${INSTALL_WRKSRC} && \ + ${SETENV} CC=${CC} ./build-rr.sh -j ${MAKE_JOBS_NUMBER} -o objdir hw install + .for sec in 3 4 7 ${MV} ${STAGEDIR}${PREFIX}/share/man/man${sec} ${STAGEDIR}${PREFIX}/man .endfor Modified: head/misc/rumprun/distinfo ============================================================================== --- head/misc/rumprun/distinfo Sat Sep 1 20:43:36 2018 (r478727) +++ head/misc/rumprun/distinfo Sat May 11 10:45:36 2019 (r501246) @@ -1,7 +1,7 @@ -TIMESTAMP = 1515813186 -SHA256 (rumpkernel-rumprun-g20180105-8fe40c8_GH0.tar.gz) = 651337461da798cdc66c4591b804d3f61a7a5fa0bca06c71fdcc27facfc4ee0e -SIZE (rumpkernel-rumprun-g20180105-8fe40c8_GH0.tar.gz) = 572990 -SHA256 (rumpkernel-buildrump.sh-9c9b022_GH0.tar.gz) = 3ba1cfbee4deee67285394c0bb6de8c83392116990cdcc93690415b1e07228e8 -SIZE (rumpkernel-buildrump.sh-9c9b022_GH0.tar.gz) = 57056 -SHA256 (rumpkernel-src-netbsd-b8b951e_GH0.tar.gz) = 5ea69fe33b8bf5bf361802fbab4838081bf4a7f3c473d725350e743870ba283a -SIZE (rumpkernel-src-netbsd-b8b951e_GH0.tar.gz) = 56946706 +TIMESTAMP = 1557351816 +SHA256 (rumpkernel-rumprun-g20180408-085e6e0_GH0.tar.gz) = 3bd5b630621a18df5fdc523b50928819b1f7346c040a4a00ce3b75d3645bca09 +SIZE (rumpkernel-rumprun-g20180408-085e6e0_GH0.tar.gz) = 573275 +SHA256 (rumpkernel-buildrump.sh-6cccd46_GH0.tar.gz) = 8eb6842c52ea9085f7820add82f28da4e1c5354ed677e1a0020715b98563b84b +SIZE (rumpkernel-buildrump.sh-6cccd46_GH0.tar.gz) = 57068 +SHA256 (rumpkernel-src-netbsd-b7a6451_GH0.tar.gz) = 6015c60b1f2555a52fc2dfe65c6528e58b6e61bf769ddc18d4edd70629c019bf +SIZE (rumpkernel-src-netbsd-b7a6451_GH0.tar.gz) = 57101575 Modified: head/misc/rumprun/files/patch-build-rr.sh ============================================================================== --- head/misc/rumprun/files/patch-build-rr.sh Sat Sep 1 20:43:36 2018 (r478727) +++ head/misc/rumprun/files/patch-build-rr.sh Sat May 11 10:45:36 2019 (r501246) @@ -1,6 +1,6 @@ ---- build-rr.sh.orig 2018-01-12 15:24:27 UTC +--- build-rr.sh.orig 2018-04-08 14:37:33 UTC +++ build-rr.sh -@@ -61,8 +61,6 @@ BUILDRUMP=$(pwd)/buildrump.sh +@@ -63,8 +63,6 @@ BUILDRUMP=$(pwd)/buildrump.sh # overriden by script if true HAVECXX=false @@ -9,7 +9,7 @@ # figure out where gmake lies if [ -z "${MAKE:-}" ]; then MAKE=make -@@ -133,17 +131,7 @@ parseargs () +@@ -135,17 +133,7 @@ parseargs () done shift $((${OPTIND} - 1)) @@ -28,7 +28,7 @@ [ -n "${RRDEST}" ] || RRDEST=./rumprun${GITBRANCH}${EXTSRC} -@@ -194,33 +182,6 @@ parseargs () +@@ -196,33 +184,6 @@ parseargs () ARGSSHIFT=$((${orignargs} - $#)) } @@ -62,12 +62,31 @@ # check that the necessary things are available on the build system probeprereqs () { -@@ -505,8 +466,6 @@ makeconfig () +@@ -358,8 +319,17 @@ buildrump () + # Disable new errors on GCC 7 which break netbsd-src compilation + # + [ `${CC} -dumpversion | cut -f1 -d.` -ge 7 ] \ +- && extracflags="$extracflags -F CPPFLAGS=-Wimplicit-fallthrough=0" ++ && extracflags="$extracflags -F CPPFLAGS=-Wimplicit-fallthrough=0" \ ++ && extracflags="$extracflags -F CFLAGS=-Wno-error=maybe-uninitialized" \ ++ && extracflags="$extracflags -F CFLAGS=-Wno-error=implicit-function-declaration" + ++ # Disable new errors on GCC 8 which break netbsd-src compilation ++ # ++ [ `${CC} -dumpversion | cut -f1 -d.` -ge 8 ] \ ++ && extracflags="$extracflags -F CFLAGS=-Wno-error=packed-not-aligned" \ ++ && extracflags="$extracflags -F CFLAGS=-Wno-error=cast-function-type" \ ++ && extracflags="$extracflags -F CFLAGS=-Wno-error=tautological-compare" \ ++ && extracflags="$extracflags -F CFLAGS=-Wno-error=attributes" \ + + # build tools + ${BUILDRUMP}/buildrump.sh ${BUILD_QUIET} ${STDJ} -k \ +@@ -514,8 +484,6 @@ makeconfig () + dobuild () { - -- checksubmodules - +- checksubmodules + . ${BUILDRUMP}/subr.sh - PLATFORM_MKCONF= Modified: head/misc/rumprun/pkg-descr ============================================================================== --- head/misc/rumprun/pkg-descr Sat Sep 1 20:43:36 2018 (r478727) +++ head/misc/rumprun/pkg-descr Sat May 11 10:45:36 2019 (r501246) @@ -6,7 +6,7 @@ allows existing, unmodified POSIX applications to run latter allows building highly customized solutions with minimal footprints. The Rumprun unikernel supports applications written in, for example but not -limited to: C, C++, Erlang, Go, Java, Javascript (node.js), Python, Ruby and +limited to: C, C++, Erlang, Go, Java, JavaScript (Node.js), Python, Ruby and Rust. WWW: https://github.com/rumpkernel/rumprun
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905111045.x4BAjaN8059073>