FreeBSD Bugzilla – Attachment 200784 Details for
Bug 234628
misc/rumprun: Revive port
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch against deleted version
rumprun.diff (text/plain), 6.42 KB, created by
Fabian Freyer
on 2019-01-05 06:14:34 UTC
(
hide
)
Description:
patch against deleted version
Filename:
MIME Type:
Creator:
Fabian Freyer
Created:
2019-01-05 06:14:34 UTC
Size:
6.42 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 484288) >+++ Makefile (working copy) >@@ -1,54 +1,51 @@ > # $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 > > ONLY_FOR_ARCHS= amd64 i386 > ONLY_FOR_ARCHS_REASON= not yet ported to FreeBSD on other architectures >-BROKEN= fails with current compilers # PR 230125 >-DEPRECATED= "${BROKEN}" > EXPIRATION_DATE=2018-11-05 > > 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> > > 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 > > 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 > .for sec in 3 4 7 > ${MV} ${STAGEDIR}${PREFIX}/share/man/man${sec} ${STAGEDIR}${PREFIX}/man > .endfor > ${RM} -r ${STAGEDIR}${PREFIX}/share/man > ${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/rumprun-${RUMPARCH}-hw/${RUMPARCH}--${RUMPABI}-c++ > ${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/rumprun-${RUMPARCH}-hw/${RUMPARCH}--${RUMPABI}-gcc > ${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/rumprun-${RUMPARCH}-hw/brprintmetainfo > > .include <bsd.port.mk> >Index: distinfo >=================================================================== >--- distinfo (revision 484288) >+++ distinfo (working copy) >@@ -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 = 1546666837 >+SHA256 (rumpkernel-rumprun-g20190105-085e6e0_GH0.tar.gz) = 3bd5b630621a18df5fdc523b50928819b1f7346c040a4a00ce3b75d3645bca09 >+SIZE (rumpkernel-rumprun-g20190105-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 >Index: files/patch-build-rr.sh >=================================================================== >--- files/patch-build-rr.sh (revision 484288) >+++ files/patch-build-rr.sh (working copy) >@@ -1,73 +1,92 @@ >---- 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 > > -: ${GIT:=git} > - > # 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)) > > - # are we on a git branch which is not master? > - if type ${GIT} >/dev/null; then > - GITBRANCH=$(${GIT} rev-parse --abbrev-ref HEAD 2>/dev/null) > - if [ ${GITBRANCH} = "master" -o ${GITBRANCH} = "HEAD" ]; then > - GITBRANCH= > - else > - GITBRANCH=-${GITBRANCH} > - fi > - else > - GITBRANCH= > - fi > + GITBRANCH= > > [ -n "${RRDEST}" ] || RRDEST=./rumprun${GITBRANCH}${EXTSRC} > >-@@ -194,33 +182,6 @@ parseargs () >+@@ -196,33 +184,6 @@ parseargs () > ARGSSHIFT=$((${orignargs} - $#)) > } > > -checksubmodules () > -{ > - > - # We assume that if the git submodule command fails, it's because > - # we're using external $RUMPSRC. > - if git submodule status ${RUMPSRC} 2>/dev/null | grep -q '^-' \ > - || git submodule status ${BUILDRUMP} 2>/dev/null | grep -q '^-'; > - then > - echo '>>' > - echo '>> submodules missing. run "git submodule update --init"' > - echo '>>' > - exit 1 > - fi > - > - if git submodule status ${RUMPSRC} 2>/dev/null | grep -q '^+' \ > - || git submodule status ${BUILDRUMP} 2>/dev/null | grep -q '^+' > - then > - echo '>>' > - echo '>> Your git submodules are out-of-date' > - echo '>> Forgot to run "git submodule update" after pull?' > - echo '>> (sleeping for 5s, press ctrl-C to abort)' > - echo '>>' > - echo -n '>>' > - for x in 1 2 3 4 5; do echo -n ' !' ; sleep 1 ; done > - fi > -} > - > # 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=
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 234628
: 200784