summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorb00rt00s2017-12-19 19:46:58 +0100
committerb00rt00s2017-12-19 19:46:58 +0100
commitfc332bd1bb873a7b6f12e43b316858ec37abf214 (patch)
treedf80757268c626f4aacd9041877f17090c40850d
parent60a667005cdb4514bed93d71a4ad86cd8c300ba8 (diff)
downloadaur-fc332bd1bb873a7b6f12e43b316858ec37abf214.tar.gz
updated build procedure
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD31
-rw-r--r--SConstruct.patch58
3 files changed, 15 insertions, 81 deletions
diff --git a/.SRCINFO b/.SRCINFO
index af74d99e98a..0df724bb736 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
pkgbase = gsas2-svn
pkgdesc = General Structure Analysis System II - refinement for powder diffraction patterns
- pkgver = 2912
- pkgrel = 2
+ pkgver = 3196
+ pkgrel = 1
url = https://subversion.xray.aps.anl.gov/trac/pyGSAS
arch = i686
arch = x86_64
license = unknown
makedepends = subversion
makedepends = scons
+ makedepends = python2-numpy
depends = python2
depends = python2-scipy
depends = python2-matplotlib
@@ -19,11 +20,9 @@ pkgbase = gsas2-svn
source = gsas2::svn+https://subversion.xray.aps.anl.gov/pyGSAS/trunk/
source = GSASII.desktop
source = rungsas2
- source = SConstruct.patch
md5sums = SKIP
md5sums = e9d06aed1866e65ce8259cfd5a31e1ce
md5sums = 62855c475e29b88b23a446ba4ffd91be
- md5sums = 3d4b6dd46d76b39b216e1fac0e72f916
pkgname = gsas2-svn
diff --git a/PKGBUILD b/PKGBUILD
index 120b60c6142..84a2bce7314 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,35 +3,33 @@
pkgname=gsas2-svn
_pkgname=gsas2
-pkgver=2912
-pkgrel=2
+pkgver=3196
+pkgrel=1
pkgdesc="General Structure Analysis System II - refinement for powder diffraction patterns"
arch=(i686 x86_64)
url="https://subversion.xray.aps.anl.gov/trac/pyGSAS"
license=(unknown)
depends=(python2 python2-scipy python2-matplotlib wxpython python2-opengl python2-numpy gcc-fortran)
[ "${CARCH}" = "x86_64" ] && depends=("${depends[@]}")
-makedepends=(subversion scons)
+makedepends=(subversion scons python2-numpy)
optdepends=(python2-h5py)
source=("${_pkgname}::svn+https://subversion.xray.aps.anl.gov/pyGSAS/trunk/"
"GSASII.desktop"
- "rungsas2"
- "SConstruct.patch")
+ "rungsas2")
md5sums=('SKIP'
'e9d06aed1866e65ce8259cfd5a31e1ce'
- '62855c475e29b88b23a446ba4ffd91be'
- '3d4b6dd46d76b39b216e1fac0e72f916')
+ '62855c475e29b88b23a446ba4ffd91be')
pkgver() {
cd "${SRCDEST}/${_pkgname}"
svnversion | tr -d [A-z]
}
-prepare() {
- cd $srcdir/${_pkgname}/fsource
- patch -p0 < $srcdir/SConstruct.patch
+prepare()
+{ cd $srcdir/${_pkgname}/fsource
+ sed -i 's/f2py/f2py2/g' SConstruct
}
build()
@@ -53,16 +51,11 @@ package()
#remove unecessary libraries for other platforms
( cd $pkgdir/opt/${_pkgname}
- fortran_libs="fellipse.so histogram2d.so histosigma2d.so pack_f.so polymask.so pydiffax.so pypowder.so pyspg.so pytexture.so unpack_cbf.so"
- mkdir _fsource
- for lib in ${fortran_libs}; do
- cp fsource/${lib} _fsource/lib
- done
+ #fortran_libs="fellipse histogram2d histosigma2d pack_f polymask pydiffax pypowder pyspg pytexture unpack_cbf"
+ #for lib in ${fortran_libs}; do
+ # cp bin/${lib}*.so bin/${lib}.so
+ #done
rm -r fsource
- mv _fsource fsource
-
-# [ "${CARCH}" == "i686" ] && rm -rf binlinux64-2.7
-# [ "${CARCH}" == "x86_64" ] && rm -rf binlinux2.7
for _dir in bin{mac,win,linux}{,64-}2.7; do
rm -rf ${_dir}
diff --git a/SConstruct.patch b/SConstruct.patch
deleted file mode 100644
index 2cf6a5662a9..00000000000
--- a/SConstruct.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- SConstruct-orig 2017-07-06 21:08:39.461528997 +0200
-+++ SConstruct 2017-07-06 21:08:22.381529305 +0200
-@@ -37,22 +37,22 @@
- for pth in [F2PYpath,spath,os.path.normpath(os.path.join(spath,'..')),os.path.join(spath,'Scripts')]:
- if not pth: continue
- if sys.platform == "win32":
-- program = 'f2py.exe'
-+ program = 'f2py2.exe'
- else:
-- program = 'f2py'
-+ program = 'f2py2'
- f2pyprogram = os.path.join(pth,program)
- if is_exe(f2pyprogram):
- F2PYpath,F2PYprog = os.path.split(f2pyprogram)
- break
-- program = 'f2py.py'
-+ program = 'f2py2.py'
- f2pyprogram = os.path.join(pth,program)
- if os.path.exists(f2pyprogram) and os.path.splitext(program)[1] == '.py':
- F2PYpath,F2PYprog = os.path.split(f2pyprogram)
- break
- else:
- print 'Note: Using f2py from path (hope that works!)'
-- F2PYpath = which_path('f2py') # default path to f2py
-- F2PYprog = 'f2py'
-+ F2PYpath = which_path('f2py2') # default path to f2py
-+ F2PYprog = 'f2py2'
- # check if we have a working path to f2py:
- f2pyprogram = os.path.normpath(os.path.join(F2PYpath,F2PYprog))
- if os.path.exists(f2pyprogram) and os.path.splitext(program)[1] == '.py':
-@@ -169,16 +169,17 @@
- # that on Windows it may be in the parent of the f2py location.
- # then run it to get info about the verision and the number of bits
- pythonpath = ''
--for program in ['python','../python']:
-- if sys.platform == "win32" and os.path.splitext(program)[1].lower() != '.exe':
-- program = program + '.exe'
-- pythonprogram = os.path.normpath(os.path.join(F2PYpath,program))
-- if is_exe(pythonprogram):
-- pythonpath = os.path.split(program)[0]
-- break
--else:
-- print 'python not found'
-- sys.exit()
-+# for program in ['python2','../python2']:
-+# if sys.platform == "win32" and os.path.splitext(program)[1].lower() != '.exe':
-+# program = program + '.exe'
-+# pythonprogram = os.path.normpath(os.path.join(F2PYpath,program))
-+# if is_exe(pythonprogram):
-+# pythonpath = os.path.split(program)[0]
-+# break
-+# else:
-+# print 'python not found'
-+# sys.exit()
-+pythonprogram = '/usr/bin/python2'
- p = subprocess.Popen(pythonprogram, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
- p.stdin.write("import sys,platform;print str(sys.version_info[0]);print str(sys.version_info[1]);print platform.architecture()[0];sys.exit()")
- p.stdin.close()