[gentoo-commits] gentoo-x86 commit in app-crypt/truecrypt/files: makefile-archdetect.diff

[Dane Smith (c1pher)]

c1pher      11/06/01 19:51:23

  Modified:             makefile-archdetect.diff
  Log:
  app-crypt/truecrypt: Revbump. Better, more genertic fix for bug 369203. Also fix bug 369691.
  
  (Portage version: 2.2.0_alpha37/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  app-crypt/truecrypt/files/makefile-archdetect.diff

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/truecrypt/files/makefile-archdetect.diff?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/truecrypt/files/makefile-archdetect.diff?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/truecrypt/files/makefile-archdetect.diff?r1=1.1&r2=1.2

Index: makefile-archdetect.diff
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/files/makefile-archdetect.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- makefile-archdetect.diff	1 Jun 2011 14:46:10 -0000	1.1
+++ makefile-archdetect.diff	1 Jun 2011 19:51:23 -0000	1.2
@@ -1,11 +1,11 @@
 --- Makefile	2010-09-05 10:32:10.000000000 -0400
-+++ Makefile.new	2011-06-01 10:17:41.575000055 -0400
-@@ -128,7 +128,7 @@
- ifneq (,$(filter i386 i486 i586 i686 x86,$(ARCH)))
- 	CPU_ARCH = x86
- 	ASM_OBJ_FORMAT = elf32
--else ifneq (,$(filter x86_64 x86-64 amd64 x64,$(ARCH)))
-+else ifneq (,$(filter i3 i5 i7 x86_64 x86-64 amd64 x64,$(ARCH)))
- 	CPU_ARCH = x64
- 	ASM_OBJ_FORMAT = elf64
++++ Makefile.new	2011-06-01 15:23:24.975000088 -0400
+@@ -120,7 +120,7 @@
+ 
+ export CPU_ARCH ?= unknown
+ 
+-ARCH = $(shell uname -p)
++ARCH = $(shell uname -m)
+ ifeq "$(ARCH)" "unknown"
+ 	ARCH = $(shell uname -m)
  endif