summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD31
2 files changed, 8 insertions, 28 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 147cbe8ebdf3..ef0a3e79f5f1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -3,11 +3,11 @@ pkgbase = j9-git
pkgver = r2388.ad0ca1c6
pkgrel = 1
url = http://www.jsoftware.com
- install = j9-git.install
arch = x86_64
license = GPL3
makedepends = git
makedepends = clang
+ makedepends = nasm
depends = qt5-webengine
depends = qt5-websockets
depends = qt5-multimedia
@@ -19,10 +19,7 @@ pkgbase = j9-git
optdepends = lapack: for math/lapack addon
source = j9-git::git+https://github.com/jsoftware/jsource.git#branch=master
source = qtide-git::git+https://github.com/jsoftware/qtide.git#branch=master
- source = jenv.tar.gz::http://www.databaserossoverde.it/jsoftware/j903_env_20201225.tar.gz
md5sums = SKIP
md5sums = SKIP
- md5sums = ad004c510a1b39a27107f03398759628
pkgname = j9-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 234aa7dd17a1..98faf9e16ce8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,36 +15,19 @@ optdepends=('wget: for web/gethttp addon'
'fftw: for math/fftw addon'
'lapack: for math/lapack addon')
makedepends=('git'
- 'clang')
+ 'clang'
+ 'nasm')
source=("${pkgname}::git+https://github.com/jsoftware/jsource.git#branch=master"
- 'qtide-git::git+https://github.com/jsoftware/qtide.git#branch=master'
- 'jenv.tar.gz::http://www.databaserossoverde.it/jsoftware/j903_env_20201225.tar.gz')
+ 'qtide-git::git+https://github.com/jsoftware/qtide.git#branch=master')
md5sums=('SKIP'
- 'SKIP'
- 'ad004c510a1b39a27107f03398759628')
-install="${pkgname}.install"
-
-pkgver() {
- cd "${pkgname}"
- printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-prepare() {
- cd "${srcdir}/${pkgname}"
- echo '#define jversion "903"' > jsrc/jversion.h
- echo '#define jplatform "linux"' >> jsrc/jversion.h
- echo '#define jtype "beta"' >> jsrc/jversion.h
- echo '#define jlicense "GPL3"' >> jsrc/jversion.h
- echo '#define jbuilder "AUR"' >> jsrc/jversion.h
-}
-
+ 'SKIP')
build() {
# jsource
cd "${srcdir}/${pkgname}/make2"
CC=clang
export CC
- . build_all.sh
- . cpbin.sh
+ ./build_all.sh
+ ./cpbin.sh
# qtide
cd "${srcdir}/qtide-git/lib"
qmake && make
@@ -54,7 +37,7 @@ build() {
package() {
cd "${srcdir}"
- cp -a jenv/* "${pkgdir}/"
+ mkdir -p "${pkgdir}/usr/lib/j9/bin"
cp -a "${pkgname}/jlibrary/bin/"* "${pkgdir}/usr/lib/j9/bin/"
cp -a "${pkgname}/bin/linux/"*/* "${pkgdir}/usr/lib/j9/bin/"
cp -a "qtide-git/bin/linux-${CARCH}/release/"* "${pkgdir}/usr/lib/j9/bin/"