diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-11-10 00:43:02 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-11-10 00:43:02 +0000 |
commit | a5332b59346f7cbf0fdbd148b54aa8a84aaf8190 (patch) | |
tree | e6d8d3589fcd01fbc3f1286185639163daa81424 /app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-ia16-ldflags.patch | |
parent | fceeaf01a28ee71065cf3798b70b77d3bc4ef199 (diff) |
gentoo resync : 10.11.2017
Diffstat (limited to 'app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-ia16-ldflags.patch')
-rw-r--r-- | app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-ia16-ldflags.patch | 11 |
1 files changed, 5 insertions, 6 deletions
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 0e2393cc2741..f8c05622571c 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 $@ |