Change packaging structure

2 files changed, 18 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1f4af1088316..37685a88b828 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -6,6 +6,11 @@ pkgbase = faiss-git
 	arch = i686
 	arch = x86_64
 	license = BSD
+	makedepends = python
+	makedepends = python2
+	makedepends = python-numpy
+	makedepends = python2-numpy
+	makedepends = swig
 	depends = blas
 	depends = lapack
 	source = faiss::git+https://github.com/facebookresearch/faiss.git
@@ -17,17 +22,13 @@ pkgname = faiss-git
 
 pkgname = python-faiss-git
 	depends = python
-	depends = python-setuptools
 	depends = python-numpy
-	depends = swig
 	provides = python-faiss
 	conflicts = python-faiss
 
 pkgname = python2-faiss-git
 	depends = python2
-	depends = python2-setuptools
 	depends = python2-numpy
-	depends = swig
 	provides = python2-faiss
 	conflicts = python2-faiss
 
diff --git a/PKGBUILD b/PKGBUILD
index 8268252f02f8..42cf2504634a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,6 +12,7 @@ pkgrel=1
 source=(${_pkgname}::git+https://github.com/facebookresearch/faiss.git)
 sha256sums=('SKIP')
 depends=('blas' 'lapack')
+makedepends=('python' 'python2' 'python-numpy' 'python2-numpy' 'swig')
 
 pkgver() {
   cd "${_pkgname}"
@@ -22,13 +23,18 @@ pkgver() {
 prepare() {
   cd "${srcdir}/${_pkgname}"
   cp -ar python python2
+  sed -i 's/makefile.inc/makefile2.inc/g' python2/Makefile
 }
 
 
 build() {
   cd "${srcdir}/${_pkgname}"
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --with-python=python2
+  mv makefile.inc makefile2.inc
+  ./configure --prefix=/usr --with-python=python
   make
+  make -C python
+  make -C python2
 }
 
 package_faiss-git() {
@@ -41,23 +47,17 @@ package_faiss-git() {
 package_python-faiss-git() {
   provides=('python-faiss')
   conflicts=('python-faiss')
-  depends=('python' 'python-setuptools' 'python-numpy' 'swig')
+  depends=('python' 'python-numpy')
 
-  cd "${srcdir}/${_pkgname}"
-  ./configure --prefix=/usr --with-python=python
-  cd python
-  make cpu
-  python setup.py install --root="$pkgdir/" --optimize=1
+  cd "${srcdir}/${_pkgname}/python"
+  python setup.py install --root="$pkgdir/" --optimize=1 --skip-build
 }
 
 package_python2-faiss-git() {
   provides=('python2-faiss')
   conflicts=('python2-faiss')
-  depends=('python2' 'python2-setuptools' 'python2-numpy' 'swig')
+  depends=('python2' 'python2-numpy')
 
-  cd "${srcdir}/${_pkgname}"
-  ./configure --prefix=/usr --with-python=python2
-  cd python2
-  make cpu
-  python2 setup.py install --root="$pkgdir/" --optimize=1
+  cd "${srcdir}/${_pkgname}/python2"
+  python2 setup.py install --root="$pkgdir/" --optimize=1 --skip-build
 }