removed dependency to armadillo again as we do still build it on our own

patrickfrey · Jan 12, 2019 · 9c48d9c · 9c48d9c
1 parent 343344f
commit 9c48d9c
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 11 deletions.
diff --git a/dist/archlinux/PKGBUILD.in b/dist/archlinux/PKGBUILD.in
@@ -10,7 +10,7 @@ pkgdesc='Library implementing the storage of a text search engine.'
 license=('MPL2')
 arch=('i686' 'x86_64')
 url="http://project-strus.net"
-depends=('boost>=1.57' 'boost-libs>=1.57' "strusbase>=${_deppkgver}" "strus>=${_deppkgver}" "strusanalyzer>=${_deppkgver}" "strustrace>=${_deppkgver}" "strusmodule>=${_deppkgver}" "blas" "lapack" "armadillo")
+depends=('boost>=1.57' 'boost-libs>=1.57' "strusbase>=${_deppkgver}" "strus>=${_deppkgver}" "strusanalyzer>=${_deppkgver}" "strustrace>=${_deppkgver}" "strusmodule>=${_deppkgver}" "blas" "lapack" )
 makedepends=('cmake')
 source=("${pkgname}-${_mainpkgver}.tar.gz")
 

diff --git a/dist/debian/control b/dist/debian/control
@@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 4.1.16), cmake,
  libboost-dev, libboost-thread-dev, libboost-system-dev,
  libboost-date-time-dev, liblapack-dev, strusbase-dev, strus-dev, 
  strusanalyzer-dev, strustrace-dev, strusmodule-dev,
- libatlas-dev, liblapack-dev, libblas-dev, libarmadillo-dev
+ libatlas-dev, liblapack-dev, libblas-dev
 Standards-Version: 3.8.3
 Homepage: http://project-strus.net
 

diff --git a/dist/obs/control-xUbuntu_14.04 b/dist/obs/control-xUbuntu_14.04
@@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 4.1.16), cmake,
  libboost-dev, libboost-thread-dev, libboost-system-dev,
  libboost-date-time-dev, liblapack-dev, strusbase-dev, strus-dev,
  strusanalyzer-dev, strustrace-dev, strusmodule-dev,
- liblapack-dev, libblas-dev, libarmadillo-dev
+ liblapack-dev, libblas-dev
 Standards-Version: 3.8.3
 Homepage: http://project-strus.net
 

diff --git a/dist/obs/control-xUbuntu_16.04 b/dist/obs/control-xUbuntu_16.04
@@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 4.1.16), cmake,
  libboost-dev, libboost-thread-dev, libboost-system-dev,
  libboost-date-time-dev, liblapack-dev, strusbase-dev, strus-dev,
  strusanalyzer-dev, strustrace-dev, strusmodule-dev,
- liblapack-dev, libblas-dev, libarmadillo-dev
+ liblapack-dev, libblas-dev
 Standards-Version: 3.8.3
 Homepage: http://project-strus.net
 

diff --git a/dist/obs/strusvector-xUbuntu_14.04.dsc.in b/dist/obs/strusvector-xUbuntu_14.04.dsc.in
@@ -8,5 +8,5 @@ Build-Depends: debhelper (>= 4.1.16), cmake,
  libboost-dev, libboost-thread-dev, libboost-system-dev,
  libboost-date-time-dev, liblapack-dev, strusbase-dev, strus-dev,
  strusanalyzer-dev, strustrace-dev, strusmodule-dev,
- liblapack-dev, libblas-dev, libarmadillo-dev
+ liblapack-dev, libblas-dev
 Files:
diff --git a/dist/obs/strusvector-xUbuntu_16.04.dsc.in b/dist/obs/strusvector-xUbuntu_16.04.dsc.in
@@ -8,5 +8,5 @@ Build-Depends: debhelper (>= 4.1.16), cmake,
  libboost-dev, libboost-thread-dev, libboost-system-dev,
  libboost-date-time-dev, liblapack-dev, strusbase-dev, strus-dev,
  strusanalyzer-dev, strustrace-dev, strusmodule-dev,
- liblapack-dev, libblas-dev, libarmadillo-dev
+ liblapack-dev, libblas-dev
 Files:
diff --git a/dist/obs/strusvector.dsc.in b/dist/obs/strusvector.dsc.in
@@ -8,5 +8,5 @@ Build-Depends: debhelper (>= 4.1.16), cmake,
  libboost-dev, libboost-thread-dev, libboost-system-dev,
  libboost-date-time-dev, liblapack-dev, strusbase-dev, strus-dev, 
  strusanalyzer-dev, strustrace-dev, strusmodule-dev,
- libatlas-dev, liblapack-dev, libblas-dev, libarmadillo-dev
+ libatlas-dev, liblapack-dev, libblas-dev
 Files:
diff --git a/dist/redhat/strusvector.spec.in b/dist/redhat/strusvector.spec.in
@@ -272,19 +272,15 @@ BuildRequires: libboost_regex1_66_0-devel >= 1.66.0
 %if %{rhel} || %{centos} || %{scilin} || %{fedora}
 BuildRequires: blas-devel
 BuildRequires: lapack-devel
-BuildRequires: armadillo-devel
 Requires: blas
 Requires: lapack
-Requires: armadillo
 %endif
 %if %{suse}
 %if %{sles12} || %{osuleap423} || %{osutumbleweed}
 BuildRequires: blas-devel
 BuildRequires: lapack-devel
-BuildRequires: armadillo-devel
 Requires: blas
 Requires: lapack
-Requires: armadillo
 %endif
 %endif