always pass MYARCH explicitly

[packages/dietlibc.git] / dietlibc-arm.patch

diff --git a/dietlibc-arm.patch b/dietlibc-arm.patch
index 06cd19512d96e1734d25d4411b0c229767defb9b..a2d26f967810f32d484c59fd639f72488864431b 100644 (file)
--- a/dietlibc-arm.patch
+++ b/dietlibc-arm.patch
@@ -1,14 +1,3 @@
---- dietlibc-0.30/Makefile.orig        2006-10-06 12:20:29.533089750 +0200
-+++ dietlibc-0.30/Makefile     2006-10-06 12:20:50.878423750 +0200
-@@ -8,7 +8,7 @@
- BINDIR=${prefix}/bin
- MAN1DIR=${prefix}/man/man1
- 
--MYARCH:=$(shell uname -m | sed -e 's/i[4-9]86/i386/' -e 's/armv[3-6]t\?e\?[lb]/arm/')
-+MYARCH:=$(shell uname -m | sed -e 's/i[4-9]86/i386/' -e 's/armv[3-6]t\?e\?j\?[lb]/arm/')
- 
- # This extra-ugly cruft is here so make will not run uname and sed each
- # time it looks at $(OBJDIR).  This alone sped up running make when
 diff -Nur dietlibc-0.32.orig/libpthread/Makefile dietlibc-0.32/libpthread/Makefile
 --- dietlibc-0.32.orig/libpthread/Makefile     2003-08-18 13:32:52.000000000 -0400
 +++ dietlibc-0.32/libpthread/Makefile  2010-06-21 09:42:08.000000000 -0400
@@ -17,7 +6,7 @@ diff -Nur dietlibc-0.32.orig/libpthread/Makefile dietlibc-0.32/libpthread/Makefi
  M=$(shell ../findcflags.sh $(CC))
  
 -ARCH=$(shell uname -m | sed 's/i[4-9]86/i386/')
-+ARCH=$(shell uname -m | sed -e 's/i[4-9]86/i386/' -e 's/armv[3-6]t\?e\?j\?[lb]/arm/')
++ARCH=$(shell uname -m | sed -e 's/i[4-9]86/i386/' -e 's/armv[3-7]t\?[eh]\?j\?[lb]/arm/')
  
  CFLAGS= -g #-pipe -O -march=k6
  CFLAGS= -pipe