| 1 |
commit: 58f5f8585fb5482e5b42de36a3730552ed003859 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri May 22 17:23:50 2020 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 22 17:24:00 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58f5f858 |
| 7 |
|
| 8 |
app-emulation/dosemu: don't use 'as' to test assembler, bug #722176 |
| 9 |
|
| 10 |
Instead of probing for 'as' use '$CC'. Build system uses '$CC' |
| 11 |
to compile '.S' files. |
| 12 |
|
| 13 |
Reported-by: Agostino Sarubbo |
| 14 |
Closes: https://bugs.gentoo.org/722176 |
| 15 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 16 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 17 |
|
| 18 |
app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild | 4 +++- |
| 19 |
app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-as.patch | 12 ++++++++++++ |
| 20 |
2 files changed, 15 insertions(+), 1 deletion(-) |
| 21 |
|
| 22 |
diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild |
| 23 |
index f2516914456..c7771af9cd8 100644 |
| 24 |
--- a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild |
| 25 |
+++ b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild |
| 26 |
@@ -1,4 +1,4 @@ |
| 27 |
-# Copyright 2002-2019 Gentoo Authors |
| 28 |
+# Copyright 2002-2020 Gentoo Authors |
| 29 |
# Distributed under the terms of the GNU General Public License v2 |
| 30 |
|
| 31 |
EAPI="7" |
| 32 |
@@ -55,6 +55,7 @@ PATCHES=( |
| 33 |
"${FILESDIR}"/${P}-ia16-ldflags.patch |
| 34 |
"${FILESDIR}"/${P}-fix-inline.patch |
| 35 |
"${FILESDIR}"/${P}-lto.patch |
| 36 |
+ "${FILESDIR}"/${P}-as.patch |
| 37 |
) |
| 38 |
|
| 39 |
src_prepare() { |
| 40 |
@@ -97,6 +98,7 @@ src_configure() { |
| 41 |
} |
| 42 |
|
| 43 |
src_compile() { |
| 44 |
+ # src/makefile.common is fritten manually, uses AR=ar |
| 45 |
emake AR=$(tc-getAR) |
| 46 |
} |
| 47 |
|
| 48 |
|
| 49 |
diff --git a/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-as.patch b/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-as.patch |
| 50 |
new file mode 100644 |
| 51 |
index 00000000000..2db3048be39 |
| 52 |
--- /dev/null |
| 53 |
+++ b/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-as.patch |
| 54 |
@@ -0,0 +1,12 @@ |
| 55 |
+--- a/configure.ac |
| 56 |
++++ b/configure.ac |
| 57 |
+@@ -503,8 +503,7 @@ dnl CPU emulator |
| 58 |
+ AC_MSG_NOTICE(Compiling for native x86...); |
| 59 |
+ fi |
| 60 |
+ |
| 61 |
+- |
| 62 |
+-if ! echo '.code16;.text;addr32 pushw 4(%esp)' | as -o dummy.o >/dev/null 2>&1; then |
| 63 |
++if ! echo '.code16;.text;addr32 pushw 4(%esp)' | $CC -c -x assembler -o dummy.o - >/dev/null 2>&1; then |
| 64 |
+ echo '' |
| 65 |
+ echo '*** error:' |
| 66 |
+ echo '*** Your system has no complete code16 functional gas,' |
Archives