public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/dosemu/, app-emulation/dosemu/files/
@ 2016-10-29 10:34 Sergei Trofimovich
  0 siblings, 0 replies; 6+ messages in thread
From: Sergei Trofimovich @ 2016-10-29 10:34 UTC (permalink / raw
  To: gentoo-commits

commit:     7e2bd3a587a5adee7d7482310ff93ce0fdc7a0b2
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 10:30:51 2016 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Oct 29 10:34:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e2bd3a5

app-emulation/dosemu: drop old

Package-Manager: portage-2.3.2

 app-emulation/dosemu/Manifest                      |  1 -
 .../dosemu/dosemu-1.4.1_pre20091009.ebuild         | 65 ----------------------
 .../files/dosemu-1.4.1_pre20091009-fix-glibc.patch | 35 ------------
 .../files/dosemu-1.4.1_pre20091009-flex.patch      | 45 ---------------
 4 files changed, 146 deletions(-)

diff --git a/app-emulation/dosemu/Manifest b/app-emulation/dosemu/Manifest
index 166c308..b23f68f 100644
--- a/app-emulation/dosemu/Manifest
+++ b/app-emulation/dosemu/Manifest
@@ -1,3 +1,2 @@
-DIST dosemu-1.4.1_pre20091009.tar.bz2 1965194 SHA256 bf57f3a567008892fcaf0a58f69aae37a4b251f08855968958fa8fc6c06b1d4b SHA512 45aa0fff97f11270a50f9d5f10ec0be137e585c33a163e2b3318e924fe60f6aff90433fa52e90a5f8f9f1557b69720c4750ea685f3f72b644345021a01efc6ae WHIRLPOOL 607a1f92a60f31540d9e7e4033ef913d115a1e2f0a578e4083f8b55c2d0144352fe9f04273dfe953f80ad7bf38dab901dc6b7a4fce2ea3b0676329837b2719cb
 DIST dosemu-1.4.1_pre20130107.zip 2767256 SHA256 072e1d8ea9c574b02e556d926a287c9c55b82384ed652bb8dd6f3488801901aa SHA512 eb8dcb914a74b235f2b37ff4dd5c1c84b4916ff195c7bf76cdbe6a4d5e6247c57297eef0c579f219ff7f475e727d66fa5a0f314da46d79cc97a0d794e9ad5864 WHIRLPOOL d2835f82515e40d3c85c1ee53c7add5ba055637864ee63997ec912f53862006e33b4139a253b98cb76ca3cdbd7bdca6614609d9e8e716b074283e77cd8105e3c
 DIST dosemu-freedos-1.0-bin.tgz 1205628 SHA256 080c306a1b611e1861fd64466062f268eb44d2bf38082b8a57efadb5a9c0ebc7 SHA512 d0c4235ceac55de63ce5f72e51b7d57a82b8104f4bf2df6f4dc25c9889d3337b40d75665c2dfc98492ec7123e0959a725f5c7579e145895024bd80a07036e3bd WHIRLPOOL 9e6acf38dc8fafe95a49baaaac2a97fdd02c508b7c30c60823f8af7f44aa62b8d82c92661640b4cef05fcdbea401fafea752ec4a0e439a8eff361dd41aa392d3

diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20091009.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20091009.ebuild
deleted file mode 100644
index 39b9815..00000000
--- a/app-emulation/dosemu/dosemu-1.4.1_pre20091009.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit autotools eutils flag-o-matic
-
-P_FD="dosemu-freedos-1.0-bin"
-DESCRIPTION="DOS Emulator"
-HOMEPAGE="http://www.dosemu.org/"
-SRC_URI="mirror://sourceforge/dosemu/${P_FD}.tgz
-	mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="X svga gpm debug alsa sndfile"
-
-RDEPEND="X? ( x11-libs/libXxf86vm
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-apps/xset
-		x11-apps/xlsfonts
-		x11-apps/bdftopcf
-		x11-apps/mkfontdir )
-	svga? ( media-libs/svgalib )
-	gpm? ( sys-libs/gpm )
-	alsa? ( media-libs/alsa-lib )
-	sndfile? ( media-libs/libsndfile )
-	>=sys-libs/slang-1.4"
-
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xf86dgaproto )
-	>=sys-devel/autoconf-2.57"
-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
-
-	unset KERNEL
-
-	econf `use_with X x` \
-		`use_enable svga svgalib` \
-		`use_enable debug` \
-		`use_with gpm` \
-		`use_with alsa` \
-		`use_with sndfile` \
-		--with-fdtarball="${DISTDIR}"/${P_FD}.tgz \
-		--sysconfdir=/etc/dosemu/ \
-		--with-docdir=/usr/share/doc/${PF} || die
-
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	# Don't remove COPYING, see bug #137286
-	dodoc BUGS ChangeLog COPYING NEWS README THANKS || die #nowarn
-}

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
deleted file mode 100644
index 62a4319..00000000
--- a/app-emulation/dosemu/files/dosemu-1.4.1_pre20091009-fix-glibc.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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
- 

diff --git a/app-emulation/dosemu/files/dosemu-1.4.1_pre20091009-flex.patch b/app-emulation/dosemu/files/dosemu-1.4.1_pre20091009-flex.patch
deleted file mode 100644
index 7e8e291..00000000
--- a/app-emulation/dosemu/files/dosemu-1.4.1_pre20091009-flex.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Gentoo-bug: http://bugs.gentoo.org/437074
-
-commit 81232816b90e85488d7f11f96b8fcdc5f4988c93
-Author: Stas Sergeev <stsp@users.sourceforge.net>
-Date:   Sun Oct 14 19:51:09 2012 +0400
-
-    remove prototypes for lex-generated functions
-
-diff --git a/src/base/init/lexer.h b/src/base/init/lexer.h
-index 65b3ab8..082f08c 100644
---- a/src/base/init/lexer.h
-+++ b/src/base/init/lexer.h
-@@ -1,4 +1,4 @@
--/* 
-+/*
-  * (C) Copyright 1992, ..., 2007 the "DOSEMU-Development-Team".
-  *
-  * for details see file COPYING.DOSEMU in the DOSEMU distribution
-@@ -6,7 +6,9 @@
- 
- /*
-  * We are intercepting the yylex() function calls from the parser
-- */ 
-+ */
-+#ifndef LEXER_H
-+#define LEXER_H
- #define OUR_YY_DECL int yylex (YYSTYPE* yylval)
- OUR_YY_DECL;
- 
-@@ -27,14 +29,4 @@ extern int include_lines[];
- extern int line_count;
- extern int last_include;
- 
--extern int yyget_lineno(void);
--extern void yyset_lineno(int line_number);
--extern void yyset_out(FILE * out_str);
--extern void yyset_in(FILE * out_str);
--extern void yyset_debug(int bdebug );
--extern int yyget_debug(void);
--extern int yylex_destroy(void);
--extern FILE* yyget_in(void);
--extern FILE* yyget_out(void);
--extern int yyget_leng(void);
--extern char *yyget_text(void);
-+#endif


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/dosemu/, app-emulation/dosemu/files/
@ 2016-10-29 10:34 Sergei Trofimovich
  0 siblings, 0 replies; 6+ messages in thread
From: Sergei Trofimovich @ 2016-10-29 10:34 UTC (permalink / raw
  To: gentoo-commits

commit:     4eeb3971eb856b8fdece1185f119a296d287cc2d
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 10:04:31 2016 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Oct 29 10:34:39 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4eeb3971

app-emulation/dosemu: tweak to support non-bash '/bin/sh'

Package-Manager: portage-2.3.2

 app-emulation/dosemu/dosemu-1.4.1_pre20091009.ebuild           |  3 ++-
 app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild        |  3 ++-
 app-emulation/dosemu/files/dosemu-1.4.1_pre20091009-dash.patch | 10 ++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20091009.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20091009.ebuild
index 8361552..5a56b8d 100644
--- a/app-emulation/dosemu/dosemu-1.4.1_pre20091009.ebuild
+++ b/app-emulation/dosemu/dosemu-1.4.1_pre20091009.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -35,6 +35,7 @@ S="${WORKDIR}/${PN}"
 
 src_compile() {
 	epatch "${FILESDIR}"/${P}-flex.patch #437074
+	epatch "${FILESDIR}"/${P}-dash.patch
 
 	# Has problems with -O3 on some systems
 	replace-flags -O[3-9] -O2

diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild
index 1021590..4f04b5d 100644
--- a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild
+++ b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -45,6 +45,7 @@ S="${WORKDIR}/${PN}-code-${COMMIT}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-fortify.patch
+	epatch "${FILESDIR}"/${PN}-1.4.1_pre20091009-dash.patch
 
 	# 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-dash.patch b/app-emulation/dosemu/files/dosemu-1.4.1_pre20091009-dash.patch
new file mode 100644
index 00000000..c48712e
--- /dev/null
+++ b/app-emulation/dosemu/files/dosemu-1.4.1_pre20091009-dash.patch
@@ -0,0 +1,10 @@
+Dash does not support 'echo -n' and breaks default config sourcing.
+diff --git a/default-configure b/default-configure
+index 9e4b78b..a749f63 100755
+--- a/default-configure
++++ b/default-configure
+@@ -30,3 +30,3 @@ done
+ CONF=`cat $CONF_FILE`
+-CONF=`echo -n "$CONF"| sed '/^config {/d' | sed '/^}/d' | tr '\n' ' ' `
++CONF=`printf "%s" "$CONF"| sed '/^config {/d' | sed '/^}/d' | tr '\n' ' ' `
+ 


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/dosemu/, app-emulation/dosemu/files/
@ 2017-07-05 21:37 Sergei Trofimovich
  0 siblings, 0 replies; 6+ messages in thread
From: Sergei Trofimovich @ 2017-07-05 21:37 UTC (permalink / raw
  To: gentoo-commits

commit:     60c042fa6d30842870a81da6090fc39960304a27
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  5 21:36:33 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Jul  5 21:37:01 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60c042fa

app-emulation/dosemu: workaround ld.gold linking bug #618366

Reported-by: Martin Väth
Bug: https://bugs.gentoo.org/618366
Bug: https://sourceware.org/PR21518
Package-Manager: Portage-2.3.6, Repoman-2.3.2

 .../dosemu/dosemu-1.4.1_pre20130107-r4.ebuild      | 103 +++++++++++++++++++++
 .../dosemu-1.4.1_pre20130107-fix-inline.patch      |  14 +++
 .../dosemu-1.4.1_pre20130107-ia16-ldflags.patch    |  45 +++++++++
 3 files changed, 162 insertions(+)

diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r4.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r4.ebuild
new file mode 100644
index 00000000000..67e228d9794
--- /dev/null
+++ b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r4.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic pax-utils toolchain-funcs
+
+P_FD="dosemu-freedos-1.0-bin"
+COMMIT="15cfb41ff20a052769d753c3262c57ecb050ad71"
+
+DESCRIPTION="DOS Emulator"
+HOMEPAGE="http://www.dosemu.org/"
+SRC_URI="mirror://sourceforge/dosemu/${P_FD}.tgz
+	https://sourceforge.net/code-snapshots/git/d/do/dosemu/code.git/dosemu-code-${COMMIT}.zip -> ${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="X svga gpm debug alsa sndfile fluidsynth"
+
+RDEPEND="X? ( x11-libs/libX11
+		x11-libs/libXxf86vm
+		x11-libs/libXau
+		x11-libs/libXext
+		x11-libs/libXdmcp
+		x11-apps/xset
+		x11-apps/xlsfonts
+		x11-apps/bdftopcf
+		x11-apps/mkfontdir )
+	svga? ( media-libs/svgalib )
+	gpm? ( sys-libs/gpm )
+	alsa? ( media-libs/alsa-lib )
+	sndfile? ( media-libs/libsndfile )
+	fluidsynth? ( media-sound/fluidsynth
+		media-sound/fluid-soundfont )
+	media-libs/libsdl
+	>=sys-libs/slang-1.4"
+
+DEPEND="${RDEPEND}
+	X? ( x11-proto/xf86dgaproto )
+	>=sys-devel/autoconf-2.57"
+
+S="${WORKDIR}/${PN}-code-${COMMIT}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fortify.patch
+	"${FILESDIR}"/${PN}-1.4.1_pre20091009-dash.patch
+	"${FILESDIR}"/${P}-no-glibc.patch
+	"${FILESDIR}"/${P}-flex-2.6.3.patch
+	"${FILESDIR}"/${P}-ia16-ldflags.patch
+	"${FILESDIR}"/${P}-fix-inline.patch
+)
+
+src_prepare() {
+	default
+
+	# Has problems with -O3 on some systems
+	replace-flags -O[3-9] -O2
+
+	# This one is from media-sound/fluid-soundfont (bug #479534)
+	sed "s,/usr/share/soundfonts/default.sf2,${EPREFIX}/usr/share/sounds/sf2/FluidR3_GM.sf2,"\
+		-i src/plugin/fluidsynth/mid_o_flus.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# workaround binutils ld.gold bug #618366
+	local nopie_flag=
+	if tc-enables-pie; then
+		if gcc-specs-pie; then
+			# before gcc got upstream support for '-no-pie'
+			nopie_flag=-nopie
+		else
+			nopie_flag=-no-pie
+		fi
+	fi
+
+	econf $(use_with X x) \
+		$(use_with svga svgalib) \
+		$(use_enable debug) \
+		$(use_with gpm) \
+		$(use_with alsa) \
+		$(use_with sndfile) \
+		$(use_with fluidsynth) \
+		--with-fdtarball="${DISTDIR}"/${P_FD}.tgz \
+		--sysconfdir="${EPREFIX}"/etc/dosemu/ \
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		IA16_LDFLAGS_EXTRA=${nopie_flag}
+}
+
+src_compile() {
+	emake AR=$(tc-getAR)
+}
+
+src_install() {
+	default
+
+	# r - randmmap: dosemu tries to get address mapping
+	#     exactly where asked, loops otherwise.
+	# m - allow RWX mapping: as it's an emulator / code loader
+	pax-mark -mr "${ED}/usr/bin/dosemu.bin"
+}

diff --git a/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-fix-inline.patch b/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-fix-inline.patch
new file mode 100644
index 00000000000..9a515941b81
--- /dev/null
+++ b/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-fix-inline.patch
@@ -0,0 +1,14 @@
+diff --git a/src/dosext/sound/sound.c b/src/dosext/sound/sound.c
+index f33f78f..f429362 100644
+--- a/src/dosext/sound/sound.c
++++ b/src/dosext/sound/sound.c
+@@ -173,3 +173,3 @@ void sb_cms_write (ioport_t port, Bit8u value);
+ 
+-inline void sb_mixer_register_write (Bit8u value);
++static inline void sb_mixer_register_write (Bit8u value);
+ void sb_mixer_data_write (Bit8u value);
+@@ -840,3 +840,3 @@ void sb_cms_write (ioport_t port, Bit8u value)
+ 
+-inline void sb_mixer_register_write (Bit8u value)
++static inline void sb_mixer_register_write (Bit8u value)
+ {

diff --git a/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-ia16-ldflags.patch b/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-ia16-ldflags.patch
new file mode 100644
index 00000000000..0e2393cc274
--- /dev/null
+++ b/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-ia16-ldflags.patch
@@ -0,0 +1,45 @@
+Add a @IA16_LDFLAGS_EXTRA@ environment variable
+to be able to pass through -no-pie.
+
+It's a workaround for binutils ld.gold bug:
+https://bugs.gentoo.org/618366
+diff --git a/Makefile.conf.in b/Makefile.conf.in
+index cd4b34d..cc29931 100644
+--- a/Makefile.conf.in
++++ b/Makefile.conf.in
+@@ -55,2 +55,4 @@ ALL_LDFLAGS:=@DOSEMU_LDFLAGS@ ${LDFLAGS}
+ DOSBIN_LDFLAGS:=@DOSBIN_LDFLAGS@
++# flags to "link" 16-bit .com files
++IA16_LDFLAGS:=-Wl,-Ttext,0x100,-e,_start16,--oformat,binary -nostdlib -s @IA16_LDFLAGS_EXTRA@
+ LIBS:=@LIBS@
+diff --git a/configure.ac b/configure.ac
+index 0f06f57..a86208e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -604,2 +604,3 @@ AC_SUBST(X_LIBS)
+ AC_SUBST(X_CFLAGS)
++AC_SUBST(IA16_LDFLAGS_EXTRA)
+ 
+diff --git a/src/commands/Makefile b/src/commands/Makefile
+index 3139b85..c5c4607 100644
+--- a/src/commands/Makefile
++++ b/src/commands/Makefile
+@@ -56,3 +56,3 @@ dosbin: $(COM1) $(COM2) $(SYS)
+ $(D)/%.sys: %.o
+-	$(LD) $(ALL_LDFLAGS) -Wl,-Ttext,0,-e,_start16,--oformat,binary -nostdlib -s -o $@ $<
++	$(LD) $(ALL_LDFLAGS) $(IA16_LDFLAGS) -o $@ $<
+ 	chmod -x $@ 
+@@ -60,3 +60,3 @@ $(D)/%.sys: %.o
+ $(D)/%.com: %.o
+-	$(LD) $(ALL_LDFLAGS) -Wl,-Ttext,100,-e,_start16,--oformat,binary -nostdlib -s -o $@ $<
++	$(LD) $(ALL_LDFLAGS) $(IA16_LDFLAGS) -o $@ $<
+ 	chmod -x $@
+diff --git a/src/plugin/commands/Makefile b/src/plugin/commands/Makefile
+index 48f49d5..d3a5667 100644
+--- a/src/plugin/commands/Makefile
++++ b/src/plugin/commands/Makefile
+@@ -57,3 +57,3 @@ $(STUBFULL): $(D)/generic.com ./mkcomstub
+ $(D)/%.com: %.o
+-	$(LD) $(ALL_LDFLAGS) -Wl,-Ttext,0x100,-e,_start16,--oformat,binary -nostdlib -s -o $@ $<
++	$(LD) $(ALL_LDFLAGS) $(IA16_LDFLAGS) -o $@ $<
+ 	chmod -x $@


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/dosemu/, app-emulation/dosemu/files/
@ 2017-11-04 10:19 Sergei Trofimovich
  0 siblings, 0 replies; 6+ messages in thread
From: Sergei Trofimovich @ 2017-11-04 10:19 UTC (permalink / raw
  To: gentoo-commits

commit:     26a7caea7e40a8bcda903705376cc9209dced9fa
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  4 10:16:08 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Nov  4 10:19:20 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26a7caea

app-emulation/dosemu: unbreak misaligned .sys files,  bug #631190

In bug #618366 I've added -no-pie LDFLAGS propagation to 16-bit targets
but did not notice dosemu has different varying base addresses for
different .com files (and I've overlooked 0-based .sys rules).

Specifying wrong base address caused incorrect jump offsets
into the final binary. That caused crash and hangup of cdrom.sys
driver.

This change restores original base addresses.

Reported-by: Tom
Reported-by: Robert Gill
Bug: https://bugs.gentoo.org/631190
Package-Manager: Portage-2.3.13, Repoman-2.3.4
RepoMan-Options: --force

 ...e20130107-r4.ebuild => dosemu-1.4.1_pre20130107-r5.ebuild} |  0
 .../dosemu/files/dosemu-1.4.1_pre20130107-ia16-ldflags.patch  | 11 +++++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r4.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
similarity index 100%
rename from app-emulation/dosemu/dosemu-1.4.1_pre20130107-r4.ebuild
rename to app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild

diff --git a/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-ia16-ldflags.patch b/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-ia16-ldflags.patch
index 0e2393cc274..f8c05622571 100644
--- a/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-ia16-ldflags.patch
+++ b/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-ia16-ldflags.patch
@@ -7,10 +7,9 @@ diff --git a/Makefile.conf.in b/Makefile.conf.in
 index cd4b34d..cc29931 100644
 --- a/Makefile.conf.in
 +++ b/Makefile.conf.in
-@@ -55,2 +55,4 @@ ALL_LDFLAGS:=@DOSEMU_LDFLAGS@ ${LDFLAGS}
+@@ -55,2 +55,3 @@ ALL_LDFLAGS:=@DOSEMU_LDFLAGS@ ${LDFLAGS}
  DOSBIN_LDFLAGS:=@DOSBIN_LDFLAGS@
-+# flags to "link" 16-bit .com files
-+IA16_LDFLAGS:=-Wl,-Ttext,0x100,-e,_start16,--oformat,binary -nostdlib -s @IA16_LDFLAGS_EXTRA@
++IA16_LDFLAGS_EXTRA:=@IA16_LDFLAGS_EXTRA@
  LIBS:=@LIBS@
 diff --git a/configure.ac b/configure.ac
 index 0f06f57..a86208e 100644
@@ -27,12 +26,12 @@ index 3139b85..c5c4607 100644
 @@ -56,3 +56,3 @@ dosbin: $(COM1) $(COM2) $(SYS)
  $(D)/%.sys: %.o
 -	$(LD) $(ALL_LDFLAGS) -Wl,-Ttext,0,-e,_start16,--oformat,binary -nostdlib -s -o $@ $<
-+	$(LD) $(ALL_LDFLAGS) $(IA16_LDFLAGS) -o $@ $<
++	$(LD) $(ALL_LDFLAGS) -Wl,-Ttext,0,-e,_start16,--oformat,binary -nostdlib -s $(IA16_LDFLAGS_EXTRA) -o $@ $<
  	chmod -x $@ 
 @@ -60,3 +60,3 @@ $(D)/%.sys: %.o
  $(D)/%.com: %.o
 -	$(LD) $(ALL_LDFLAGS) -Wl,-Ttext,100,-e,_start16,--oformat,binary -nostdlib -s -o $@ $<
-+	$(LD) $(ALL_LDFLAGS) $(IA16_LDFLAGS) -o $@ $<
++	$(LD) $(ALL_LDFLAGS) -Wl,-Ttext,100,-e,_start16,--oformat,binary -nostdlib -s $(IA16_LDFLAGS_EXTRA) -o $@ $<
  	chmod -x $@
 diff --git a/src/plugin/commands/Makefile b/src/plugin/commands/Makefile
 index 48f49d5..d3a5667 100644
@@ -41,5 +40,5 @@ index 48f49d5..d3a5667 100644
 @@ -57,3 +57,3 @@ $(STUBFULL): $(D)/generic.com ./mkcomstub
  $(D)/%.com: %.o
 -	$(LD) $(ALL_LDFLAGS) -Wl,-Ttext,0x100,-e,_start16,--oformat,binary -nostdlib -s -o $@ $<
-+	$(LD) $(ALL_LDFLAGS) $(IA16_LDFLAGS) -o $@ $<
++	$(LD) $(ALL_LDFLAGS) -Wl,-Ttext,0x100,-e,_start16,--oformat,binary -nostdlib -s $(IA16_LDFLAGS_EXTRA) -o $@ $<
  	chmod -x $@


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/dosemu/, app-emulation/dosemu/files/
@ 2020-05-22 17:24 Sergei Trofimovich
  0 siblings, 0 replies; 6+ messages in thread
From: Sergei Trofimovich @ 2020-05-22 17:24 UTC (permalink / raw
  To: gentoo-commits

commit:     58f5f8585fb5482e5b42de36a3730552ed003859
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri May 22 17:23:50 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri May 22 17:24:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58f5f858

app-emulation/dosemu: don't use 'as' to test assembler, bug #722176

Instead of probing for 'as' use '$CC'. Build system uses '$CC'
to compile '.S' files.

Reported-by: Agostino Sarubbo
Closes: https://bugs.gentoo.org/722176
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild      |  4 +++-
 app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-as.patch | 12 ++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
index f2516914456..c7771af9cd8 100644
--- a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
+++ b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2002-2019 Gentoo Authors
+# Copyright 2002-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -55,6 +55,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-ia16-ldflags.patch
 	"${FILESDIR}"/${P}-fix-inline.patch
 	"${FILESDIR}"/${P}-lto.patch
+	"${FILESDIR}"/${P}-as.patch
 )
 
 src_prepare() {
@@ -97,6 +98,7 @@ src_configure() {
 }
 
 src_compile() {
+	# src/makefile.common is fritten manually, uses AR=ar
 	emake AR=$(tc-getAR)
 }
 

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
new file mode 100644
index 00000000000..2db3048be39
--- /dev/null
+++ b/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-as.patch
@@ -0,0 +1,12 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -503,8 +503,7 @@ dnl CPU emulator
+    AC_MSG_NOTICE(Compiling for native x86...);
+   fi
+ 
+-
+-if ! echo '.code16;.text;addr32 pushw 4(%esp)' | as -o dummy.o >/dev/null 2>&1; then
++if ! echo '.code16;.text;addr32 pushw 4(%esp)' | $CC -c -x assembler -o dummy.o - >/dev/null 2>&1; then
+   echo ''
+   echo '*** error:'
+   echo '*** Your system has no complete code16 functional gas,'


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/dosemu/, app-emulation/dosemu/files/
@ 2020-12-31 14:00 Sergei Trofimovich
  0 siblings, 0 replies; 6+ messages in thread
From: Sergei Trofimovich @ 2020-12-31 14:00 UTC (permalink / raw
  To: gentoo-commits

commit:     0e56106a0e898af399438fefd237e1479ce0ef85
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 31 14:00:33 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Dec 31 14:00:49 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e56106a

app-emulation/dosemu: lookup tool-prefixed nm

While at it allow user's NM.

Reported-by: Agostino Sarubbo
Closes: https://bugs.gentoo.org/762778
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 .../dosemu/dosemu-1.4.1_pre20130107-r5.ebuild      |  1 +
 .../dosemu/files/dosemu-1.4.1_pre20130107-nm.patch | 44 ++++++++++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
index 5700973fde6..409834bb73d 100644
--- a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
+++ b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
@@ -56,6 +56,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-fix-inline.patch
 	"${FILESDIR}"/${P}-lto.patch
 	"${FILESDIR}"/${P}-as.patch
+	"${FILESDIR}"/${P}-nm.patch
 )
 
 pkg_pretend() {

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
new file mode 100644
index 00000000000..73bfd9dfbc5
--- /dev/null
+++ b/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-nm.patch
@@ -0,0 +1,44 @@
+https://bugs.gentoo.org/762778
+--- a/Makefile.conf.in
++++ b/Makefile.conf.in
+@@ -82,6 +82,8 @@ REQUIRED:=@REQUIRED@
+ OS=@CONFIG_HOST@
+ RANLIB:=@RANLIB@
+ 
++NM:=@NM@
++
+ @ASPI_SUPPORT@
+ @USE_DL_PLUGINS@
+ @USE_APBUILD@
+--- a/configure.ac
++++ b/configure.ac
+@@ -39,6 +39,7 @@ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+ AC_PROG_RANLIB
+ AC_PROG_YACC
++AC_CHECK_TOOL(NM, nm)
+ dnl The bison problem
+ if test -z "`echo $YACC | grep bison`" ; then
+   AC_MSG_WARN( )
+--- a/src/arch/linux/Makefile.main
++++ b/src/arch/linux/Makefile.main
+@@ -80,7 +80,7 @@ emu.o: emu.c
+ $(BINPATH)/bin/$(DOSBIN): emu.o $(LIBS_)
+ 	$(LD) $(ALL_LDFLAGS) $(DOSBIN_LDFLAGS) -o $@ emu.o \
+ 	   -Wl,--whole-archive $(LIBS_) -Wl,--no-whole-archive $(LIBS)
+-	@nm $(BINPATH)/bin/$(DOSBIN) | grep -v '\(compiled\)\|\(\.o$$\)\|\( a \)' | \
++	@$(NM) $(BINPATH)/bin/$(DOSBIN) | grep -v '\(compiled\)\|\(\.o$$\)\|\( a \)' | \
+ 		sort > $(BINPATH)/bin/dosemu.map
+ 	@ln -sf $(DOSBIN) $(BINPATH)/bin/dos
+ ifdef X_SUPPORT
+--- a/src/plugin/term/Makefile
++++ b/src/plugin/term/Makefile
+@@ -33,7 +33,7 @@ SLANGLIB:=`relaytool --partial-map partial.map --relay slang \
+ libslang.so.1-UTF8 libslang-utf8.so.1 libslang.so.1 $(SLANGLIB)`
+ 
+ partial.map: $(OBJS)
+-	nm $(OBJS) | LC_ALL=C grep SL | LC_ALL=C sort | LC_ALL=C uniq | \
++	$(NM) $(OBJS) | LC_ALL=C grep SL | LC_ALL=C sort | LC_ALL=C uniq | \
+ 	  LC_ALL=C sed -e 's/ *U \(SL[^_]*_[a-z0-9].*\)/F \1/' \
+ 	               -e 's/ *U \(SL[^_]*_[A-Z0-9].*\)/V \1/' > $@
+ 	echo 'F SLsmg_write_nwchars' >> $@


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-12-31 14:00 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-22 17:24 [gentoo-commits] repo/gentoo:master commit in: app-emulation/dosemu/, app-emulation/dosemu/files/ Sergei Trofimovich
  -- strict thread matches above, loose matches on Subject: below --
2020-12-31 14:00 Sergei Trofimovich
2017-11-04 10:19 Sergei Trofimovich
2017-07-05 21:37 Sergei Trofimovich
2016-10-29 10:34 Sergei Trofimovich
2016-10-29 10:34 Sergei Trofimovich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox