| 1 |
jlec 13/02/23 12:42:35 |
| 2 |
|
| 3 |
Added: sphinxbase-0.8-unbundle-lapack.patch |
| 4 |
Log: |
| 5 |
app-accessibility/sphinxbase: Version BUmp, #451876; move to new python-r1 eclass; detect blas via pkg-config; only build docs with use doc (https://sourceforge.net/p/cmusphinx/patches/102/) |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-accessibility/sphinxbase/files/sphinxbase-0.8-unbundle-lapack.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/sphinxbase/files/sphinxbase-0.8-unbundle-lapack.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/sphinxbase/files/sphinxbase-0.8-unbundle-lapack.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: sphinxbase-0.8-unbundle-lapack.patch |
| 16 |
=================================================================== |
| 17 |
configure.in | 40 +++++++++++++++++++++------------------- |
| 18 |
src/libsphinxbase/Makefile.am | 1 + |
| 19 |
2 files changed, 22 insertions(+), 19 deletions(-) |
| 20 |
|
| 21 |
diff --git a/configure.in b/configure.in |
| 22 |
index e10629c..b5d6ea9 100644 |
| 23 |
--- a/configure.in |
| 24 |
+++ b/configure.in |
| 25 |
@@ -62,13 +62,15 @@ if test x$withval = xno; then |
| 26 |
use_lapack=false |
| 27 |
fi |
| 28 |
]) |
| 29 |
-if test x$use_lapack = xtrue; then |
| 30 |
- AC_CHECK_LIB(lapack, sgesv_,,use_internal_lapack=true) |
| 31 |
- if test x$use_internal_lapack != xtrue; then |
| 32 |
- AC_CHECK_LIB(blas, sgemm_,,use_internal_lapack=true) |
| 33 |
- fi |
| 34 |
+AS_IF([test "x$with_lapack" = "xyes"], [ |
| 35 |
+ PKG_CHECK_MODULES([LAPACK], [lapack],, |
| 36 |
+ AC_CHECK_LIB(lapack, sgesv_,,use_internal_lapack=true)) |
| 37 |
+ AS_IF([test "x$use_internal_lapack" != "xtrue"], [ |
| 38 |
+ PKG_CHECK_MODULES([BLAS], [blas],, |
| 39 |
+ AC_CHECK_LIB(blas, sgemm_,,use_internal_lapack=true)) |
| 40 |
+ ]) |
| 41 |
AC_DEFINE(WITH_LAPACK, [], [Enable matrix algebra with LAPACK]) |
| 42 |
-fi |
| 43 |
+]) |
| 44 |
AM_CONDITIONAL(LAPACK_LITE, test x$use_internal_lapack = xtrue) |
| 45 |
AM_CONDITIONAL(USE_LAPACK, test x$use_lapack = xtrue) |
| 46 |
|
| 47 |
@@ -208,9 +210,15 @@ AM_PROG_LIBTOOL |
| 48 |
dnl |
| 49 |
dnl Check for Doxygen, and build dox if present |
| 50 |
dnl |
| 51 |
-AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, yes, no) |
| 52 |
+AC_ARG_ENABLE([doc], |
| 53 |
+ AS_HELP_STRING([--enable-doc], [Build docs using doxygen])) |
| 54 |
+AS_IF([test "x$enable_doc" = "xyes"], [ |
| 55 |
+ AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, yes, no) |
| 56 |
+ AS_IF([test "x$HAVE_DOXYGEN" != "xyes"], [ |
| 57 |
+ AC_MSG_ERROR([--enable-doc given, but doxygen not found.]); exit 1 |
| 58 |
+ ]) |
| 59 |
+]) |
| 60 |
AM_CONDITIONAL(BUILD_DOXYGEN, test "x$HAVE_DOXYGEN" = "xyes") |
| 61 |
- |
| 62 |
dnl |
| 63 |
dnl Check for Python, and build python module if present |
| 64 |
dnl |
| 65 |
@@ -260,19 +268,13 @@ fi |
| 66 |
AM_CONDITIONAL(BUILD_CYTHON, test "x$HAVE_CYTHON" = "xyes") |
| 67 |
|
| 68 |
dnl |
| 69 |
-dnl Check for pkgconfig |
| 70 |
-dnl |
| 71 |
-AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no) |
| 72 |
- |
| 73 |
-dnl |
| 74 |
dnl Check for libsndfile |
| 75 |
dnl |
| 76 |
-if test "x$HAVE_PKGCONFIG" = "xyes"; then |
| 77 |
- PKG_CHECK_MODULES(SNDFILE,sndfile,,true) |
| 78 |
- AC_CHECK_HEADERS([sndfile.h]) |
| 79 |
- PKG_CHECK_MODULES(SAMPLERATE,samplerate,,true) |
| 80 |
- AC_CHECK_HEADERS([samplerate.h]) |
| 81 |
-fi |
| 82 |
+PKG_CHECK_MODULES(SNDFILE,sndfile,,true) |
| 83 |
+AC_CHECK_HEADERS([sndfile.h]) |
| 84 |
+PKG_CHECK_MODULES(SAMPLERATE,samplerate,,true) |
| 85 |
+AC_CHECK_HEADERS([samplerate.h]) |
| 86 |
+ |
| 87 |
AC_SUBST(SNDFILE_LIBS) |
| 88 |
AC_SUBST(SNDFILE_CFLAGS) |
| 89 |
AC_SUBST(SAMPLERATE_LIBS) |
| 90 |
diff --git a/src/libsphinxbase/Makefile.am b/src/libsphinxbase/Makefile.am |
| 91 |
index 52ee3e1..f4efd8a 100644 |
| 92 |
--- a/src/libsphinxbase/Makefile.am |
| 93 |
+++ b/src/libsphinxbase/Makefile.am |
| 94 |
@@ -8,6 +8,7 @@ libsphinxbase_la_SOURCES = |
| 95 |
# This is API version 2, software release 1, which also supports API version 1 |
| 96 |
libsphinxbase_la_LDFLAGS = -version-info 2:1:1 |
| 97 |
libsphinxbase_la_LIBADD = $(LTLIBICONV) \ |
| 98 |
+ @LAPACK_LIBS@ \ |
| 99 |
util/libsphinxutil.la \ |
| 100 |
fe/libsphinxfe.la \ |
| 101 |
feat/libsphinxfeat.la \ |
Archives