1 |
commit: acdbbba5090fa388f6d4914e10b65ba600c620b8 |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Nov 5 22:24:06 2016 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Nov 5 22:24:22 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acdbbba5 |
7 |
|
8 |
app-emulation/dosemu: drop incomplete check for glibc |
9 |
|
10 |
Package-Manager: portage-2.3.2 |
11 |
|
12 |
.../dosemu/dosemu-1.4.1_pre20130107-r3.ebuild | 7 ++++++- |
13 |
.../files/dosemu-1.4.1_pre20130107-no-glibc.patch | 18 ++++++++++++++++++ |
14 |
2 files changed, 24 insertions(+), 1 deletion(-) |
15 |
|
16 |
diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild |
17 |
index d6693d2..8a0011c 100644 |
18 |
--- a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild |
19 |
+++ b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild |
20 |
@@ -4,7 +4,7 @@ |
21 |
|
22 |
EAPI=5 |
23 |
|
24 |
-inherit eutils flag-o-matic pax-utils toolchain-funcs |
25 |
+inherit autotools eutils flag-o-matic pax-utils toolchain-funcs |
26 |
|
27 |
P_FD="dosemu-freedos-1.0-bin" |
28 |
COMMIT="15cfb41ff20a052769d753c3262c57ecb050ad71" |
29 |
@@ -46,6 +46,9 @@ S="${WORKDIR}/${PN}-code-${COMMIT}" |
30 |
src_prepare() { |
31 |
epatch "${FILESDIR}"/${P}-fortify.patch |
32 |
epatch "${FILESDIR}"/${PN}-1.4.1_pre20091009-dash.patch |
33 |
+ epatch "${FILESDIR}"/${P}-no-glibc.patch |
34 |
+ |
35 |
+ epatch_user |
36 |
|
37 |
# Has problems with -O3 on some systems |
38 |
replace-flags -O[3-9] -O2 |
39 |
@@ -53,6 +56,8 @@ src_prepare() { |
40 |
# This one is from media-sound/fluid-soundfont (bug #479534) |
41 |
sed "s,/usr/share/soundfonts/default.sf2,${EPREFIX}/usr/share/sounds/sf2/FluidR3_GM.sf2,"\ |
42 |
-i src/plugin/fluidsynth/mid_o_flus.c || die |
43 |
+ |
44 |
+ eautoreconf |
45 |
} |
46 |
|
47 |
src_configure() { |
48 |
|
49 |
diff --git a/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-no-glibc.patch b/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-no-glibc.patch |
50 |
new file mode 100644 |
51 |
index 00000000..7c5b8a5 |
52 |
--- /dev/null |
53 |
+++ b/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-no-glibc.patch |
54 |
@@ -0,0 +1,18 @@ |
55 |
+The check has no AC_MGS_RESULT finish helper |
56 |
+and gets called as |
57 |
+ set `` |
58 |
+on gcc-6 which clutters ./configure output. |
59 |
+ |
60 |
+One of fallouts of https://bugs.gentoo.org/598798 |
61 |
+diff --git a/configure.ac b/configure.ac |
62 |
+index 34a7f71..0f06f57 100644 |
63 |
+--- a/configure.ac |
64 |
++++ b/configure.ac |
65 |
+@@ -574,7 +574,2 @@ if test "$GCC" = "yes" ; then |
66 |
+ |
67 |
+- AC_MSG_CHECKING(for glibc...) |
68 |
+- set `printf '%b\n' '#include <features.h>\nXXAaZZ __GLIBC__'|${CC-cc} -E -|awk '/XXAaZZ/ {print $2}'` |
69 |
+- if test "$1" = "__GLIBC__"; then |
70 |
+- AC_MSG_ERROR([Sorry, you need glibc.]) |
71 |
+- fi |
72 |
+ fi |