summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/dependencies/libr/debian/patches/004-fix-force-arch.diff
blob: 9c25095ea4119e77e91e10e3ed188db664827ae2 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
Index: b/Makefile.in
===================================================================
--- a/Makefile.in
+++ b/Makefile.in
@@ -136,7 +136,6 @@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
-ARCH = @ARCH@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
Index: b/configure
===================================================================
--- a/configure
+++ b/configure
@@ -746,7 +746,6 @@
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
-ARCH
 BACKEND_PKG
 LIBR_BACKEND
 BACKEND_NAME
@@ -13062,44 +13061,6 @@
 
 
 
-## Handle target architecture configuration
-UNAMEM=`uname -m`;
-if test "$UNAMEM" = "i386" ; then
-	ARCH="i386";
-elif test "$UNAMEM" = "i486" ; then
-	ARCH="i386";
-elif test "$UNAMEM" = "i586" ; then
-	ARCH="i386";
-elif test "$UNAMEM" = "i686" ; then
-	ARCH="i386";
-elif test "$UNAMEM" = "armv5tejl" ; then
-	ARCH="armel";
-elif test "$UNAMEM" = "armv6l" ; then
-	ARCH="armhf";
-elif test "$UNAMEM" = "x86_64"; then
-	ARCH="amd64";
-fi
-if test "$ARCH" = "i386" ; then
-	CFLAGS="$CFLAGS -m32";
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: Ready for 32-bit compilation." >&5
-$as_echo "$as_me: Ready for 32-bit compilation." >&6;};
-elif test "$ARCH" = "amd64" ; then
-	CFLAGS="$CFLAGS -m64";
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: Ready for 64-bit compilation." >&5
-$as_echo "$as_me: Ready for 64-bit compilation." >&6;};
-elif test "$ARCH" = "armel" ; then
-	CFLAGS="$CFLAGS";
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: Ready for armel compilation." >&5
-$as_echo "$as_me: Ready for armel compilation." >&6;};
-elif test "$ARCH" = "armhf" ; then
-	CFLAGS="$CFLAGS";
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: Ready for armhf compilation." >&5
-$as_echo "$as_me: Ready for armhf compilation." >&6;};
-else
-	as_fn_error $? "Target architecture ${ARCH} is invalid!" "$LINENO" 5 ;
-fi
-
-## END Handle target architecture configuration
 
 ac_config_headers="$ac_config_headers config.h"
 
Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
@@ -71,40 +71,6 @@
 AC_SUBST(LIBR_BACKEND)
 AC_SUBST(BACKEND_PKG)
 
-## Handle target architecture configuration
-UNAMEM=`uname -m`;
-if test "$UNAMEM" = "i386" ; then
-	ARCH="i386";
-elif test "$UNAMEM" = "i486" ; then
-	ARCH="i386";
-elif test "$UNAMEM" = "i586" ; then
-	ARCH="i386";
-elif test "$UNAMEM" = "i686" ; then
-	ARCH="i386";
-elif test "$UNAMEM" = "armv5tejl" ; then
-	ARCH="armel";
-elif test "$UNAMEM" = "armv6l" ; then
-	ARCH="armhf";
-elif test "$UNAMEM" = "x86_64"; then
-	ARCH="amd64";
-fi
-if test "$ARCH" = "i386" ; then
-	CFLAGS="$CFLAGS -m32";
-	AC_MSG_NOTICE([Ready for 32-bit compilation.]);
-elif test "$ARCH" = "amd64" ; then
-	CFLAGS="$CFLAGS -m64";
-	AC_MSG_NOTICE([Ready for 64-bit compilation.]);
-elif test "$ARCH" = "armel" ; then
-	CFLAGS="$CFLAGS";
-	AC_MSG_NOTICE([Ready for armel compilation.]);
-elif test "$ARCH" = "armhf" ; then
-	CFLAGS="$CFLAGS";
-	AC_MSG_NOTICE([Ready for armhf compilation.]);
-else
-	AC_MSG_ERROR([Target architecture ${ARCH} is invalid!]);
-fi
-AC_SUBST(ARCH)
-## END Handle target architecture configuration
 
 AC_CONFIG_HEADERS(config.h)
 AC_OUTPUT(
Index: b/man/Makefile.in
===================================================================
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -81,7 +81,6 @@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
-ARCH = @ARCH@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
Index: b/src/Makefile.in
===================================================================
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -103,7 +103,6 @@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AR = @AR@
-ARCH = @ARCH@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@