packages libvpx x264: use prefixed yasm

mxe · Jul 13, 2013 · 82f84a6 · 82f84a6
1 parent b762717
commit 82f84a6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/src/libvpx.mk b/src/libvpx.mk
@@ -7,7 +7,7 @@ $(PKG)_CHECKSUM := 356af5f770c50cd021c60863203d8f30164f6021
 $(PKG)_SUBDIR   := $(PKG)-v$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-v$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://webm.googlecode.com/files/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc pthreads
+$(PKG)_DEPS     := gcc pthreads yasm
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://code.google.com/p/webm/downloads/list?sort=-uploaded' | \
@@ -16,13 +16,15 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
+    $(SED) -i 's,yasm[ $$],$(TARGET)-yasm ,g' '$(1)/build/make/configure.sh'
     cd '$(1)' && \
         CROSS='$(TARGET)-' \
         ./configure \
         --prefix='$(PREFIX)/$(TARGET)' \
         --target=libvpx-target \
         --disable-examples \
-        --disable-install-docs
+        --disable-install-docs \
+        --as=$(TARGET)-yasm
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
     $(TARGET)-ranlib $(PREFIX)/$(TARGET)/lib/libvpx.a

diff --git a/src/x264.mk b/src/x264.mk
@@ -14,16 +14,7 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    # native build of yasm
-    mkdir '$(1).native'
-    cd '$(1).native' && $(call UNPACK_PKG_ARCHIVE,yasm)
-    cd '$(1).native/$(yasm_SUBDIR)' && './configure' \
-        --disable-nls \
-        --disable-python
-    $(MAKE) -C '$(1).native/$(yasm_SUBDIR)' -j '$(JOBS)' yasm
-
-    # cross build with newly compiled yasm
-    $(SED) -i 's,yasm,$(1).native/$(yasm_SUBDIR)/yasm,g' '$(1)/configure'
+    $(SED) -i 's,yasm,$(TARGET)-yasm,g' '$(1)/configure'
     cd '$(1)' && ./configure \
         --cross-prefix='$(TARGET)'- \
         --host='$(TARGET)' \