02/04: gnu: gst-kaldi-nnet2-online: Adjust for GCC 7.

[guix-commits]

mbakke pushed a commit to branch core-updates
in repository guix.

commit ad60a3484c6d3221b78dbc6f173ce27bc3b1f96a
Author: Marius Bakke <address@hidden>
Date:   Sun Jul 14 17:30:42 2019 +0200

    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.
---
 gnu/packages/machine-learning.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/machine-learning.scm 
b/gnu/packages/machine-learning.scm
index e216b94..fc52736 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)))