Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 13 Nov 2019 14:32:07 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r517376 - in head: databases/recutils devel/bison devel/libunistring devel/m4 editors/nano misc/gnuls sysutils/coreutils textproc/groff
Message-ID:  <201911131432.xADEW7px010915@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Wed Nov 13 14:32:07 2019
New Revision: 517376
URL: https://svnweb.freebsd.org/changeset/ports/517376

Log:
  Drop workaround for qemu-user-static hang after r517350
  
  GSlice as used by qemu-user still aborts due to low RLIMIT_VMEM in an
  emulated application but no longer hangs. While the behavior differs
  from real hardware it matches the one from before r456518 that was
  hardcoded as gl_cv_func_printf_enomem=no workaround.
  
  PR:		224740

Modified:
  head/databases/recutils/Makefile   (contents, props changed)
  head/devel/bison/Makefile   (contents, props changed)
  head/devel/libunistring/Makefile   (contents, props changed)
  head/devel/m4/Makefile   (contents, props changed)
  head/editors/nano/Makefile   (contents, props changed)
  head/misc/gnuls/Makefile   (contents, props changed)
  head/sysutils/coreutils/Makefile   (contents, props changed)
  head/textproc/groff/Makefile   (contents, props changed)

Modified: head/databases/recutils/Makefile
==============================================================================
--- head/databases/recutils/Makefile	Wed Nov 13 14:14:17 2019	(r517375)
+++ head/databases/recutils/Makefile	Wed Nov 13 14:32:07 2019	(r517376)
@@ -14,10 +14,6 @@ LICENSE=	GPLv3
 
 USES=		charsetfix libtool makeinfo
 GNU_CONFIGURE=	yes
-.ifdef QEMU_EMULATING
-# XXX bug 224740: configure hangs
-CONFIGURE_ENV=	gl_cv_func_printf_enomem=no
-.endif
 USE_LDCONFIG=	yes
 
 INFO=		rec-mode recutils

Modified: head/devel/bison/Makefile
==============================================================================
--- head/devel/bison/Makefile	Wed Nov 13 14:14:17 2019	(r517375)
+++ head/devel/bison/Makefile	Wed Nov 13 14:32:07 2019	(r517376)
@@ -23,10 +23,6 @@ USES=		charsetfix localbase makeinfo perl5 tar:xz
 USE_PERL5=	build
 
 CONFIGURE_ARGS=	--disable-yacc --enable-relocatable
-.ifdef QEMU_EMULATING
-# XXX bug 224740: configure hangs
-CONFIGURE_ENV=	gl_cv_func_printf_enomem=no
-.endif
 GNU_CONFIGURE=	yes
 LIBS+=		-lm
 TEST_TARGET=	check

Modified: head/devel/libunistring/Makefile
==============================================================================
--- head/devel/libunistring/Makefile	Wed Nov 13 14:14:17 2019	(r517375)
+++ head/devel/libunistring/Makefile	Wed Nov 13 14:32:07 2019	(r517376)
@@ -24,9 +24,4 @@ INFO=		${PORTNAME}
 OPTIONS_DEFINE=	DOCS
 CONFIGURE_ARGS=	--disable-static
 
-.ifdef QEMU_EMULATING
-# XXX bug 224740: configure hangs: GSlice: failed to allocate 496 bytes (alignment: 512)
-CONFIGURE_ENV+=	gl_cv_func_printf_enomem=no
-.endif
-
 .include <bsd.port.mk>

Modified: head/devel/m4/Makefile
==============================================================================
--- head/devel/m4/Makefile	Wed Nov 13 14:14:17 2019	(r517375)
+++ head/devel/m4/Makefile	Wed Nov 13 14:32:07 2019	(r517376)
@@ -19,10 +19,6 @@ LIBSIGSEGV_DESC=Use alternative page fault handler (GN
 
 CONFIGURE_ARGS=	--program-prefix=g
 CONFIGURE_ENV=	MAKEINFO="${MAKEINFO} --no-split"
-.ifdef QEMU_EMULATING
-# XXX bug 224740: configure hangs
-CONFIGURE_ENV+=	gl_cv_func_printf_enomem=no
-.endif
 GNU_CONFIGURE=	yes
 USES=		makeinfo tar:xz
 

Modified: head/editors/nano/Makefile
==============================================================================
--- head/editors/nano/Makefile	Wed Nov 13 14:14:17 2019	(r517375)
+++ head/editors/nano/Makefile	Wed Nov 13 14:32:07 2019	(r517376)
@@ -34,11 +34,6 @@ INFO=		nano
 
 PORTSCOUT=	limitw:1,even
 
-.ifdef QEMU_EMULATING
-# XXX bug 224740/231346: configure hangs
-CONFIGURE_ENV+=	gl_cv_func_printf_enomem=no
-.endif
-
 post-patch:
 	${REINPLACE_CMD} -e 's/^groff.*/false/' ${WRKSRC}/configure
 

Modified: head/misc/gnuls/Makefile
==============================================================================
--- head/misc/gnuls/Makefile	Wed Nov 13 14:14:17 2019	(r517375)
+++ head/misc/gnuls/Makefile	Wed Nov 13 14:32:07 2019	(r517376)
@@ -16,10 +16,6 @@ NLS_USES=		gettext
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	FORCE_UNSAFE_CONFIGURE=1
-.ifdef QEMU_EMULATING
-# XXX bug 224740: configure hangs
-CONFIGURE_ENV+=	gl_cv_func_printf_enomem=no
-.endif
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 

Modified: head/sysutils/coreutils/Makefile
==============================================================================
--- head/sysutils/coreutils/Makefile	Wed Nov 13 14:14:17 2019	(r517375)
+++ head/sysutils/coreutils/Makefile	Wed Nov 13 14:32:07 2019	(r517376)
@@ -25,10 +25,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-prefix=g	\
 		--program-transform-name=s/stat/nustat/
 CONFIGURE_ENV=	FORCE_UNSAFE_CONFIGURE=1
-.ifdef QEMU_EMULATING
-# XXX bug 224740: configure hangs
-CONFIGURE_ENV+=	gl_cv_func_printf_enomem=no
-.endif
 
 INFO=		coreutils
 

Modified: head/textproc/groff/Makefile
==============================================================================
--- head/textproc/groff/Makefile	Wed Nov 13 14:14:17 2019	(r517375)
+++ head/textproc/groff/Makefile	Wed Nov 13 14:32:07 2019	(r517376)
@@ -33,11 +33,6 @@ CONFIGURE_ARGS+=	--with-urw-fonts-dir=${LOCALBASE}/sha
 
 CPE_VENDOR=	gnu
 
-.ifdef QEMU_EMULATING
-# XXX bug 224740: configure hangs: GSlice: failed to allocate 496 bytes (alignment: 512)
-CONFIGURE_ENV+=	gl_cv_func_printf_enomem=no
-.endif
-
 # Canonicalize to A4 if set.
 .if defined(A4) || (defined(PAPERSIZE) && ${PAPERSIZE:tu} == "A4")
 PAPERSIZE=A4



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911131432.xADEW7px010915>