* [gentoo-commits] proj/sci:master commit in: sci-misc/kaldi/files/
@ 2015-11-20 11:39 Justin Lecher
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher @ 2015-11-20 11:39 UTC (permalink / raw
To: gentoo-commits
commit: a1da40b60fe840950f023512d099ffb4078c11fa
Author: Pavel Denisov <pavel.a.denisov <AT> gmail <DOT> com>
AuthorDate: Thu Nov 19 01:00:40 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 01:20:29 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=a1da40b6
sci-misc/kaldi: Create unified diff for Makefile patch
Package-Manager: portage-2.2.24
sci-misc/kaldi/files/Makefile.patch | 117 ++++++++++++++++++------------------
1 file changed, 60 insertions(+), 57 deletions(-)
diff --git a/sci-misc/kaldi/files/Makefile.patch b/sci-misc/kaldi/files/Makefile.patch
index ef1a606..9fa1841 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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-misc/kaldi/files/
@ 2015-11-20 11:39 Justin Lecher
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher @ 2015-11-20 11:39 UTC (permalink / raw
To: gentoo-commits
commit: 889fa1375816b99303707b0da7e06d9e6cffddd2
Author: Pavel Denisov <pavel.a.denisov <AT> gmail <DOT> com>
AuthorDate: Tue Nov 10 00:02:11 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 01:20:29 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=889fa137
sci-misc/kaldi: Create unified diff for default_rules.mk patch
Package-Manager: portage-2.2.24
.../kaldi/files/default_rules.mk.a7d9824.patch | 78 +++++++++-------------
1 file changed, 30 insertions(+), 48 deletions(-)
diff --git a/sci-misc/kaldi/files/default_rules.mk.a7d9824.patch b/sci-misc/kaldi/files/default_rules.mk.a7d9824.patch
index 458d453..7e60268 100644
--- a/sci-misc/kaldi/files/default_rules.mk.a7d9824.patch
+++ b/sci-misc/kaldi/files/default_rules.mk.a7d9824.patch
@@ -1,48 +1,30 @@
-*** makefiles/default_rules.mk.orig 2015-10-28 22:11:07.903182744 -0400
---- makefiles/default_rules.mk 2015-10-29 20:43:41.081851545 -0400
-***************
-*** 14,20 ****
- LIBFILE = lib$(LIBNAME).so
- #LDLIBS += -l$(LIBNAME)
- endif
-! LDFLAGS += -Wl,-rpath=$(shell readlink -f $(KALDILIBDIR)) -L.
- LDFLAGS += $(foreach dep,$(ADDLIBS), -L$(dir $(dep)) )
- XDEPENDS = $(foreach dep,$(ADDLIBS), $(dir $(dep))/lib$(notdir $(basename $(dep))).so )
- else # Platform not supported
---- 14,20 ----
- LIBFILE = lib$(LIBNAME).so
- #LDLIBS += -l$(LIBNAME)
- endif
-! LDFLAGS += -L.
- LDFLAGS += $(foreach dep,$(ADDLIBS), -L$(dir $(dep)) )
- XDEPENDS = $(foreach dep,$(ADDLIBS), $(dir $(dep))/lib$(notdir $(basename $(dep))).so )
- else # Platform not supported
-***************
-*** 75,81 ****
- @{ result=0; \
- for x in $(TESTFILES); do \
- printf "Running $$x ..."; \
-! ./$$x >$$x.testlog 2>&1; \
- if [ $$? -ne 0 ]; then \
- echo "... FAIL $$x"; \
- result=1; \
---- 75,81 ----
- @{ result=0; \
- for x in $(TESTFILES); do \
- printf "Running $$x ..."; \
-! LD_LIBRARY_PATH=$(KALDILIBDIR):${LD_LIBRARY_PATH} ./$$x >$$x.testlog 2>&1; \
- if [ $$? -ne 0 ]; then \
- echo "... FAIL $$x"; \
- result=1; \
-***************
-*** 99,101 ****
---- 99,107 ----
- # removing automatic making of "depend" as it's quite slow.
- #.depend.mk: depend
- -include .depend.mk
-+
-+ print-binfiles:
-+ @echo $(addprefix $(shell pwd)/, $(BINFILES))
-+
-+ print-libfiles:
-+ @echo $(addsuffix .so, $(addprefix $(shell pwd)/lib, $(LIBNAME)))
+--- makefiles/default_rules.mk.orig 2015-11-06 18:43:31.000000000 -0400
++++ makefiles/default_rules.mk 2015-11-09 18:42:33.609774157 -0400
+@@ -14,7 +14,7 @@
+ LIBFILE = lib$(LIBNAME).so
+ #LDLIBS += -l$(LIBNAME)
+ endif
+- LDFLAGS += -Wl,-rpath=$(shell readlink -f $(KALDILIBDIR)) -L.
++ LDFLAGS += -L.
+ LDFLAGS += $(foreach dep,$(ADDLIBS), -L$(dir $(dep)) )
+ XDEPENDS = $(foreach dep,$(ADDLIBS), $(dir $(dep))/lib$(notdir $(basename $(dep))).so )
+ else # Platform not supported
+@@ -75,7 +75,7 @@
+ @{ result=0; \
+ for x in $(TESTFILES); do \
+ printf "Running $$x ..."; \
+- ./$$x >$$x.testlog 2>&1; \
++ LD_LIBRARY_PATH=$(KALDILIBDIR):${LD_LIBRARY_PATH} ./$$x >$$x.testlog 2>&1; \
+ if [ $$? -ne 0 ]; then \
+ echo "... FAIL $$x"; \
+ result=1; \
+@@ -99,3 +99,9 @@
+ # removing automatic making of "depend" as it's quite slow.
+ #.depend.mk: depend
+ -include .depend.mk
++
++print-binfiles:
++ @echo $(addprefix $(shell pwd)/, $(BINFILES))
++
++print-libfiles:
++ @echo $(addsuffix .so, $(addprefix $(shell pwd)/lib, $(LIBNAME)))
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-11-20 11:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-20 11:39 [gentoo-commits] proj/sci:master commit in: sci-misc/kaldi/files/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2015-11-20 11:39 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox