| 1 |
commit: b07f8b0b5a03243325bcb38264c21319daac11e0 |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 11 09:53:41 2019 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 11 10:06:09 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b07f8b0b |
| 7 |
|
| 8 |
dev-libs/liblinear: Revert "Add IUSE=blas." |
| 9 |
|
| 10 |
In commit 22acd3654a599abcfe5457c157b6e2937a0242ec ("Add IUSE=blas.") I |
| 11 |
tried to add support for linking against a BLAS implementation as |
| 12 |
suggested in liblinear's documentation. |
| 13 |
|
| 14 |
As so far liblinear does not support any helpers for linking against it |
| 15 |
as well as a BLAS library in an automated way, enabling USE=blas can |
| 16 |
result in linking failures in packages that are unaware of the BLAS |
| 17 |
linkage. Until a pkg-config file or other reliable source for library |
| 18 |
linkage is provided with liblinear, usage of an external BLAS library |
| 19 |
cannot be supported. |
| 20 |
|
| 21 |
Package-Manager: Portage-2.3.71, Repoman-2.3.17 |
| 22 |
Fixes: https://bugs.gentoo.org/691926 |
| 23 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
| 24 |
|
| 25 |
dev-libs/liblinear/liblinear-210-r1.ebuild | 15 +-------------- |
| 26 |
dev-libs/liblinear/liblinear-221.ebuild | 15 +-------------- |
| 27 |
dev-libs/liblinear/liblinear-230.ebuild | 13 ------------- |
| 28 |
3 files changed, 2 insertions(+), 41 deletions(-) |
| 29 |
|
| 30 |
diff --git a/dev-libs/liblinear/liblinear-210-r1.ebuild b/dev-libs/liblinear/liblinear-210-r1.ebuild |
| 31 |
index ca03976be48..cb9a44912d2 100644 |
| 32 |
--- a/dev-libs/liblinear/liblinear-210-r1.ebuild |
| 33 |
+++ b/dev-libs/liblinear/liblinear-210-r1.ebuild |
| 34 |
@@ -1,4 +1,4 @@ |
| 35 |
-# Copyright 1999-2018 Gentoo Foundation |
| 36 |
+# Copyright 1999-2019 Gentoo Authors |
| 37 |
# Distributed under the terms of the GNU General Public License v2 |
| 38 |
|
| 39 |
EAPI=5 |
| 40 |
@@ -12,15 +12,6 @@ SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 41 |
LICENSE="BSD" |
| 42 |
SLOT="0/3" |
| 43 |
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86" |
| 44 |
-IUSE="blas" |
| 45 |
- |
| 46 |
-RDEPEND=" |
| 47 |
- blas? ( virtual/blas ) |
| 48 |
-" |
| 49 |
-DEPEND=" |
| 50 |
- ${RDEPEND} |
| 51 |
- blas? ( virtual/pkgconfig ) |
| 52 |
-" |
| 53 |
|
| 54 |
src_prepare() { |
| 55 |
sed -i \ |
| 56 |
@@ -34,9 +25,6 @@ src_prepare() { |
| 57 |
-e '/^CFLAGS/d;/^CXXFLAGS/d' \ |
| 58 |
-e 's|$${SHARED_LIB_FLAG}|& $(LDFLAGS)|g' \ |
| 59 |
Makefile || die |
| 60 |
- if use blas; then |
| 61 |
- sed -i -e 's:blas/blas.a::g' Makefile || die |
| 62 |
- fi |
| 63 |
} |
| 64 |
|
| 65 |
src_compile() { |
| 66 |
@@ -47,7 +35,6 @@ src_compile() { |
| 67 |
CXXFLAGS="${CXXFLAGS} -fPIC" \ |
| 68 |
AR="$(tc-getAR) rcv" \ |
| 69 |
RANLIB="$(tc-getRANLIB)" \ |
| 70 |
- LIBS="$(usex blas "$( $(tc-getPKG_CONFIG) --libs blas )" blas/blas.a)" \ |
| 71 |
lib all |
| 72 |
} |
| 73 |
|
| 74 |
|
| 75 |
diff --git a/dev-libs/liblinear/liblinear-221.ebuild b/dev-libs/liblinear/liblinear-221.ebuild |
| 76 |
index 1aaede97f49..18f397fed81 100644 |
| 77 |
--- a/dev-libs/liblinear/liblinear-221.ebuild |
| 78 |
+++ b/dev-libs/liblinear/liblinear-221.ebuild |
| 79 |
@@ -1,4 +1,4 @@ |
| 80 |
-# Copyright 1999-2018 Gentoo Authors |
| 81 |
+# Copyright 1999-2019 Gentoo Authors |
| 82 |
# Distributed under the terms of the GNU General Public License v2 |
| 83 |
|
| 84 |
EAPI="7" |
| 85 |
@@ -11,15 +11,6 @@ SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 86 |
LICENSE="BSD" |
| 87 |
SLOT="0/3" |
| 88 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-macos" |
| 89 |
-IUSE="blas" |
| 90 |
- |
| 91 |
-RDEPEND=" |
| 92 |
- blas? ( virtual/blas ) |
| 93 |
-" |
| 94 |
-DEPEND=" |
| 95 |
- ${RDEPEND} |
| 96 |
- blas? ( virtual/pkgconfig ) |
| 97 |
-" |
| 98 |
|
| 99 |
src_prepare() { |
| 100 |
default |
| 101 |
@@ -35,9 +26,6 @@ src_prepare() { |
| 102 |
-e '/^CFLAGS/d;/^CXXFLAGS/d' \ |
| 103 |
-e 's|$${SHARED_LIB_FLAG}|& $(LDFLAGS)|g' \ |
| 104 |
Makefile || die |
| 105 |
- if use blas; then |
| 106 |
- sed -i -e 's:blas/blas.a::g' Makefile || die |
| 107 |
- fi |
| 108 |
} |
| 109 |
|
| 110 |
src_compile() { |
| 111 |
@@ -48,7 +36,6 @@ src_compile() { |
| 112 |
CXXFLAGS="${CXXFLAGS} -fPIC" \ |
| 113 |
AR="$(tc-getAR) rcv" \ |
| 114 |
RANLIB="$(tc-getRANLIB)" \ |
| 115 |
- LIBS="$(usex blas "$( $(tc-getPKG_CONFIG) --libs blas )" blas/blas.a)" \ |
| 116 |
lib all |
| 117 |
} |
| 118 |
|
| 119 |
|
| 120 |
diff --git a/dev-libs/liblinear/liblinear-230.ebuild b/dev-libs/liblinear/liblinear-230.ebuild |
| 121 |
index 00881437e2d..18f397fed81 100644 |
| 122 |
--- a/dev-libs/liblinear/liblinear-230.ebuild |
| 123 |
+++ b/dev-libs/liblinear/liblinear-230.ebuild |
| 124 |
@@ -11,15 +11,6 @@ SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 125 |
LICENSE="BSD" |
| 126 |
SLOT="0/3" |
| 127 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-macos" |
| 128 |
-IUSE="blas" |
| 129 |
- |
| 130 |
-RDEPEND=" |
| 131 |
- blas? ( virtual/blas ) |
| 132 |
-" |
| 133 |
-DEPEND=" |
| 134 |
- ${RDEPEND} |
| 135 |
- blas? ( virtual/pkgconfig ) |
| 136 |
-" |
| 137 |
|
| 138 |
src_prepare() { |
| 139 |
default |
| 140 |
@@ -35,9 +26,6 @@ src_prepare() { |
| 141 |
-e '/^CFLAGS/d;/^CXXFLAGS/d' \ |
| 142 |
-e 's|$${SHARED_LIB_FLAG}|& $(LDFLAGS)|g' \ |
| 143 |
Makefile || die |
| 144 |
- if use blas; then |
| 145 |
- sed -i -e 's:blas/blas.a::g' Makefile || die |
| 146 |
- fi |
| 147 |
} |
| 148 |
|
| 149 |
src_compile() { |
| 150 |
@@ -48,7 +36,6 @@ src_compile() { |
| 151 |
CXXFLAGS="${CXXFLAGS} -fPIC" \ |
| 152 |
AR="$(tc-getAR) rcv" \ |
| 153 |
RANLIB="$(tc-getRANLIB)" \ |
| 154 |
- LIBS="$(usex blas "$( $(tc-getPKG_CONFIG) --libs blas )" blas/blas.a)" \ |
| 155 |
lib all |
| 156 |
} |
Archives