[patch] harfbuzz-0.9.9 - don't call sub-make ?

harfbuzz-0.9.9-dont-call-sub-make.patch (text/plain), 2.61 KB, created by iGentoo on 2012-12-17 16:23:25 UTC

 src/Makefile.am               | 4 ++--
 src/Makefile.in               | 5 +++--
 src/check-exported-symbols.sh | 4 +---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index b7896bf..e68b73c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -214,11 +214,12 @@ harfbuzz.def: $(HBHEADERS)
 	(cat $^ || echo 'hb_ERROR ()' ) | \
 	$(EGREP) '^hb_.* \(' | \
 	sed -e 's/ (.*//' | \
-	LANG=C sort; \
+	LC_ALL=C sort; \
 	echo LIBRARY libharfbuzz-$(HB_VERSION_MAJOR).dll; \
 	) >"$@.tmp"
 	@ ! grep -q hb_ERROR "$@.tmp" && mv "$@.tmp" "$@" || ($(RM) "$@"; false)
 
+check-exported-symbols.sh: harfbuzz.def
 
 GENERATORS = \
 	gen-arabic-table.py \
@@ -287,7 +288,6 @@ endif
 TESTS = $(dist_check_SCRIPTS)
 TESTS_ENVIRONMENT = \
 	srcdir="$(srcdir)" \
-	MAKE="$(MAKE) $(AM_MAKEFLAGS)" \
 	HBSOURCES="$(HBSOURCES)" \
 	HBHEADERS="$(HBHEADERS)" \
 	$(NULL)
diff --git a/src/Makefile.in b/src/Makefile.in
index 21ac3ba..5330029 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -619,7 +619,6 @@ dist_check_SCRIPTS = check-c-linkage-decls.sh check-header-guards.sh \
 	$(am__append_49)
 TESTS_ENVIRONMENT = \
 	srcdir="$(srcdir)" \
-	MAKE="$(MAKE) $(AM_MAKEFLAGS)" \
 	HBSOURCES="$(HBSOURCES)" \
 	HBHEADERS="$(HBHEADERS)" \
 	$(NULL)
@@ -1609,11 +1608,13 @@ harfbuzz.def: $(HBHEADERS)
 	(cat $^ || echo 'hb_ERROR ()' ) | \
 	$(EGREP) '^hb_.* \(' | \
 	sed -e 's/ (.*//' | \
-	LANG=C sort; \
+	LC_ALL=C sort; \
 	echo LIBRARY libharfbuzz-$(HB_VERSION_MAJOR).dll; \
 	) >"$@.tmp"
 	@ ! grep -q hb_ERROR "$@.tmp" && mv "$@.tmp" "$@" || ($(RM) "$@"; false)
 
+check-exported-symbols.sh: harfbuzz.def
+
 unicode-tables: arabic-table indic-table
 
 indic-table: gen-indic-table.py IndicSyllabicCategory.txt IndicMatraCategory.txt Blocks.txt
diff --git a/src/check-exported-symbols.sh b/src/check-exported-symbols.sh
index a7d6f9b..8b023fe 100755
--- a/src/check-exported-symbols.sh
+++ b/src/check-exported-symbols.sh
@@ -4,7 +4,6 @@ LC_ALL=C
 export LC_ALL
 
 test -z "$srcdir" && srcdir=.
-test -z "$MAKE" && MAKE=make
 stat=0
 
 if which nm 2>/dev/null >/dev/null; then
@@ -15,7 +14,6 @@ else
 fi
 
 defs="harfbuzz.def"
-$MAKE $defs > /dev/null
 tested=false
 for def in $defs; do
 	lib=`echo "$def" | sed 's/[.]def$//;s@.*/@@'`
@@ -24,7 +22,7 @@ for def in $defs; do
 		echo "Checking that $so has the same symbol list as $def"
 		{
 			echo EXPORTS
-			nm "$so" | grep ' [BCDGINRSTVW] ' | grep -v ' T _fini\>\| T _init\>' | cut -d' ' -f3
+			nm "$so" | grep ' [BCDGINRSTVW] ' | grep -v ' T _fini\>\| T _init\>' | cut -d' ' -f3 #| LC_ALL=C sort
 			stat=1
 			# cheat: copy the last line from the def file!
 			tail -n1 "$def"