diff options
| author | Kyle Evans <kevans@FreeBSD.org> | 2020-11-22 03:40:57 +0000 |
|---|---|---|
| committer | Kyle Evans <kevans@FreeBSD.org> | 2020-11-22 03:40:57 +0000 |
| commit | 0f888254fda94f3fc3b986d900ac60ef67cf0e99 (patch) | |
| tree | aa050bb09c3ece31c2009ceb434c400c2cdef86b /emulators/qemu-user-static | |
| parent | 91dc327653df40a6594e33a3dbc05f3cb00060cc (diff) | |
| download | ports-0f888254fda94f3fc3b986d900ac60ef67cf0e99.tar.gz ports-0f888254fda94f3fc3b986d900ac60ef67cf0e99.zip | |
emulators/qemu-user-static: update to 6f1319e1138c
Highlights:
- Fix stack allocation to behave more like FreeBSD really does[*].
- Raised the stack size on ARM, which should solve some limited cases of
mysterious segfaults (e.g. lang/gcc9).
- Provide hw.ncpu and AT_NCPUS based on cpu affinity to more effectively
limit cpu usage under qemu-user-static.
[*] We start out with a limited initial stack size, then login(1) raises
the stack size up to the maximum possible for the system (arch-based).
qemu-user-static will now calculate a maximum stack size based on the
host's configured rlimit and the qemu-bsd-user specified max for the arch
in question, then immediately raise the stack allocation size to the
maximum. This is especially important because we don't actually handle
stack growth.
post-patch is also dropped entirely, as these sed invocations have done
nothing since versions of qemu back in ~2007, AFAICT. CFLAGS/LDFLAGS get
sucked in during configure and qemu's built with -fno-strict-aliasing as
a default for even longer.
Notes
Notes:
svn path=/head/; revision=556027
Diffstat (limited to 'emulators/qemu-user-static')
| -rw-r--r-- | emulators/qemu-user-static/Makefile | 14 | ||||
| -rw-r--r-- | emulators/qemu-user-static/distinfo | 6 |
2 files changed, 5 insertions, 15 deletions
diff --git a/emulators/qemu-user-static/Makefile b/emulators/qemu-user-static/Makefile index c57c180c75c6..fcf6308086c8 100644 --- a/emulators/qemu-user-static/Makefile +++ b/emulators/qemu-user-static/Makefile @@ -2,7 +2,7 @@ PORTNAME= qemu PORTVERSION= 3.1.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= emulators PKGNAMESUFFIX= -user-static DIST_SUBDIR= qemu/${PORTVERSION} @@ -18,7 +18,7 @@ CONFLICTS_INSTALL= qemu-user-static-devel-[0-9]* USES= bison compiler:c11 gmake perl5 pkgconfig python:build USE_GITHUB= yes -GH_TUPLE= seanbruno:qemu-bsd-user:4ee077c7906fb \ +GH_TUPLE= seanbruno:qemu-bsd-user:6f1319e1138ccb97 \ qemu:keycodemapdb:10739aa:keycodemapdb/ui/keycodemapdb HAS_CONFIGURE= yes USE_PERL5= build @@ -68,16 +68,6 @@ CONFIGURE_ARGS+= --prefix=${PREFIX} --cc=${CC} --enable-docs \ QEMU_ARCH= ${ARCH:C/amd64/x86_64/:C/powerpc/ppc/} MAKE_ARGS+= ARCH=${QEMU_ARCH} -post-patch: - @${REINPLACE_CMD} -E \ - -e "s|^(CFLAGS=).*|\1${CFLAGS} -fno-strict-aliasing|" \ - -e "s|^(LDFLAGS=).*|\1${LDFLAGS}|" \ - ${WRKSRC}/Makefile.target - @${REINPLACE_CMD} -E \ - -e "s|^(CFLAGS=).*|\1${CFLAGS} -fno-strict-aliasing -I.|" \ - -e "s|^(LDFLAGS=).*|\1${LDFLAGS}|" \ - ${WRKSRC}/Makefile - post-install: @${MV} ${STAGEDIR}${PREFIX}/etc/rc.d ${WRKDIR} @${RM} -r ${STAGEDIR}${PREFIX}/etc diff --git a/emulators/qemu-user-static/distinfo b/emulators/qemu-user-static/distinfo index 00174d05897b..a1a7d1afdf49 100644 --- a/emulators/qemu-user-static/distinfo +++ b/emulators/qemu-user-static/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1605230189 -SHA256 (qemu/3.1.0/seanbruno-qemu-bsd-user-3.1.0-4ee077c7906fb_GH0.tar.gz) = f3376a8ebe41156d5a0a0dee73277307155daed4c0102b3f8b3ed19ab6ce966d -SIZE (qemu/3.1.0/seanbruno-qemu-bsd-user-3.1.0-4ee077c7906fb_GH0.tar.gz) = 16904468 +TIMESTAMP = 1606014699 +SHA256 (qemu/3.1.0/seanbruno-qemu-bsd-user-3.1.0-6f1319e1138ccb97_GH0.tar.gz) = b1446caf0f4a989d053b379ad1f90691821f7734ea4d6b70139bac609b13aa02 +SIZE (qemu/3.1.0/seanbruno-qemu-bsd-user-3.1.0-6f1319e1138ccb97_GH0.tar.gz) = 16908717 SHA256 (qemu/3.1.0/qemu-keycodemapdb-10739aa_GH0.tar.gz) = ae43fb1e2b07b78be88a7882306b6e71383eb77472a35d7d78fed21e345d134a SIZE (qemu/3.1.0/qemu-keycodemapdb-10739aa_GH0.tar.gz) = 47895 |