sci-misc/kaldi: Create unified diff for Makefile patch

Package-Manager: portage-2.2.24

1 files changed, 60 insertions, 57 deletions

diff --git a/sci-misc/kaldi/files/Makefile.patch b/sci-misc/kaldi/files/Makefile.patch
index ef1a60640..9fa1841c6 100644
--- a/sci-misc/kaldi/files/Makefile.patch
+++ b/sci-misc/kaldi/files/Makefile.patch
@@ -1,57 +1,60 @@
-*** Makefile.orig	2015-02-28 16:31:57.377401743 -0400
---- Makefile	2015-02-28 16:48:58.153175376 -0400
-***************
-*** 30,36 ****
-  
-  # Reset the default goal, so that the all target will become default
-  .DEFAULT_GOAL :=
-! all: checkversion test_dependencies kaldi.mk mklibdir $(SUBDIRS)
-  	-echo Done
-  
-  mklibdir:
---- 30,36 ----
-  
-  # Reset the default goal, so that the all target will become default
-  .DEFAULT_GOAL :=
-! all: checkversion kaldi.mk mklibdir $(SUBDIRS)
-  	-echo Done
-  
-  mklibdir:
-***************
-*** 88,103 ****
-  ext: test_dependencies ext_depend $(SUBDIRS) $(EXT_SUBDIRS)
-  	-echo Done
-  
-- ifndef OPENFST_VER
-- $(error Please rerun configure: OPENFST_VER is not defined, likely kaldi.mk was produced by older configure script.)
-- endif
-- # Note: OPENFST_VER is determined by configure and added to kaldi.mk
-- OPENFST_VER_NUM := $(shell echo $(OPENFST_VER) | sed 's/\./ /g' | xargs printf "%d%02d%02d")
-- test_dependencies:
-- ifeq ("$(shell expr $(OPENFST_VER_NUM) \< 10302)","1")
-- 	$(error OpenFst $(OPENFST_VER) is not supported. You now need OpenFst >= 1.3.2.)
-- endif
-- 
-  check_portaudio:
-  	@[ -d ../tools/portaudio ] || ( cd ../tools;  ./install_portaudio.sh )
-  
---- 88,93 ----
-***************
-*** 131,136 ****
---- 121,136 ----
-  ext_depend: check_portaudio
-  	-for x in $(EXT_SUBDIRS); do $(MAKE) -C $$x depend; done
-  
-+ print-binfiles: $(addsuffix /print-binfiles, $(SUBDIRS))
-+ 
-+ %/print-binfiles:
-+ 	@$(MAKE) --no-print-directory -C $(dir $@) print-binfiles
-+ 
-+ print-libfiles: $(addsuffix /print-libfiles, $(SUBDIRS))
-+ 
-+ %/print-libfiles:
-+ 	@$(MAKE) --no-print-directory -C $(dir $@) print-libfiles
-+ 
-  
-  .PHONY: $(SUBDIRS)
-  $(SUBDIRS) : mklibdir
+--- Makefile.orig	2015-11-06 18:43:31.000000000 -0400
++++ Makefile	2015-11-17 20:15:14.452502675 -0400
+@@ -30,7 +30,7 @@
+ 
+ # Reset the default goal, so that the all target will become default
+ .DEFAULT_GOAL :=
+-all: checkversion test_dependencies kaldi.mk mklibdir $(SUBDIRS)
++all: kaldi.mk mklibdir $(SUBDIRS)
+ 	-echo Done
+ 
+ mklibdir:
+@@ -45,14 +45,6 @@
+ 	@true
+ endif
+ 
+-.PHONY: checkversion
+-checkversion:
+-ifeq ($(shell ./configure --version),$(CONFIGURE_VERSION))
+-	@echo "The version of configure script matches kaldi.mk version. Good."
+-else
+-	$(error The kaldi.mk file was generated using a different version of configure script. Run the configure script again.)
+-endif
+-
+ biglib: $(SUBDIRS_LIB)
+ ifeq ($(KALDI_FLAVOR), dynamic)
+ ifeq ($(shell uname), Darwin)
+@@ -88,16 +80,6 @@
+ ext: test_dependencies ext_depend $(SUBDIRS) $(EXT_SUBDIRS)
+ 	-echo Done
+ 
+-ifndef OPENFST_VER
+-$(error Please rerun configure: OPENFST_VER is not defined, likely kaldi.mk was produced by older configure script.)
+-endif
+-# Note: OPENFST_VER is determined by configure and added to kaldi.mk
+-OPENFST_VER_NUM := $(shell echo $(OPENFST_VER) | sed 's/\./ /g' | xargs printf "%d%02d%02d")
+-test_dependencies:
+-ifeq ("$(shell expr $(OPENFST_VER_NUM) \< 10302)","1")
+-	$(error OpenFst $(OPENFST_VER) is not supported. You now need OpenFst >= 1.3.2.)
+-endif
+-
+ check_portaudio:
+ 	@[ -d ../tools/portaudio ] || ( cd ../tools;  ./install_portaudio.sh )
+ 
+@@ -131,6 +113,16 @@
+ ext_depend: check_portaudio
+ 	-for x in $(EXT_SUBDIRS); do $(MAKE) -C $$x depend; done
+ 
++print-binfiles: $(addsuffix /print-binfiles, $(SUBDIRS))
++
++%/print-binfiles:
++	@$(MAKE) --no-print-directory -C $(dir $@) print-binfiles
++
++print-libfiles: $(addsuffix /print-libfiles, $(SUBDIRS))
++
++%/print-libfiles:
++	@$(MAKE) --no-print-directory -C $(dir $@) print-libfiles
++
+ 
+ .PHONY: $(SUBDIRS)
+ $(SUBDIRS) : mklibdir