From 9e673f2a4b3ec81f9b32af43b6015d7401bfba8f Mon Sep 17 00:00:00 2001
From: Luiz Angelo Daros de Luca <luizluca@gmail.com>
Date: Mon, 15 Dec 2014 18:29:57 -0200
Subject: [PATCH] libvpx: force to use gcc as linker

libvpx excepts gcc to be used as linker. However, it respects
what is defined in LD. The problem is that LD is defined by
OpenWRT as *-ld.

Forcing the LD env for configure and make solves the problem.
Also, the patch that modified ld call to match what *-ld provides
is not needed anymore.

Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
---
 libs/libvpx/Makefile                    | 10 +++++++---
 libs/libvpx/patches/001-remove_Wl.patch | 12 ------------
 2 files changed, 7 insertions(+), 15 deletions(-)
 delete mode 100644 libs/libvpx/patches/001-remove_Wl.patch

diff --git a/libs/libvpx/Makefile b/libs/libvpx/Makefile
index 58ad08f4c..4d8bb46b6 100644
--- a/libs/libvpx/Makefile
+++ b/libs/libvpx/Makefile
@@ -23,7 +23,6 @@ PKG_MAINTAINER:=Luiz Angelo Daros de Luca <luizluca@gmail.com>
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
-#PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
@@ -55,9 +54,14 @@ ifneq ($(findstring -Os,$(TARGET_CFLAGS)),)
 CONFIGURE_ARGS += --enable-small
 endif
 
+# libvpx expects gcc as linker but uses $LD if provided
+# However, OpenWRT defines LD as *-uclibc-ld and not *-gcc
 CONFIGURE_VARS += \
-    CROSS=$(GNU_TARGET_NAME)\
-    extralibs="-lc -lgcc_s"
+    CROSS=$(GNU_TARGET_NAME) \
+	LD="$(TARGET_CC)" \
+
+MAKE_FLAGS += \
+	LD="$(TARGET_CC)" \
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include/vpx/
diff --git a/libs/libvpx/patches/001-remove_Wl.patch b/libs/libvpx/patches/001-remove_Wl.patch
deleted file mode 100644
index cac3d84a1..000000000
--- a/libs/libvpx/patches/001-remove_Wl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- libvpx-1.3.0/build/make/Makefile.old	2014-12-06 02:17:06.648714353 -0200
-+++ libvpx-1.3.0/build/make/Makefile	2014-12-06 02:17:16.096555499 -0200
-@@ -268,8 +268,8 @@
- $(1):
- 	$(if $(quiet),@echo "    [LD] $$@")
- 	$(qexec)$$(LD) -shared $$(LDFLAGS) \
--            -Wl,--no-undefined -Wl,-soname,$$(SONAME) \
--            -Wl,--version-script,$$(EXPORTS_FILE) -o $$@ \
-+            --no-undefined -soname $$(SONAME) \
-+            --version-script $$(EXPORTS_FILE) -o $$@ \
-             $$(filter %.o,$$^) $$(extralibs)
- endef