Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/dosemu/, app-emulation/dosemu/files/
Date: Thu, 31 Dec 2020 14:00:59
Message-Id: 1609423249.0e56106a0e898af399438fefd237e1479ce0ef85.slyfox@gentoo
1 commit: 0e56106a0e898af399438fefd237e1479ce0ef85
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 31 14:00:33 2020 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 31 14:00:49 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e56106a
7
8 app-emulation/dosemu: lookup tool-prefixed nm
9
10 While at it allow user's NM.
11
12 Reported-by: Agostino Sarubbo
13 Closes: https://bugs.gentoo.org/762778
14 Package-Manager: Portage-3.0.12, Repoman-3.0.2
15 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
16
17 .../dosemu/dosemu-1.4.1_pre20130107-r5.ebuild | 1 +
18 .../dosemu/files/dosemu-1.4.1_pre20130107-nm.patch | 44 ++++++++++++++++++++++
19 2 files changed, 45 insertions(+)
20
21 diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
22 index 5700973fde6..409834bb73d 100644
23 --- a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
24 +++ b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
25 @@ -56,6 +56,7 @@ PATCHES=(
26 "${FILESDIR}"/${P}-fix-inline.patch
27 "${FILESDIR}"/${P}-lto.patch
28 "${FILESDIR}"/${P}-as.patch
29 + "${FILESDIR}"/${P}-nm.patch
30 )
31
32 pkg_pretend() {
33
34 diff --git a/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-nm.patch b/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-nm.patch
35 new file mode 100644
36 index 00000000000..73bfd9dfbc5
37 --- /dev/null
38 +++ b/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-nm.patch
39 @@ -0,0 +1,44 @@
40 +https://bugs.gentoo.org/762778
41 +--- a/Makefile.conf.in
42 ++++ b/Makefile.conf.in
43 +@@ -82,6 +82,8 @@ REQUIRED:=@REQUIRED@
44 + OS=@CONFIG_HOST@
45 + RANLIB:=@RANLIB@
46 +
47 ++NM:=@NM@
48 ++
49 + @ASPI_SUPPORT@
50 + @USE_DL_PLUGINS@
51 + @USE_APBUILD@
52 +--- a/configure.ac
53 ++++ b/configure.ac
54 +@@ -39,6 +39,7 @@ AC_PROG_LN_S
55 + AC_PROG_MAKE_SET
56 + AC_PROG_RANLIB
57 + AC_PROG_YACC
58 ++AC_CHECK_TOOL(NM, nm)
59 + dnl The bison problem
60 + if test -z "`echo $YACC | grep bison`" ; then
61 + AC_MSG_WARN( )
62 +--- a/src/arch/linux/Makefile.main
63 ++++ b/src/arch/linux/Makefile.main
64 +@@ -80,7 +80,7 @@ emu.o: emu.c
65 + $(BINPATH)/bin/$(DOSBIN): emu.o $(LIBS_)
66 + $(LD) $(ALL_LDFLAGS) $(DOSBIN_LDFLAGS) -o $@ emu.o \
67 + -Wl,--whole-archive $(LIBS_) -Wl,--no-whole-archive $(LIBS)
68 +- @nm $(BINPATH)/bin/$(DOSBIN) | grep -v '\(compiled\)\|\(\.o$$\)\|\( a \)' | \
69 ++ @$(NM) $(BINPATH)/bin/$(DOSBIN) | grep -v '\(compiled\)\|\(\.o$$\)\|\( a \)' | \
70 + sort > $(BINPATH)/bin/dosemu.map
71 + @ln -sf $(DOSBIN) $(BINPATH)/bin/dos
72 + ifdef X_SUPPORT
73 +--- a/src/plugin/term/Makefile
74 ++++ b/src/plugin/term/Makefile
75 +@@ -33,7 +33,7 @@ SLANGLIB:=`relaytool --partial-map partial.map --relay slang \
76 + libslang.so.1-UTF8 libslang-utf8.so.1 libslang.so.1 $(SLANGLIB)`
77 +
78 + partial.map: $(OBJS)
79 +- nm $(OBJS) | LC_ALL=C grep SL | LC_ALL=C sort | LC_ALL=C uniq | \
80 ++ $(NM) $(OBJS) | LC_ALL=C grep SL | LC_ALL=C sort | LC_ALL=C uniq | \
81 + LC_ALL=C sed -e 's/ *U \(SL[^_]*_[a-z0-9].*\)/F \1/' \
82 + -e 's/ *U \(SL[^_]*_[A-Z0-9].*\)/V \1/' > $@
83 + echo 'F SLsmg_write_nwchars' >> $@