diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2016-10-29 11:20:26 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2016-10-29 11:34:39 +0100 |
| commit | 1782ca0aa847a7f2c537326c57839f198b138d0a (patch) | |
| tree | 60ce20eec98d842c4dc06a0859a5163f2ca7055a /app-emulation | |
| parent | app-emulation/dosemu: tweak to support non-bash '/bin/sh' (diff) | |
| download | gentoo-1782ca0aa847a7f2c537326c57839f198b138d0a.tar.gz gentoo-1782ca0aa847a7f2c537326c57839f198b138d0a.tar.bz2 gentoo-1782ca0aa847a7f2c537326c57839f198b138d0a.zip | |
app-emulation/dosemu: backported glibc detection, bug #597880
Reported-by: gentoo@moin.fi
Bug: https://bugs.gentoo.org/597880
Package-Manager: portage-2.3.2
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/dosemu/dosemu-1.4.1_pre20091009.ebuild | 5 | ||||
| -rw-r--r-- | app-emulation/dosemu/files/dosemu-1.4.1_pre20091009-fix-glibc.patch | 35 |
2 files changed, 39 insertions, 1 deletions
diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20091009.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20091009.ebuild index 5a56b8d95e3a..39b981500be6 100644 --- a/app-emulation/dosemu/dosemu-1.4.1_pre20091009.ebuild +++ b/app-emulation/dosemu/dosemu-1.4.1_pre20091009.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -inherit eutils flag-o-matic +inherit autotools eutils flag-o-matic P_FD="dosemu-freedos-1.0-bin" DESCRIPTION="DOS Emulator" @@ -36,6 +36,9 @@ S="${WORKDIR}/${PN}" src_compile() { epatch "${FILESDIR}"/${P}-flex.patch #437074 epatch "${FILESDIR}"/${P}-dash.patch + epatch "${FILESDIR}"/${P}-fix-glibc.patch #597880 + + eautoreconf # Has problems with -O3 on some systems replace-flags -O[3-9] -O2 diff --git a/app-emulation/dosemu/files/dosemu-1.4.1_pre20091009-fix-glibc.patch b/app-emulation/dosemu/files/dosemu-1.4.1_pre20091009-fix-glibc.patch new file mode 100644 index 000000000000..62a4319c1a47 --- /dev/null +++ b/app-emulation/dosemu/files/dosemu-1.4.1_pre20091009-fix-glibc.patch @@ -0,0 +1,35 @@ +The patch is a subset of + + commit b028d3fd33b004ac61583927884a64577e2d64c3 + Author: Bart Oldeman <bartoldeman@users.sourceforge.net> + Date: Sun Dec 23 22:08:11 2012 -0500 + +to fix glibc detection for +Bug: https://bugs.gentoo.org/597880 +diff --git a/configure.ac b/configure.ac +index 70bc154..b8da5e2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -644,19 +640,9 @@ if test "$GCC" = "yes" ; then + fi + + AC_MSG_CHECKING(for glibc...) +- set `printf '%b\n' '#include <features.h>\nXXAaZZ __GLIBC__ XXBbZZ __GLIBC_MINOR__'|${CC-cc} -E -|awk '/XXAaZZ/ {print $2 " " $4}'` +- major=$1; minor=$2 +- if test "$major" = "__GLIBC__"; then +- AC_MSG_ERROR([Sorry, you need glibc-2.1.3 or newer.]) +- else +- if test "$minor" = "__GLIBC_MINOR__"; then +- minor=0; +- fi +- GLIBC_VERSION_CODE=$((($major * 1000) + $minor)) +- AC_MSG_RESULT([yes, version code $GLIBC_VERSION_CODE]) +- if test $GLIBC_VERSION_CODE -lt 2001; then +- AC_MSG_ERROR([Sorry, you need glibc-2.1.3 or newer.]) +- fi ++ set `printf '%b\n' '#include <features.h>\nXXAaZZ __GLIBC__'|${CC-cc} -E -|awk '/XXAaZZ/ {print $2}'` ++ if test "$1" = "__GLIBC__"; then ++ AC_MSG_ERROR([Sorry, you need glibc.]) + fi + fi + |