[arch-commits] Commit in fasm/trunk (PKGBUILD)

[Levente Polyak]

    Date: Wednesday, July 19, 2017 @ 20:40:26
  Author: anthraxx
Revision: 245741

upgpkg: fasm 1.71.64-1

Modified:
  fasm/trunk/PKGBUILD

----------+
 PKGBUILD |   25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-19 20:18:11 UTC (rev 245740)
+++ PKGBUILD	2017-07-19 20:40:26 UTC (rev 245741)
@@ -6,8 +6,8 @@
 # Contributor: Luke McCarthy <luke at iogopro.co.uk>
 
 pkgname=fasm
-pkgver=1.71.60
-pkgrel=3
+pkgver=1.71.64
+pkgrel=1
 pkgdesc='Fast and efficient self-assembling x86 assembler for DOS, Windows and Linux operating systems'
 url='https://flatassembler.net/'
 arch=('i686' 'x86_64')
@@ -15,20 +15,25 @@
 depends_i686=('glibc')
 depends_x86_64=('lib32-glibc')
 source=(${pkgname}-${pkgver}.tgz::https://flatassembler.net/${pkgname}-${pkgver}.tgz)
-sha512sums=('6c31fd044a972cb694b84adbb2b18940d9256f12c4ad1acd466b2f9c99c3bc01bfa6daba434e480c7694be5a604809d5f0da8dc41ff09919f0a5f0dda9ad74b3')
+sha256sums=('df236d7bb141eff2e2e4d22fe03da08e279033e22f90235f058c21f2dabda6ee')
+sha512sums=('6255d959b93d306f2f003f61becefbea9b8c6ff43e22622278b0c19bd241c8a3f2c8f31a48af69b817c5212851b73d180b81ba16514aaab2ea5c846531095d70')
 
 build() {
   cd ${pkgname}
-  CFLAGS+=" -pie"
 
-  # compile fasm with itself
-  ./fasm source/libc/${pkgname}.asm
-  gcc -m32 ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -L/usr/lib32 source/libc/${pkgname}.o -o source/libc/${pkgname}
+  if [ "${CARCH}" == "x86_64" ]; then
+    SRCDIR=Linux/x64
+    ./fasm.x64 source/${SRCDIR}/fasm.asm
+  elif [ "${CARCH}" == "i686" ]; then
+    SRCDIR=Linux
+    ./fasm source/${SRCDIR}/fasm.asm
+  fi
+  mv source/${SRCDIR}/fasm ./fasm
 
   # tools
   local s
   for s in listing prepsrc symbols; do
-    ./source/libc/${pkgname} tools/libc/${s}.asm ${s}.o
+    ./fasm tools/libc/${s}.asm ${s}.o
     gcc -m32 ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o ${s} ${s}.o
   done
 }
@@ -36,11 +41,11 @@
 package() {
   cd ${pkgname}
 
-  install -Dm 755 source/libc/${pkgname} -t "${pkgdir}/usr/bin"
+  install -Dm 755 fasm -t "${pkgdir}/usr/bin"
   # tools
   local s
   for s in listing prepsrc symbols; do
-    install -Dm 755 ${s} "${pkgdir}/usr/bin/${pkgname}-${s}"
+    install -Dm 755 ${s} "${pkgdir}/usr/bin/fasm-${s}"
   done
 
   # docs