summary refs log tree commit diff
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2019-07-14 17:30:42 +0200
committerMarius Bakke <mbakke@fastmail.com>2019-07-14 17:30:42 +0200
commitad60a3484c6d3221b78dbc6f173ce27bc3b1f96a (patch)
tree9e60576b3e668830b6c9d90f28894dcd843805f2
parent344f358fba76f4ff576c2702819f3cfd7a6c5348 (diff)
downloadguix-ad60a3484c6d3221b78dbc6f173ce27bc3b1f96a.tar.gz
gnu: gst-kaldi-nnet2-online: Adjust for GCC 7.
* gnu/packages/machine-learning.scm (gst-kaldi-nnet2-online)[arguments]: Don't
read CPLUS_INCLUDE_PATH, or pass -std=c++11.  End phases on #t.
-rw-r--r--gnu/packages/machine-learning.scm8
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index e216b9474a..fc527363c0 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -1139,16 +1139,16 @@ written in C++.")
            (replace 'configure
              (lambda* (#:key inputs #:allow-other-keys)
                (let ((glib (assoc-ref inputs "glib")))
-                 (setenv "CXXFLAGS" "-std=c++11 -fPIC")
+                 (setenv "CXXFLAGS" "-fPIC")
                  (setenv "CPLUS_INCLUDE_PATH"
                          (string-append glib "/include/glib-2.0:"
                                         glib "/lib/glib-2.0/include:"
                                         (assoc-ref inputs "gstreamer")
-                                        "/include/gstreamer-1.0:"
-                                        (getenv "CPLUS_INCLUDE_PATH"))))
+                                        "/include/gstreamer-1.0")))
                (substitute* "Makefile"
                  (("include \\$\\(KALDI_ROOT\\)/src/kaldi.mk") "")
-                 (("\\$\\(error Cannot find") "#"))))
+                 (("\\$\\(error Cannot find") "#"))
+               #t))
            (add-before 'build 'build-depend
              (lambda* (#:key make-flags #:allow-other-keys)
                (apply invoke "make" "depend" make-flags)))