set avx flag and clean PKGBUILD

2 files changed, 9 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5b4da512bd52..b1239b7a00b2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Nov 13 23:09:28 UTC 2017
+# Tue Nov 14 18:13:22 UTC 2017
 pkgbase = j8-git
 	pkgdesc = J is a modern, high-level, general-purpose, high-performance programming language
-	pkgver = 8.06.09.20171113
+	pkgver = 8.06.09.20171114
 	pkgrel = 1
 	url = http://www.jsoftware.com
 	install = j8-git.install
diff --git a/PKGBUILD b/PKGBUILD
index d8b561d2a8b5..36cb713ca261 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Lorenzo Tomei <tomeil@tiscali.it>
 
 pkgname=j8-git
-pkgver=8.06.09.20171113
+pkgver=8.06.09.20171114
 pkgrel=1
 pkgdesc='J is a modern, high-level, general-purpose, high-performance programming language'
 arch=('i686' 'x86_64')
@@ -20,9 +20,11 @@ install=j8-git.install
 if [ "${CARCH}" = x86_64 ]; then
 _xarch=x86_64
 _jarch=j64
+_avx=avx
 else
 _xarch=x86
 _jarch=j32
+_avx=''
 fi
 
 pkgver() {
@@ -40,19 +42,11 @@ echo '#define jbuilder "www.jsoftware.com"' >> jsrc/jversion.h
 sed -i "s@jgit=~/gitdev/jsource@jgit=${srcdir}/jsource-master@" make/jvars.sh
 sed -i "s@jbld=~/jbld@jbld=${srcdir}/jsource-master/jbld@" make/jvars.sh
 sed -i "s@cd ~@cd ${srcdir}/jsource-master@" make/build_jconsole.sh
-sed -i "s@\$jgit/unix/libedit.a@-ledit@" make/build_jconsole.sh
-sed -i "s@\$jgit/unix/libedit64.a@-ledit@" make/build_jconsole.sh
+sed -i "s@-l:libedit.so.2@-ledit@" make/build_jconsole.sh
 sed -i "s@cd ~@cd ${srcdir}/jsource-master@" make/build_libj.sh
 sed -i "s@cd ~@cd ${srcdir}/jsource-master@" make/domake.sh
 sed -i "s@else if(_isnan(@// else if(_isnan(@" jsrc/f2.c
 cp make/jvars.sh ./
-cd ${srcdir}/qtide-master
-sed -i 's@QString f=cfpath(tofoldername(editPage()->fname));@QString f=cfpath(tofoldername(editPage()->fname)), px="~";@' lib/base/menu.cpp
-sed -i 's@if ("~"==f.at(0))@if (px.at(0)==f.at(0))@' lib/base/menu.cpp
-sed -i 's@QString id=tofoldername(s);@QString id=tofoldername(s), px="~";@' lib/base/pnew.cpp
-sed -i 's@if ("~"==id.at(0))@if (px.at(0)==id.at(0))@' lib/base/pnew.cpp
-sed -i 's@QString s=cpath(f);@QString s=cpath(f), px="~";@' lib/base/utils.cpp
-sed -i 's@if ("~"==s.at(0))@if (px.at(0)==s.at(0))@' lib/base/utils.cpp
 }
 
 build() {
@@ -63,7 +57,7 @@ mkdir -p jbld/jout
 mkdir jbld/${_jarch}
 cp -r jlibrary/* jbld/${_jarch}
 make/build_jconsole.sh ${_jarch}
-make/build_libj.sh ${_jarch}
+make/build_libj.sh ${_jarch}${_avx}
 # qtide
 cd ${srcdir}/qtide-master/lib
 qmake && make
@@ -74,7 +68,8 @@ qmake && make
 package() {
 cd ${srcdir}
 cp -a jenv/* ${pkgdir}/
-cp -a jsource-master/jbld/${_jarch}/bin/{jconsole,libj.so} ${pkgdir}/usr/lib/j8/bin/
+cp -a jsource-master/jbld/${_jarch}/bin/jconsole ${pkgdir}/usr/lib/j8/bin/jconsole
+cp -a jsource-master/jbld/${_jarch}/bin/libj${_avx}.so ${pkgdir}/usr/lib/j8/bin/libj.so
 cp -a qtide-master/bin/linux-${_xarch}/release/*  ${pkgdir}/usr/lib/j8/bin/
 echo "${pkgname}-${pkgver}-${pkgrel}-${CARCH}.pkg.tar.xz (Arch Linux package)" > ${pkgdir}/usr/lib/j8/bin/installer.txt
 }