| 1 |
commit: 1782ca0aa847a7f2c537326c57839f198b138d0a |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 29 10:20:26 2016 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 29 10:34:39 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1782ca0a |
| 7 |
|
| 8 |
app-emulation/dosemu: backported glibc detection, bug #597880 |
| 9 |
|
| 10 |
Reported-by: gentoo <AT> moin.fi |
| 11 |
Bug: https://bugs.gentoo.org/597880 |
| 12 |
|
| 13 |
Package-Manager: portage-2.3.2 |
| 14 |
|
| 15 |
.../dosemu/dosemu-1.4.1_pre20091009.ebuild | 5 +++- |
| 16 |
.../files/dosemu-1.4.1_pre20091009-fix-glibc.patch | 35 ++++++++++++++++++++++ |
| 17 |
2 files changed, 39 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20091009.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20091009.ebuild |
| 20 |
index 5a56b8d..39b9815 100644 |
| 21 |
--- a/app-emulation/dosemu/dosemu-1.4.1_pre20091009.ebuild |
| 22 |
+++ b/app-emulation/dosemu/dosemu-1.4.1_pre20091009.ebuild |
| 23 |
@@ -2,7 +2,7 @@ |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
# $Id$ |
| 26 |
|
| 27 |
-inherit eutils flag-o-matic |
| 28 |
+inherit autotools eutils flag-o-matic |
| 29 |
|
| 30 |
P_FD="dosemu-freedos-1.0-bin" |
| 31 |
DESCRIPTION="DOS Emulator" |
| 32 |
@@ -36,6 +36,9 @@ S="${WORKDIR}/${PN}" |
| 33 |
src_compile() { |
| 34 |
epatch "${FILESDIR}"/${P}-flex.patch #437074 |
| 35 |
epatch "${FILESDIR}"/${P}-dash.patch |
| 36 |
+ epatch "${FILESDIR}"/${P}-fix-glibc.patch #597880 |
| 37 |
+ |
| 38 |
+ eautoreconf |
| 39 |
|
| 40 |
# Has problems with -O3 on some systems |
| 41 |
replace-flags -O[3-9] -O2 |
| 42 |
|
| 43 |
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 |
| 44 |
new file mode 100644 |
| 45 |
index 00000000..62a4319 |
| 46 |
--- /dev/null |
| 47 |
+++ b/app-emulation/dosemu/files/dosemu-1.4.1_pre20091009-fix-glibc.patch |
| 48 |
@@ -0,0 +1,35 @@ |
| 49 |
+The patch is a subset of |
| 50 |
+ |
| 51 |
+ commit b028d3fd33b004ac61583927884a64577e2d64c3 |
| 52 |
+ Author: Bart Oldeman <bartoldeman@×××××××××××××××××.net> |
| 53 |
+ Date: Sun Dec 23 22:08:11 2012 -0500 |
| 54 |
+ |
| 55 |
+to fix glibc detection for |
| 56 |
+Bug: https://bugs.gentoo.org/597880 |
| 57 |
+diff --git a/configure.ac b/configure.ac |
| 58 |
+index 70bc154..b8da5e2 100644 |
| 59 |
+--- a/configure.ac |
| 60 |
++++ b/configure.ac |
| 61 |
+@@ -644,19 +640,9 @@ if test "$GCC" = "yes" ; then |
| 62 |
+ fi |
| 63 |
+ |
| 64 |
+ AC_MSG_CHECKING(for glibc...) |
| 65 |
+- set `printf '%b\n' '#include <features.h>\nXXAaZZ __GLIBC__ XXBbZZ __GLIBC_MINOR__'|${CC-cc} -E -|awk '/XXAaZZ/ {print $2 " " $4}'` |
| 66 |
+- major=$1; minor=$2 |
| 67 |
+- if test "$major" = "__GLIBC__"; then |
| 68 |
+- AC_MSG_ERROR([Sorry, you need glibc-2.1.3 or newer.]) |
| 69 |
+- else |
| 70 |
+- if test "$minor" = "__GLIBC_MINOR__"; then |
| 71 |
+- minor=0; |
| 72 |
+- fi |
| 73 |
+- GLIBC_VERSION_CODE=$((($major * 1000) + $minor)) |
| 74 |
+- AC_MSG_RESULT([yes, version code $GLIBC_VERSION_CODE]) |
| 75 |
+- if test $GLIBC_VERSION_CODE -lt 2001; then |
| 76 |
+- AC_MSG_ERROR([Sorry, you need glibc-2.1.3 or newer.]) |
| 77 |
+- fi |
| 78 |
++ set `printf '%b\n' '#include <features.h>\nXXAaZZ __GLIBC__'|${CC-cc} -E -|awk '/XXAaZZ/ {print $2}'` |
| 79 |
++ if test "$1" = "__GLIBC__"; then |
| 80 |
++ AC_MSG_ERROR([Sorry, you need glibc.]) |
| 81 |
+ fi |
| 82 |
+ fi |
| 83 |
+ |
Archives