瀏覽代碼

disable for arm at the moment, need to find newer patches for armv5/v6 support

Waldemar Brodkorb 11 年之前
父節點
當前提交
4a6a13a35b
共有 2 個文件被更改,包括 40 次插入4 次删除
  1. 1 1
      package/valgrind/Makefile
  2. 39 3
      package/valgrind/patches/patch-configure_ac

+ 1 - 1
package/valgrind/Makefile

@@ -13,7 +13,7 @@ PKG_BUILDDEP:=		autotool
 PKG_URL:=		http://valgrind.org/
 PKG_SITES:=		http://valgrind.org/downloads/
 
-PKG_ARCH_DEPENDS:=	ppc ppc64 mips mipsel mips64 mips64el x86 x86_64 arm native
+PKG_ARCH_DEPENDS:=	ppc ppc64 mips mipsel mips64 mips64el x86 x86_64 native
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 

+ 39 - 3
package/valgrind/patches/patch-configure_ac

@@ -1,6 +1,42 @@
 --- valgrind-3.9.0.orig/configure.ac	2013-11-01 00:28:16.000000000 +0100
-+++ valgrind-3.9.0/configure.ac	2013-11-03 15:21:25.000000000 +0100
-@@ -792,6 +792,15 @@ AC_EGREP_CPP([BIONIC_LIBC], [
++++ valgrind-3.9.0/configure.ac	2013-11-07 17:26:16.000000000 +0100
+@@ -155,6 +155,7 @@ esac
+ # configure-time, and distinguishes them from the VGA_*/VGO_*/VGP_*
+ # variables used when compiling C files.
+ 
++VGCONF_PLATFORM_ARM_ARCH=
+ AC_CANONICAL_HOST
+ 
+ AC_MSG_CHECKING([for a supported CPU])
+@@ -191,8 +192,18 @@ case "${host_cpu}" in
+         ;;
+ 
+      armv7*)
++	# This means we use a armv7 toolchain - at least Cortex-A8
+ 	AC_MSG_RESULT([ok (${host_cpu})])
+ 	ARCH_MAX="arm"
++	VGCONF_PLATFORM_ARM_ARCH="-march=armv7 -mcpu=cortex-a8"
++	;;
++
++     arm*)
++	# Generic arm toolchain - we will target armv6
++	AC_MSG_RESULT([(${host_cpu}) - no armv7 toolchain specified, will enforce armv6 when compiling])
++	ARCH_MAX="arm"
++	VGCONF_PLATFORM_ARM_ARCH="-march=armv6"
++	AC_DEFINE(ARM_ARCH_V6,1,"Defined for v6 architectures")
+ 	;;
+ 
+      mips)
+@@ -225,6 +236,8 @@ case "${host_cpu}" in
+ 	;;
+ esac
+ 
++AC_SUBST(VGCONF_PLATFORM_ARM_ARCH)
++
+ #----------------------------------------------------------------------------
+ 
+ # Sometimes it's convenient to subvert the bi-arch build system and
+@@ -792,6 +805,15 @@ AC_EGREP_CPP([BIONIC_LIBC], [
  ],
  GLIBC_VERSION="bionic")
  
@@ -16,7 +52,7 @@
  
  AC_MSG_CHECKING([the GLIBC_VERSION version])
  
-@@ -928,10 +937,13 @@ case "${GLIBC_VERSION}" in
+@@ -928,10 +950,13 @@ case "${GLIBC_VERSION}" in
  	AC_DEFINE([BIONIC_LIBC], 1, [Define to 1 if you're using Bionic])
  	DEFAULT_SUPP="bionic.supp ${DEFAULT_SUPP}"
  	;;