mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-19 08:13:21 +00:00
Code Issues Releases Activity

misc/rumprun: Add missing USES=gmake and fix build

Browse Source 
make[1]: "/wrkdirs/usr/ports/misc/rumprun/work/rumprun-8fe40c8/app-tools/Makefile" line 1: Missing dependency operator
make[1]: "/wrkdirs/usr/ports/misc/rumprun/work/rumprun-8fe40c8/app-tools/Makefile" line 2: Need an operator
...
make[1]: "../../global.mk" line 1: Missing dependency operator
make[1]: "../../global.mk" line 2: Need an operator
...
Variable MACHINE_GNU_PLATFORM is recursive.

- Patch bundled libunwind to build with newer GCC versions
- Fix man page install location
- Fix build on i386
- The port will only build on amd64 and i386 so use ONLY_FOR_ARCHS to
  list the architectures it builds on instead of all architectures it
  doesn't build on

PR:		225152
Submitted by:	Fabian Freyer <fabian.freyer@physik.tu-berlin.de> (maintainer)
This commit is contained in:
Tobias Kortkamp 2018-01-16 17:04:40 +00:00
parent 827c08bb37
commit ee03515b6a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=459195
3 changed files with 1614 additions and 1595 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
misc/rumprun/Makefile
View File

@ -9,9 +9,10 @@ COMMENT= Unikernel and toolchain for various platforms
LICENSE= BSD2CLAUSE
NOT_FOR_ARCHS= aarch64 armv6 mips mips64 powerpc powerpc64 sparc64
NOT_FOR_ARCHS_REASON= not yet ported to FreeBSD on this architecture
ONLY_FOR_ARCHS= amd64 i386
ONLY_FOR_ARCHS_REASON= not yet ported to FreeBSD on other architectures
USES= gmake
USE_GCC= any
USE_GITHUB= yes
GH_ACCOUNT= rumpkernel
@ -19,9 +20,18 @@ GH_TUPLE= rumpkernel:buildrump.sh:9c9b022:buildrump/buildrump.sh \
rumpkernel:src-netbsd:b8b951e:src/src-netbsd
GH_TAGNAME= 8fe40c8
MANDIRS= ${PREFIX}/share/man
_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
@ -29,8 +39,12 @@ do-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
${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/rumprun-x86_64-hw/x86_64--netbsd-c++
${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/rumprun-x86_64-hw/x86_64--netbsd-gcc
${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/rumprun-x86_64-hw/brprintmetainfo
.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>

11
misc/rumprun/files/patch-src-netbsd_sys_lib_libunwind_AddressSpace.hpp Normal file
View File

@ -0,0 +1,11 @@
--- src-netbsd/sys/lib/libunwind/AddressSpace.hpp.orig 2018-01-14 23:12:55 UTC
+++ src-netbsd/sys/lib/libunwind/AddressSpace.hpp
@@ -140,7 +140,7 @@ public:
} while (byte >= 0x80);
// sign extend negative numbers
if ((byte & 0x40) != 0)
- result |= (-1LL) << bit;
+ result |= (~0ULL) << bit;
return result;
}

3170
misc/rumprun/pkg-plist
View File

File diff suppressed because it is too large Load Diff