mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-12-19 16:38:01 +00:00
386fb9660bUpstream did not use a consistent versioning scheme. Releases progressed like this: 2.43 -> 2.5 -> 2.6.0 -> .. -> 2.7.0 -> 2.7.1 -> 2.8 -> 2.81 -> 2.82 Gentoo versioning was changed from version 2.70 to 2.7.0 (see commit f90946f91c88 in archive/repo/gentoo-2.git) with the rationale: "change Ebuild name, so we can get rid of MY_PV variable". The current e3 announces itself as "MicroEditor e3 v2.82-UTF8", and both the tarball and its top-level directory are named e3-2.82. If upstream should ever publish a 2.9 release, we could use 2.90 as package version. Signed-off-by: Ulrich Müller <ulm@gentoo.org>
36 lines
897 B
Diff
36 lines
897 B
Diff
--- e3-2.82-orig/Makefile
|
|
+++ e3-2.82/Makefile
|
|
@@ -17,6 +17,8 @@
|
|
NASM_OR_YASM=nasm
|
|
#NASM_OR_YASM=yasm
|
|
|
|
+LD=ld
|
|
+
|
|
EXMODE=SED
|
|
|
|
#----------------------do not edit below line-------------------------------
|
|
@@ -41,12 +43,12 @@
|
|
|
|
32: $(ASOURCES) Makefile
|
|
ifeq ($(OS),LINUX)
|
|
- nasm -O2 -f bin -l e3.lst -o e3 e3.asm -DCRIPLED_ELF=1 -D$(OS) -D$(EXMODE)
|
|
+ nasm -O2 -f bin -l e3.lst -o e3 e3.asm -DCRIPLED_ELF=1 -D$(OS)
|
|
chmod +x e3
|
|
else
|
|
echo $(ASVER)
|
|
- nasm -O2 $(AFLAGS) -o e3.o e3.asm -l e3.lst -D$(OS) -D$(EXMODE)
|
|
- ld -s -o e3 e3.o
|
|
+ nasm -O2 $(AFLAGS) -o e3.o e3.asm -l e3.lst -D$(OS)
|
|
+ $(LD) -s -o e3 e3.o
|
|
strip --remove-section .comment e3
|
|
endif
|
|
ln -sf e3 e3ws
|
|
@@ -60,7 +62,7 @@
|
|
64: $(ASOURCES) Makefile
|
|
cat e3.asm | sed -f e3_32to64.sed >e3.tmp
|
|
$(ASSEMBLER64)
|
|
- ld -b elf64-x86-64 --oformat elf64-x86-64 -o e3 e3.o
|
|
+ $(LD) -o e3 e3.o
|
|
ifneq ($(DEBUG),true)
|
|
strip e3
|
|
endif
|