diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2016-03-27 11:59:49 +0300 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2016-03-29 10:25:06 +0300 |
| commit | 2e4361dc8d5012e691c8157388d3e2cf9676dac3 (patch) | |
| tree | 59834b2ffe3421f14d7c9eea204c7f2e8e378e3d /data/ndk-build/tools.mk | |
| parent | 835eb99ef29a81fc186c74c6e9b45603295f24c1 (diff) | |
ndk-build: Set SED ourselves instead of relying on Android's HOST_SED
... which disappeared with NDK r11.
https://bugzilla.gnome.org/show_bug.cgi?id=763999
Diffstat (limited to 'data/ndk-build/tools.mk')
| -rw-r--r-- | data/ndk-build/tools.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/ndk-build/tools.mk b/data/ndk-build/tools.mk index c8f5a05d..5aa46889 100644 --- a/data/ndk-build/tools.mk +++ b/data/ndk-build/tools.mk @@ -61,7 +61,7 @@ pkg-config-get-libs = \ pkg-config-get-libs-no-deps = \ $(eval __tmpvar.libs := ) \ $(foreach package,$1,\ - $(eval __tmpvar.libs += $(shell $(HOST_SED) -n 's/^Libs: \(.*\)/\1/p' $(GSTREAMER_ROOT)/lib/pkgconfig/$(package).pc)))\ + $(eval __tmpvar.libs += $(shell $(SED) -n 's/^Libs: \(.*\)/\1/p' $(GSTREAMER_ROOT)/lib/pkgconfig/$(package).pc)))\ $(filter -l%, $(__tmpvar.libs)) # ----------------------------------------------------------------------------- @@ -71,7 +71,7 @@ pkg-config-get-libs-no-deps = \ # Usage : $(call pkg-config-get-prefix,<package>) # ----------------------------------------------------------------------------- pkg-config-get-prefix = \ - $(shell $(HOST_SED) -n 's/^prefix=\(.*\)/\1/p' $(GSTREAMER_ROOT)/lib/pkgconfig/$1.pc) + $(shell $(SED) -n 's/^prefix=\(.*\)/\1/p' $(GSTREAMER_ROOT)/lib/pkgconfig/$1.pc) # ----------------------------------------------------------------------------- # Function : libtool-whole-archive @@ -259,10 +259,10 @@ libtool-get-search-paths = \ $(filter -L%,$1) libtool-get-dependency-libs = \ - $(shell $(HOST_SED) -n "s/^dependency_libs='\(.*\)'/\1/p" $1) + $(shell $(SED) -n "s/^dependency_libs='\(.*\)'/\1/p" $1) libtool-replace-prefixes = \ $(subst $(BUILD_PREFIX),$(GSTREAMER_ROOT),$1 ) libtool-get-static-library = \ - $(shell $(HOST_SED) -n "s/^old_library='\(.*\)'/\1/p" $1) + $(shell $(SED) -n "s/^old_library='\(.*\)'/\1/p" $1) |