diff options
| author |   Pavel Denisov <pavel.a.denisov@gmail.com> | 2015-11-09 20:02:11 -0400 |
|---|---|---|
| committer | Pavel Denisov <pavel.a.denisov@gmail.com> | 2015-11-18 21:20:29 -0400 |
| commit | 889fa1375816b99303707b0da7e06d9e6cffddd2 (patch) | |
| tree | fe994506761c71ae360d8830404b0973bb8e63e6 /sci-misc | |
| parent | sci-misc/kaldi: Change dohtml to dodoc (diff) | |
| download | sci-889fa1375816b99303707b0da7e06d9e6cffddd2.tar.gz sci-889fa1375816b99303707b0da7e06d9e6cffddd2.tar.bz2 sci-889fa1375816b99303707b0da7e06d9e6cffddd2.zip | |
sci-misc/kaldi: Create unified diff for default_rules.mk patch
Package-Manager: portage-2.2.24
Diffstat (limited to 'sci-misc')
| -rw-r--r-- | sci-misc/kaldi/files/default_rules.mk.a7d9824.patch | 78 |
1 files 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 458d45341..7e60268bc 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))) |