summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <mail@waldemar-brodkorb.de>2014-01-22 19:47:30 +0100
committerWaldemar Brodkorb <mail@waldemar-brodkorb.de>2014-01-22 19:47:30 +0100
commitf246f89c65438646d25517773ac7defc60dae6e4 (patch)
treec71d2b500c815787ecc572f6a126f4043cb10b98
parentc7b25f4c5726394f2cc57b924bb7913a3882255e (diff)
fix compile for arm
-rw-r--r--package/libx264/Makefile5
-rw-r--r--package/libx264/patches/patch-configure11
2 files changed, 13 insertions, 3 deletions
diff --git a/package/libx264/Makefile b/package/libx264/Makefile
index de7c6a56f..55bd18868 100644
--- a/package/libx264/Makefile
+++ b/package/libx264/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libx264
# actually is git checkout from 22.01.2014
PKG_VERSION:= 1.0.1
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 6be3e8adeaf6b007bbc04026b6ebd304
PKG_DESCR:= H264 encoding library
PKG_SECTION:= libs
@@ -23,7 +23,8 @@ $(eval $(call PKG_template,LIBX264,libx264,$(PKG_VERSION)-${PKG_RELEASE},${PKG_D
ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y)
CONFIGURE_ARGS+= --disable-asm
endif
-CONFIGURE_ARGS+= --disable-cli
+CONFIGURE_ARGS+= --disable-cli \
+ --cross-prefix=$(TARGET_CROSS)
libx264-install:
$(INSTALL_DIR) $(IDIR_LIBX264)/usr/lib
diff --git a/package/libx264/patches/patch-configure b/package/libx264/patches/patch-configure
index 3fdcd36fd..ed9d2ed94 100644
--- a/package/libx264/patches/patch-configure
+++ b/package/libx264/patches/patch-configure
@@ -1,5 +1,14 @@
--- libx264-1.0.1.orig/configure 2014-01-22 11:20:21.000000000 +0100
-+++ libx264-1.0.1/configure 2014-01-22 11:29:13.000000000 +0100
++++ libx264-1.0.1/configure 2014-01-22 19:42:21.000000000 +0100
+@@ -662,7 +662,7 @@ case $host_cpu in
+ LDFLAGS="$LDFLAGS -arch armv7"
+ fi
+ else
+- AS="${AS-${cross_prefix}gcc}"
++ AS="${cross_prefix}gcc"
+ fi
+ ;;
+ s390|s390x)
@@ -1007,9 +1007,9 @@ if [ "$debug" = "yes" ]; then
elif [ $ARCH = ARM ]; then
# arm-gcc-4.2 produces incorrect output with -ffast-math