pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
All BLAS dependents: Update .include to use new mk/blas.buildlink3.mk
Module Name: pkgsrc-wip
Committed By: Jason Bacon <bacon%NetBSD.org@localhost>
Pushed By: outpaddling
Date: Mon Oct 12 17:01:38 2020 -0500
Changeset: 1acb59ea372eae7cef297a4bfebd144bde0fdb2f
Modified Files:
R-bnlearn/Makefile
R-mclust/Makefile
adept/Makefile
alberta/Makefile
alberta/buildlink3.mk
armadillo/Makefile
armadillo/buildlink3.mk
atlas/Makefile
atompaw/options.mk
bigdft/Makefile
dolfin/Makefile
dune-common/Makefile.common
dune-geometry/buildlink3.mk
etos/Makefile
freefem++/Makefile
getdp/Makefile
grass/options.mk
gretl/Makefile
hpl/Makefile
igraph/Makefile
linbox/Makefile
linbox/buildlink3.mk
mpb-openmpi/Makefile
mpb-openmpi/buildlink3.mk
mpb/Makefile
mpb/buildlink3.mk
necpp-git/Makefile
openmx-openmpi/Makefile
petsc/Makefile
petsc/buildlink3.mk
plasti/Makefile
plink2/Makefile
py-cvxpy/Makefile
py-lapack/Makefile
py-spams/Makefile
py-symeig/Makefile
slicot/Makefile
spai/Makefile
Log Message:
All BLAS dependents: Update .include to use new mk/blas.buildlink3.mk
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1acb59ea372eae7cef297a4bfebd144bde0fdb2f
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
R-bnlearn/Makefile | 2 +-
R-mclust/Makefile | 2 +-
adept/Makefile | 3 +--
alberta/Makefile | 2 +-
alberta/buildlink3.mk | 2 +-
armadillo/Makefile | 2 +-
armadillo/buildlink3.mk | 3 +--
atlas/Makefile | 2 +-
atompaw/options.mk | 3 +--
bigdft/Makefile | 3 +--
dolfin/Makefile | 3 +--
dune-common/Makefile.common | 2 +-
dune-geometry/buildlink3.mk | 2 +-
etos/Makefile | 3 +--
freefem++/Makefile | 3 +--
getdp/Makefile | 3 +--
grass/options.mk | 3 +--
gretl/Makefile | 3 +--
hpl/Makefile | 2 +-
igraph/Makefile | 3 +--
linbox/Makefile | 2 +-
linbox/buildlink3.mk | 2 +-
mpb-openmpi/Makefile | 3 +--
mpb-openmpi/buildlink3.mk | 3 +--
mpb/Makefile | 3 +--
mpb/buildlink3.mk | 3 +--
necpp-git/Makefile | 2 +-
openmx-openmpi/Makefile | 3 +--
petsc/Makefile | 3 +--
petsc/buildlink3.mk | 3 +--
plasti/Makefile | 3 +--
plink2/Makefile | 4 ++--
py-cvxpy/Makefile | 3 +--
py-lapack/Makefile | 3 +--
py-spams/Makefile | 3 +--
py-symeig/Makefile | 2 +-
slicot/Makefile | 3 +--
spai/Makefile | 3 +--
38 files changed, 39 insertions(+), 63 deletions(-)
diffs:
diff --git a/R-bnlearn/Makefile b/R-bnlearn/Makefile
index f9c7118050..431adb1206 100644
--- a/R-bnlearn/Makefile
+++ b/R-bnlearn/Makefile
@@ -18,5 +18,5 @@ BUILDLINK_API_DEPENDS.R+= R>=2.14.0
.include "../../math/R/Makefile.extension"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../math/blas/buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/R-mclust/Makefile b/R-mclust/Makefile
index 1c9c49eacf..ab70e2ba0e 100644
--- a/R-mclust/Makefile
+++ b/R-mclust/Makefile
@@ -17,5 +17,5 @@ BUILDLINK_API_DEPENDS.R+= R>=2.13.0
.include "../../math/R/Makefile.extension"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../math/blas/buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/adept/Makefile b/adept/Makefile
index 0c38f5732e..32ff36413c 100644
--- a/adept/Makefile
+++ b/adept/Makefile
@@ -14,7 +14,6 @@ USE_LIBTOOL= yes
USE_TOOLS+= gmake intltool msgfmt
USE_LANGUAGES= c c++ fortran
-.include "../../math/blas/buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
.include "../../math/gsl/buildlink3.mk"
-.include "../../math/lapack/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/alberta/Makefile b/alberta/Makefile
index a6cd8c7a42..5ee57abb8f 100644
--- a/alberta/Makefile
+++ b/alberta/Makefile
@@ -14,7 +14,7 @@ USE_LIBTOOL= yes
USE_LANGUAGES= c c++ fortran77
.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../math/blas/buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libICE/buildlink3.mk"
.include "../../x11/libSM/buildlink3.mk"
diff --git a/alberta/buildlink3.mk b/alberta/buildlink3.mk
index ba55c1f44a..145d8a9ab8 100644
--- a/alberta/buildlink3.mk
+++ b/alberta/buildlink3.mk
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.alberta+= alberta>=2.0.1
BUILDLINK_PKGSRCDIR.alberta?= ../../wip/alberta
.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../math/blas/buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libICE/buildlink3.mk"
.include "../../x11/libSM/buildlink3.mk"
diff --git a/armadillo/Makefile b/armadillo/Makefile
index 221d44447d..85b49618fa 100644
--- a/armadillo/Makefile
+++ b/armadillo/Makefile
@@ -28,7 +28,7 @@ SUBST_STAGE.minor= post-patch
SUBST_FILES.minor= CMakeLists.txt
SUBST_SED.minor= -e "s|ARMA_MINOR ${DIST_MINOR}|ARMA_MINOR ${PKG_MINOR}|g"
-.include "../../wip/mk/blas.buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
.include "../../wip/superlu/buildlink3.mk"
.include "../../math/arpack-ng/buildlink3.mk"
.include "../../devel/boost-libs/buildlink3.mk"
diff --git a/armadillo/buildlink3.mk b/armadillo/buildlink3.mk
index b41bb8b47a..70a305e68f 100644
--- a/armadillo/buildlink3.mk
+++ b/armadillo/buildlink3.mk
@@ -9,8 +9,7 @@ BUILDLINK_API_DEPENDS.armadillo+= armadillo>=4.45.2
BUILDLINK_ABI_DEPENDS.armadillo?= armadillo>=4.45.2
BUILDLINK_PKGSRCDIR.armadillo?= ../../wip/armadillo
-.include "../../math/blas/buildlink3.mk"
-.include "../../math/lapack/buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
.include "../../devel/boost-libs/buildlink3.mk"
.include "../../devel/boost-headers/buildlink3.mk"
.endif # ARMADILLO_BUILDLINK3_MK
diff --git a/atlas/Makefile b/atlas/Makefile
index e505b31a1a..6cd2ce3d6f 100644
--- a/atlas/Makefile
+++ b/atlas/Makefile
@@ -51,5 +51,5 @@ pre-configure:
# find:: not found
# Atlas iterates over all paths from PATH and executes find(1)
-.include "../../math/lapack/buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/atompaw/options.mk b/atompaw/options.mk
index adf7098c63..4e1a4f83a9 100644
--- a/atompaw/options.mk
+++ b/atompaw/options.mk
@@ -14,6 +14,5 @@ CONFIGURE_ARGS+= --with-libxc-libs
.if !empty(PKG_OPTIONS:Mlinalg)
CONFIGURE_ARGS+= --with-blas="-L${BUILDLINK_PREFIX.blas}/lib -lblas"
-.include "../../math/blas/buildlink3.mk"
-.include "../../math/lapack/buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
.endif
diff --git a/bigdft/Makefile b/bigdft/Makefile
index 41c9ce6ac7..da903f7b01 100644
--- a/bigdft/Makefile
+++ b/bigdft/Makefile
@@ -24,9 +24,8 @@ CONFIGURE_ARGS+= --disable-internal-libxc
CONFIGURE_ARGS+= --with-archives
.include "../../archivers/libarchive/buildlink3.mk"
CONFIGURE_ARGS+= --with-blas
-.include "../../math/blas/buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
CONFIGURE_ARGS+= --with-lapack
-.include "../../math/lapack/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../lang/python/application.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/dolfin/Makefile b/dolfin/Makefile
index fbf23b4553..26f2d6c26f 100644
--- a/dolfin/Makefile
+++ b/dolfin/Makefile
@@ -93,8 +93,7 @@ MMVERSION= 1.2
.include "../../wip/py-instant/buildlink3.mk"
.include "../../wip/py-ufl/buildlink3.mk"
.include "../../wip/py-viper/buildlink3.mk"
-.include "../../math/blas/buildlink3.mk"
-.include "../../math/lapack/buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
# cgal requires qt4-libs and qt4-tools, which don't currently build on Linux or Mac
#.include "../../math/cgal/buildlink3.mk"
.include "../../math/py-numpy/buildlink3.mk"
diff --git a/dune-common/Makefile.common b/dune-common/Makefile.common
index d612a220a5..e59d4a5f8c 100644
--- a/dune-common/Makefile.common
+++ b/dune-common/Makefile.common
@@ -24,4 +24,4 @@ USE_LANGUAGES= c c++ fortran
CONFIGURE_ARGS+= --enable-fieldvector-size-is-method
.include "../../devel/boost-headers/buildlink3.mk"
-.include "../../math/blas/buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
diff --git a/dune-geometry/buildlink3.mk b/dune-geometry/buildlink3.mk
index e613a62245..6a7e54e14c 100644
--- a/dune-geometry/buildlink3.mk
+++ b/dune-geometry/buildlink3.mk
@@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.dune-geometry?= ../../wip/dune-geometry
#.include "../../wip/dune-common/buildlink3.mk"
#.include "../../devel/gmp/buildlink3.mk"
#.include "../../devel/boost-headers/buildlink3.mk"
-#.include "../../math/blas/buildlink3.mk"
+#.include "../../mk/blas.buildlink3.mk"
.endif # DUNE_GEOMETRY_BUILDLINK3_MK
BUILDLINK_TREE+= -dune-geometry
diff --git a/etos/Makefile b/etos/Makefile
index 82f6bcb92a..a645253e1c 100644
--- a/etos/Makefile
+++ b/etos/Makefile
@@ -16,7 +16,6 @@ GCC_REQD+= 4.2
.include "../../graphics/freeglut/buildlink3.mk"
-.include "../../math/blas/buildlink3.mk"
-.include "../../math/lapack/buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
.include "../../parallel/openmpi/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/freefem++/Makefile b/freefem++/Makefile
index 138f9f9fa8..4d62bd6292 100644
--- a/freefem++/Makefile
+++ b/freefem++/Makefile
@@ -23,9 +23,8 @@ USE_LANGUAGES= c c++ fortran
.include "../../mk/mpi.buildlink3.mk"
### Maths
-.include "../../math/blas/buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
.include "../../math/fftw/buildlink3.mk"
-.include "../../math/lapack/buildlink3.mk"
### libX11
.include "../../x11/libX11/buildlink3.mk"
diff --git a/getdp/Makefile b/getdp/Makefile
index 205f6ab049..6e52047564 100644
--- a/getdp/Makefile
+++ b/getdp/Makefile
@@ -20,8 +20,7 @@ SUBST_MESSAGE.setup= Fixing ${PYSETUP}
SUBST_FILES.setup= CMakeLists.txt
SUBST_SED.setup+= -e 's,share/man/,${PKGMANDIR}/,g'
-.include "../../math/blas/buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
.include "../../math/gsl/buildlink3.mk"
-.include "../../math/lapack/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/grass/options.mk b/grass/options.mk
index 31a57079f6..14cc3a1d0c 100644
--- a/grass/options.mk
+++ b/grass/options.mk
@@ -53,8 +53,7 @@ USE_LANGUAGES+= fortran
CONFIGURE_ARGS+= --with-blas
CONFIGURE_ARGS+= --with-blas-libs=${PREFIX}/lib
CONFIGURE_ARGS+= --with-lapack
-.include "../../math/blas/buildlink3.mk"
-.include "../../math/lapack/buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
.else
CONFIGURE_ARGS+= --without-blas
CONFIGURE_ARGS+= --without-lapack
diff --git a/gretl/Makefile b/gretl/Makefile
index 4d01ad9b4e..7971dda90e 100644
--- a/gretl/Makefile
+++ b/gretl/Makefile
@@ -35,8 +35,7 @@ DEPENDS+= gnuplot-[0-9]*:../../graphics/gnuplot
# Skip checks temporarily:
CHECK_PORTABILITY_SKIP= osx/script
-.include "../../math/blas/buildlink3.mk"
-.include "../../math/lapack/buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
.include "../../math/fftw/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/hpl/Makefile b/hpl/Makefile
index 4f88fef924..9ad0f94022 100644
--- a/hpl/Makefile
+++ b/hpl/Makefile
@@ -12,6 +12,6 @@ LICENSE= modified-bsd
GNU_CONFIGURE= yes
USE_LANGUAGES= c c++ fortran
-.include "../../math/blas/buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
.include "../../parallel/openmpi/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/igraph/Makefile b/igraph/Makefile
index 19b977812c..56e4235dac 100644
--- a/igraph/Makefile
+++ b/igraph/Makefile
@@ -17,8 +17,7 @@ USE_LANGUAGES= c c++
PKGCONFIG_OVERRIDE+= igraph.pc.in
.include "../../devel/gmp/buildlink3.mk"
-.include "../../math/blas/buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
.include "../../math/glpk/buildlink3.mk"
-.include "../../math/lapack/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/linbox/Makefile b/linbox/Makefile
index 60ef8e1de3..31a9e33c7a 100644
--- a/linbox/Makefile
+++ b/linbox/Makefile
@@ -20,6 +20,6 @@ CONFIGURE_ARGS+= --with-givaro=${BUILDLINK_PREFIX.givaro}
CONFIGURE_ARGS+= --with-blas="-L${BUILDLINK_PREFIX.blas}/lib -lblas"
.include "../../devel/gmp/buildlink3.mk"
-.include "../../math/blas/buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
.include "../../wip/givaro/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/linbox/buildlink3.mk b/linbox/buildlink3.mk
index 911ed361b5..b012e3d193 100644
--- a/linbox/buildlink3.mk
+++ b/linbox/buildlink3.mk
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.linbox+= linbox>=1.1.7
BUILDLINK_PKGSRCDIR.linbox?= ../../wip/linbox
-.include "../../math/blas/buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
.include "../../wip/givaro/buildlink3.mk"
.endif # LINBOX_BUILDLINK3_MK
diff --git a/mpb-openmpi/Makefile b/mpb-openmpi/Makefile
index c0d1e227a0..51b8f30294 100644
--- a/mpb-openmpi/Makefile
+++ b/mpb-openmpi/Makefile
@@ -26,8 +26,7 @@ CONFIGURE_ENV+= SH_JOB=${TOOLS_PATH.sh}
CFLAGS+= -DH5_USE_16_API=1
-.include "../../math/blas/buildlink3.mk"
-.include "../../math/lapack/buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
.include "../../devel/hdf5/buildlink3.mk"
.include "../../wip/fftw2-openmpi/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
diff --git a/mpb-openmpi/buildlink3.mk b/mpb-openmpi/buildlink3.mk
index dbe956aa1e..2668906d8e 100644
--- a/mpb-openmpi/buildlink3.mk
+++ b/mpb-openmpi/buildlink3.mk
@@ -9,8 +9,7 @@ MPB_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.mpb-openmpi+= mpb-openmpi>=1.4.2
BUILDLINK_PKGSRCDIR.mpb-openmpi?= ../../wip/mpb-openmpi
-.include "../../math/blas/buildlink3.mk"
-.include "../../math/lapack/buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
.include "../../devel/hdf5/buildlink3.mk"
.include "../../math/fftw2/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
diff --git a/mpb/Makefile b/mpb/Makefile
index 023c17efaa..254c30266b 100644
--- a/mpb/Makefile
+++ b/mpb/Makefile
@@ -20,8 +20,7 @@ CONFIGURE_ARGS+= --with-libctl=${BUILDLINK_PREFIX.libctl}/share/libctl
CONFIGURE_ENV+= SH_JOB=${TOOLS_PATH.sh}
CFLAGS+= -DH5_USE_16_API=1
-.include "../../math/blas/buildlink3.mk"
-.include "../../math/lapack/buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
.include "../../devel/hdf5/buildlink3.mk"
.include "../../math/fftw2/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
diff --git a/mpb/buildlink3.mk b/mpb/buildlink3.mk
index 0ef865354f..b6560229f3 100644
--- a/mpb/buildlink3.mk
+++ b/mpb/buildlink3.mk
@@ -9,8 +9,7 @@ MPB_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.mpb+= mpb>=1.4.2
BUILDLINK_PKGSRCDIR.mpb?= ../../wip/mpb
-.include "../../math/blas/buildlink3.mk"
-.include "../../math/lapack/buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
.include "../../devel/hdf5/buildlink3.mk"
.include "../../math/fftw2/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
diff --git a/necpp-git/Makefile b/necpp-git/Makefile
index 4f7dc92ba4..416a6863cf 100644
--- a/necpp-git/Makefile
+++ b/necpp-git/Makefile
@@ -30,6 +30,6 @@ SUBST_STAGE.test= pre-configure
post-patch:
cd ${WRKSRC} && make -f Makefile.git
-#.include "../../math/lapack/buildlink3.mk"
.include "../../wip/mk/git-package.mk"
+.include "../../mk/blas.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/openmx-openmpi/Makefile b/openmx-openmpi/Makefile
index dfd68e367d..5ab1d05389 100644
--- a/openmx-openmpi/Makefile
+++ b/openmx-openmpi/Makefile
@@ -53,8 +53,7 @@ do-install:
.endfor
.include "../../wip/openmpi163/buildlink3.mk"
-.include "../../math/blas/buildlink3.mk"
-.include "../../math/lapack/buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
# Investigate: Any advantage to using fftw-openmpi?
.include "../../math/fftw/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/petsc/Makefile b/petsc/Makefile
index 6abeacb232..23851a0707 100644
--- a/petsc/Makefile
+++ b/petsc/Makefile
@@ -22,7 +22,6 @@ MAKE_FILE= makefile
BUILD_MAKE_FLAGS+= PETSC_DIR=${WRKSRC}
.include "../../lang/python/pyversion.mk" # get python
-.include "../../math/lapack/buildlink3.mk"
-.include "../../math/blas/buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
# .include "../../mk/mpi.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/petsc/buildlink3.mk b/petsc/buildlink3.mk
index 6332179a49..1d619a58c2 100644
--- a/petsc/buildlink3.mk
+++ b/petsc/buildlink3.mk
@@ -9,8 +9,7 @@ PETSC_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.petsc+= petsc>=3.1p2
BUILDLINK_PKGSRCDIR.petsc?= ../../wip/petsc
-.include "../../math/lapack/buildlink3.mk"
-.include "../../math/blas/buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
.endif # PETSC_BUILDLINK3_MK
BUILDLINK_TREE+= -petsc
diff --git a/plasti/Makefile b/plasti/Makefile
index 20e46a3f20..89c56bcb6b 100644
--- a/plasti/Makefile
+++ b/plasti/Makefile
@@ -18,7 +18,6 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/plasti_oly ${DESTDIR}${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/meshg_oly ${DESTDIR}${PREFIX}/bin
-.include "../../math/blas/buildlink3.mk"
-.include "../../math/lapack/buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
.include "../../lang/g95/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/plink2/Makefile b/plink2/Makefile
index 72687dd46e..3debaea30c 100644
--- a/plink2/Makefile
+++ b/plink2/Makefile
@@ -7,6 +7,7 @@
DISTNAME= plink-ng-${PV}
PKGNAME= plink2-${PV}
+PKGREVISION= 1
CATEGORIES= biology
MASTER_SITES= ${MASTER_SITE_GITHUB:=chrchang/}
GITHUB_PROJECT= plink-ng
@@ -57,9 +58,8 @@ post-install:
${INSTALL_SCRIPT} ${WRKDIR}/plink2-test ${DESTDIR}${PREFIX}/bin
${INSTALL_SCRIPT} ${FILESDIR}/plink2-bench ${DESTDIR}${PREFIX}/bin
-.include "../../wip/mk/blas.buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
.include "../../wip/cblas/buildlink3.mk"
.include "../../lang/python/application.mk"
-.include "../../math/lapack/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-cvxpy/Makefile b/py-cvxpy/Makefile
index 8283a03fb7..4d5a8054ad 100644
--- a/py-cvxpy/Makefile
+++ b/py-cvxpy/Makefile
@@ -13,8 +13,7 @@ LICENSE= gnu-gpl-v3
USE_LANGUAGES= # none
.include "../../lang/python/egg.mk"
-.include "../../math/blas/buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
.include "../../math/glpk/buildlink3.mk"
.include "../../math/gsl/buildlink3.mk"
-.include "../../math/lapack/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-lapack/Makefile b/py-lapack/Makefile
index 65e4c573c1..006a9d3a8d 100644
--- a/py-lapack/Makefile
+++ b/py-lapack/Makefile
@@ -21,7 +21,6 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/TUTORIAL ${DESTDIR}${PREFIX}/share/doc/py-lapack
.include "../../lang/python/extension.mk"
-.include "../../math/blas/buildlink3.mk"
-.include "../../math/lapack/buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
.include "../../math/py-Numeric/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-spams/Makefile b/py-spams/Makefile
index a9b93f76da..242acafd44 100644
--- a/py-spams/Makefile
+++ b/py-spams/Makefile
@@ -17,7 +17,6 @@ WRKSRC= ${WRKDIR}/spams-python
USE_LANGUAGES= c c++
.include "../../lang/python/distutils.mk"
-.include "../../math/blas/buildlink3.mk"
-.include "../../math/lapack/buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
.include "../../math/py-numpy/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-symeig/Makefile b/py-symeig/Makefile
index 21e448096c..b14fec490c 100644
--- a/py-symeig/Makefile
+++ b/py-symeig/Makefile
@@ -19,7 +19,7 @@ do-test:
${RUN} cd ${WRKSRC}/test; \
${SETENV} ${TEST_ENV} ${PYTHONBIN} test_symeig.py
+.include "../../mk/blas.buildlink3.mk"
.include "../../math/py-numpy/buildlink3.mk"
-.include "../../math/lapack/buildlink3.mk"
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/slicot/Makefile b/slicot/Makefile
index e7cfa0e49f..6e1d0425de 100644
--- a/slicot/Makefile
+++ b/slicot/Makefile
@@ -20,6 +20,5 @@ pre-build:
cp ${FILESDIR}/Makefile ${WRKSRC}/Makefile
cp ${FILESDIR}/shlib_version ${WRKSRC}/shlib_version
-.include "../../math/lapack/buildlink3.mk"
-.include "../../math/blas/buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/spai/Makefile b/spai/Makefile
index 625d288e12..170ba525d1 100644
--- a/spai/Makefile
+++ b/spai/Makefile
@@ -21,7 +21,6 @@ USE_LANGUAGES= c fortran
CONFIGURE_ARGS+= --with-mpi=${BUILDLINK_PREFIX.mpi}
-.include "../../math/blas/buildlink3.mk"
-.include "../../math/lapack/buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
.include "../../mk/mpi.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Home |
Main Index |
Thread Index |
Old Index