[tyndur-devel] [PATCH] lbuilds: FASM 1.69.31
Max Reitz ·
+ FASM 1.69.31 für scripts/build_crosstools und als lbuild (scheint einen Exitcode ungleich 0 auch bei Erfolg zurückzugeben). Signed-off-by: Max Reitz <max at tyndur.org> --- lbuilds/fasm/1.69.31/fasm-1.69.31.lbuild | 33 ++++++++++++++++++++++++++++++ lbuilds/fasm/1.69.31/files/formats.patch | 4 +++ patches/fasm/1.69.09/formats.patch | 4 --- patches/fasm/1.69.31/formats.patch | 13 +++++++++++ scripts/build_crosstools | 4 +- 5 files changed, 52 insertions(+), 6 deletions(-) create mode 100644 lbuilds/fasm/1.69.31/fasm-1.69.31.lbuild create mode 100644 lbuilds/fasm/1.69.31/files/formats.patch delete mode 100644 patches/fasm/1.69.09/formats.patch create mode 100644 patches/fasm/1.69.31/formats.patch diff --git a/lbuilds/fasm/1.69.31/fasm-1.69.31.lbuild b/lbuilds/fasm/1.69.31/fasm-1.69.31.lbuild new file mode 100644 index 0000000..75bdb98 --- /dev/null +++ b/lbuilds/fasm/1.69.31/fasm-1.69.31.lbuild @@ -0,0 +1,33 @@ +include toolchain +include lutils + +DESCRIPTION="Der Flatassembler (Intelsyntax)" +HOMEPAGE="http://flatassembler.net/" +SRC_URI="http://flatassembler.net/${P}.tar.gz" + +LICENSE="Proprietary" + +BUILD_DEPEND="" +RUN_DEPEND="" + +MY_S="${S}/${P}" + +src_unpack() { +lunpack ${P}.tar.gz +cd fasm + + patch source/formats.inc ${F}/formats.patch || die "could not patch formats.inc" +} + +src_compile() { + cd fasm + fasm source/libc/fasm.asm fasm.o + i386-pc-tyndur-gcc fasm.o -o fasm || die "linking failed" + cd .. +} + +src_install() { + cd fasm + install -d ${D}${R}/bin + cp fasm ${D}${R}/bin || die "could not install fasm" +} diff --git a/lbuilds/fasm/1.69.31/files/formats.patch b/lbuilds/fasm/1.69.31/files/formats.patch new file mode 100644 index 0000000..8b8498b --- /dev/null +++ b/lbuilds/fasm/1.69.31/files/formats.patch @@ -0,0 +1,4 @@ +3628c3628 +< mov [image_base],8048000h +--- +> mov [image_base],40000000h diff --git a/patches/fasm/1.69.09/formats.patch b/patches/fasm/1.69.09/formats.patch deleted file mode 100644 index 7e4ec4b..0000000 --- a/patches/fasm/1.69.09/formats.patch +++ /dev/null @@ -1,4 +0,0 @@ -3606c3606 -< mov [image_base],8048000h ---- -> mov [image_base],40000000h diff --git a/patches/fasm/1.69.31/formats.patch b/patches/fasm/1.69.31/formats.patch new file mode 100644 index 0000000..29f01db --- /dev/null +++ b/patches/fasm/1.69.31/formats.patch @@ -0,0 +1,13 @@ +Index: cross-fasm/fasm/source/formats.inc +=================================================================== +--- cross-fasm.orig/fasm/source/formats.inc 2011-02-07 11:39:42.000000000 +0100 ++++ cross-fasm/fasm/source/formats.inc 2011-05-07 00:17:39.000000000 +0200 +@@ -3625,7 +3625,7 @@ + pop edx + mov [edx+7],al + elf_exe_brand_ok: +- mov [image_base],8048000h ++ mov [image_base],40000000h + cmp byte [esi],80h + jne elf_exe_base_ok + lods word [esi] diff --git a/scripts/build_crosstools b/scripts/build_crosstools index 827e883..b3589fd 100755 --- a/scripts/build_crosstools +++ b/scripts/build_crosstools @@ -16,7 +16,7 @@ GMP_VERSION=5.0.1 MPFR_VERSION=3.0.1 MPC_VERSION=0.8.2 FPC_VERSION=2.4.0 -FASM_VERSION=1.69.09 +FASM_VERSION=1.69.31 PREFIX=`pwd`/env TARGET=i386-pc-tyndur @@ -273,7 +273,7 @@ gcc -m32 fasm.o -o fasm || die "Fehler beim Linken des Linux-FASM." echo "[fasm] Patch anwenden..." patch source/formats.inc ${PATCHES}/fasm/${FASM_VERSION}/formats.patch || die "Fehler beim Anwenden des Patches." echo "[fasm] Assemblieren..." -./fasm source/libc/fasm.asm fasm.o || die "Fehler beim Assemblieren." +./fasm source/libc/fasm.asm fasm.o echo "[fasm] Týndur-FASM linken..." gcc -m32 fasm.o -o fasm || die "Fehler beim Linken des týndur-FASM." echo "[fasm] Installieren..." -- 1.7.5.2