~ubuntu-branches/ubuntu/quantal/gnupg2/quantal-proposed
» Revision
15
: debian/patches/debian-changes
« back to all changes in this revision
Viewing changes to debian/patches/debian-changes
- browse files at revision 15
- compare with another revision
- download diff
- download tarball
- view history from revision 15
- Committer: Bazaar Package Importer
- Author(s): Marc Deslauriers
- Date: 2010-08-11 13:56:02 UTC
- Revision ID: james.westby@ubuntu.com-20100811135602-8v2bjfipkk5yocqe
Tags: 2.0.14-1.1ubuntu2
* SECURITY UPDATE: denial of service and possible arbitrary code
execution via certificate with large number of Subject Alternate Names
- debian/patches/CVE-2010-2547.patch: fix use-after-free in
kbx/keybox-blob.c.
- CVE-2010-2547
execution via certificate with large number of Subject Alternate Names
- debian/patches/CVE-2010-2547.patch: fix use-after-free in
kbx/keybox-blob.c.
- CVE-2010-2547
- files added:
- .pc/CVE-2010-2547.patch
- .pc/CVE-2010-2547.patch/kbx
- files modified:
- .pc/applied-patches
added
removed
debian/patches/debian-changes
1
1
Please use the git repo for development.
2
--- gnupg2-2.0.14.orig/configure
3
+++ gnupg2-2.0.14/configure
4
@@ -746,6 +746,7 @@ GNUPG_PINENTRY_PGM
5
GNUPG_AGENT_PGM_FALSE
6
GNUPG_AGENT_PGM_TRUE
7
GNUPG_AGENT_PGM
8
+pkgdatadir
9
PACKAGE_GT
10
EGREP
11
GREP
12
@@ -4803,6 +4804,9 @@ fi
13
14
15
16
+# Override for Debian packaging.
17
+pkgdatadir="\$(datadir)/gnupg2"
18
+
19
20
cat >>confdefs.h <<_ACEOF
21
#define PACKAGE "$PACKAGE"
22
--- gnupg2-2.0.14.orig/Makefile.in
23
+++ gnupg2-2.0.14/Makefile.in
24
@@ -33,7 +33,6 @@
25
# along with this program; if not, see <http://www.gnu.org/licenses/>.
26
27
VPATH = @srcdir@
28
-pkgdatadir = $(datadir)/@PACKAGE@
29
pkglibdir = $(libdir)/@PACKAGE@
30
pkgincludedir = $(includedir)/@PACKAGE@
31
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
32
@@ -55,10 +54,10 @@ DIST_COMMON = README $(am__configure_dep
33
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
34
$(srcdir)/config.h.in $(top_srcdir)/configure ABOUT-NLS \
35
AUTHORS COPYING COPYING.LIB ChangeLog INSTALL NEWS THANKS TODO \
36
- scripts/ChangeLog scripts/compile scripts/config.guess \
37
- scripts/config.rpath scripts/config.sub scripts/depcomp \
38
- scripts/install-sh scripts/mdate-sh scripts/missing \
39
- scripts/mkinstalldirs scripts/texinfo.tex
40
+ config.guess config.sub scripts/ChangeLog scripts/compile \
41
+ scripts/config.guess scripts/config.rpath scripts/config.sub \
42
+ scripts/depcomp scripts/install-sh scripts/mdate-sh \
43
+ scripts/missing scripts/mkinstalldirs scripts/texinfo.tex
44
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
45
am__aclocal_m4_deps = $(top_srcdir)/gl/m4/absolute-header.m4 \
46
$(top_srcdir)/gl/m4/alloca.m4 $(top_srcdir)/gl/m4/allocsa.m4 \
47
@@ -124,6 +123,7 @@ GZIP_ENV = --best
48
DIST_ARCHIVES = $(distdir).tar.bz2
49
distuninstallcheck_listfiles = find . -type f -print
50
distcleancheck_listfiles = find . -type f -print
51
+pkgdatadir = @pkgdatadir@
52
ABSOLUTE_STDINT_H = @ABSOLUTE_STDINT_H@
53
ACLOCAL = @ACLOCAL@
54
ADNSLIBS = @ADNSLIBS@
2
55
--- /dev/null
3
+++ gnupg2-2.0.14/config.sub
4
@@ -0,0 +1,1714 @@
5
+#! /bin/sh
6
+# Configuration validation subroutine script.
7
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
8
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
9
+# Free Software Foundation, Inc.
10
+
11
+timestamp='2010-01-22'
12
+
13
+# This file is (in principle) common to ALL GNU software.
14
+# The presence of a machine in this file suggests that SOME GNU software
15
+# can handle that machine. It does not imply ALL GNU software can.
16
+#
17
+# This file is free software; you can redistribute it and/or modify
18
+# it under the terms of the GNU General Public License as published by
19
+# the Free Software Foundation; either version 2 of the License, or
20
+# (at your option) any later version.
21
+#
22
+# This program is distributed in the hope that it will be useful,
23
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
24
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
25
+# GNU General Public License for more details.
26
+#
27
+# You should have received a copy of the GNU General Public License
28
+# along with this program; if not, write to the Free Software
29
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
30
+# 02110-1301, USA.
31
+#
32
+# As a special exception to the GNU General Public License, if you
33
+# distribute this file as part of a program that contains a
34
+# configuration script generated by Autoconf, you may include it under
35
+# the same distribution terms that you use for the rest of that program.
36
+
37
+
38
+# Please send patches to <config-patches@gnu.org>. Submit a context
39
+# diff and a properly formatted GNU ChangeLog entry.
40
+#
41
+# Configuration subroutine to validate and canonicalize a configuration type.
42
+# Supply the specified configuration type as an argument.
43
+# If it is invalid, we print an error message on stderr and exit with code 1.
44
+# Otherwise, we print the canonical config type on stdout and succeed.
45
+
46
+# You can get the latest version of this script from:
47
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
48
+
49
+# This file is supposed to be the same for all GNU packages
50
+# and recognize all the CPU types, system types and aliases
51
+# that are meaningful with *any* GNU software.
52
+# Each package is responsible for reporting which valid configurations
53
+# it does not support. The user should be able to distinguish
54
+# a failure to support a valid configuration from a meaningless
55
+# configuration.
56
+
57
+# The goal of this file is to map all the various variations of a given
58
+# machine specification into a single specification in the form:
59
+# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
60
+# or in some cases, the newer four-part form:
61
+# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
62
+# It is wrong to echo any other type of specification.
63
+
64
+me=`echo "$0" | sed -e 's,.*/,,'`
65
+
66
+usage="\
67
+Usage: $0 [OPTION] CPU-MFR-OPSYS
68
+ $0 [OPTION] ALIAS
69
+
70
+Canonicalize a configuration name.
71
+
72
+Operation modes:
73
+ -h, --help print this help, then exit
74
+ -t, --time-stamp print date of last modification, then exit
75
+ -v, --version print version number, then exit
76
+
77
+Report bugs and patches to <config-patches@gnu.org>."
78
+
79
+version="\
80
+GNU config.sub ($timestamp)
81
+
82
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
83
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
84
+Software Foundation, Inc.
85
+
86
+This is free software; see the source for copying conditions. There is NO
87
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
88
+
89
+help="
90
+Try \`$me --help' for more information."
91
+
92
+# Parse command line
93
+while test $# -gt 0 ; do
94
+ case $1 in
95
+ --time-stamp | --time* | -t )
96
+ echo "$timestamp" ; exit ;;
97
+ --version | -v )
98
+ echo "$version" ; exit ;;
99
+ --help | --h* | -h )
100
+ echo "$usage"; exit ;;
101
+ -- ) # Stop option processing
102
+ shift; break ;;
103
+ - ) # Use stdin as input.
104
+ break ;;
105
+ -* )
106
+ echo "$me: invalid option $1$help"
107
+ exit 1 ;;
108
+
109
+ *local*)
110
+ # First pass through any local machine types.
111
+ echo $1
112
+ exit ;;
113
+
114
+ * )
115
+ break ;;
116
+ esac
117
+done
118
+
119
+case $# in
120
+ 0) echo "$me: missing argument$help" >&2
121
+ exit 1;;
122
+ 1) ;;
123
+ *) echo "$me: too many arguments$help" >&2
124
+ exit 1;;
125
+esac
126
+
127
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
128
+# Here we must recognize all the valid KERNEL-OS combinations.
129
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
130
+case $maybe_os in
131
+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
132
+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
133
+ kopensolaris*-gnu* | \
134
+ storm-chaos* | os2-emx* | rtmk-nova*)
135
+ os=-$maybe_os
136
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
137
+ ;;
138
+ *)
139
+ basic_machine=`echo $1 | sed 's/-[^-]*$//'`
140
+ if [ $basic_machine != $1 ]
141
+ then os=`echo $1 | sed 's/.*-/-/'`
142
+ else os=; fi
143
+ ;;
144
+esac
145
+
146
+### Let's recognize common machines as not being operating systems so
147
+### that things like config.sub decstation-3100 work. We also
148
+### recognize some manufacturers as not being operating systems, so we
149
+### can provide default operating systems below.
150
+case $os in
151
+ -sun*os*)
152
+ # Prevent following clause from handling this invalid input.
153
+ ;;
154
+ -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
155
+ -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
156
+ -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
157
+ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
158
+ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
159
+ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
160
+ -apple | -axis | -knuth | -cray | -microblaze)
161
+ os=
162
+ basic_machine=$1
163
+ ;;
164
+ -bluegene*)
165
+ os=-cnk
166
+ ;;
167
+ -sim | -cisco | -oki | -wec | -winbond)
168
+ os=
169
+ basic_machine=$1
170
+ ;;
171
+ -scout)
172
+ ;;
173
+ -wrs)
174
+ os=-vxworks
175
+ basic_machine=$1
176
+ ;;
177
+ -chorusos*)
178
+ os=-chorusos
179
+ basic_machine=$1
180
+ ;;
181
+ -chorusrdb)
182
+ os=-chorusrdb
183
+ basic_machine=$1
184
+ ;;
185
+ -hiux*)
186
+ os=-hiuxwe2
187
+ ;;
188
+ -sco6)
189
+ os=-sco5v6
190
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
191
+ ;;
192
+ -sco5)
193
+ os=-sco3.2v5
194
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
195
+ ;;
196
+ -sco4)
197
+ os=-sco3.2v4
198
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
199
+ ;;
200
+ -sco3.2.[4-9]*)
201
+ os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
202
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
203
+ ;;
204
+ -sco3.2v[4-9]*)
205
+ # Don't forget version if it is 3.2v4 or newer.
206
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
207
+ ;;
208
+ -sco5v6*)
209
+ # Don't forget version if it is 3.2v4 or newer.
210
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
211
+ ;;
212
+ -sco*)
213
+ os=-sco3.2v2
214
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
215
+ ;;
216
+ -udk*)
217
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
218
+ ;;
219
+ -isc)
220
+ os=-isc2.2
221
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
222
+ ;;
223
+ -clix*)
224
+ basic_machine=clipper-intergraph
225
+ ;;
226
+ -isc*)
227
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
228
+ ;;
229
+ -lynx*)
230
+ os=-lynxos
231
+ ;;
232
+ -ptx*)
233
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
234
+ ;;
235
+ -windowsnt*)
236
+ os=`echo $os | sed -e 's/windowsnt/winnt/'`
237
+ ;;
238
+ -psos*)
239
+ os=-psos
240
+ ;;
241
+ -mint | -mint[0-9]*)
242
+ basic_machine=m68k-atari
243
+ os=-mint
244
+ ;;
245
+esac
246
+
247
+# Decode aliases for certain CPU-COMPANY combinations.
248
+case $basic_machine in
249
+ # Recognize the basic CPU types without company name.
250
+ # Some are omitted here because they have special meanings below.
251
+ 1750a | 580 \
252
+ | a29k \
253
+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
254
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
255
+ | am33_2.0 \
256
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
257
+ | bfin \
258
+ | c4x | clipper \
259
+ | d10v | d30v | dlx | dsp16xx \
260
+ | fido | fr30 | frv \
261
+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
262
+ | i370 | i860 | i960 | ia64 \
263
+ | ip2k | iq2000 \
264
+ | lm32 \
265
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
266
+ | maxq | mb | microblaze | mcore | mep | metag \
267
+ | mips | mipsbe | mipseb | mipsel | mipsle \
268
+ | mips16 \
269
+ | mips64 | mips64el \
270
+ | mips64octeon | mips64octeonel \
271
+ | mips64orion | mips64orionel \
272
+ | mips64r5900 | mips64r5900el \
273
+ | mips64vr | mips64vrel \
274
+ | mips64vr4100 | mips64vr4100el \
275
+ | mips64vr4300 | mips64vr4300el \
276
+ | mips64vr5000 | mips64vr5000el \
277
+ | mips64vr5900 | mips64vr5900el \
278
+ | mipsisa32 | mipsisa32el \
279
+ | mipsisa32r2 | mipsisa32r2el \
280
+ | mipsisa64 | mipsisa64el \
281
+ | mipsisa64r2 | mipsisa64r2el \
282
+ | mipsisa64sb1 | mipsisa64sb1el \
283
+ | mipsisa64sr71k | mipsisa64sr71kel \
284
+ | mipstx39 | mipstx39el \
285
+ | mn10200 | mn10300 \
286
+ | moxie \
287
+ | mt \
288
+ | msp430 \
289
+ | nios | nios2 \
290
+ | ns16k | ns32k \
291
+ | or32 \
292
+ | pdp10 | pdp11 | pj | pjl \
293
+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
294
+ | pyramid \
295
+ | rx \
296
+ | score \
297
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
298
+ | sh64 | sh64le \
299
+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
300
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
301
+ | spu | strongarm \
302
+ | tahoe | thumb | tic4x | tic80 | tron \
303
+ | ubicom32 \
304
+ | v850 | v850e \
305
+ | we32k \
306
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
307
+ | z8k | z80)
308
+ basic_machine=$basic_machine-unknown
309
+ ;;
310
+ m6811 | m68hc11 | m6812 | m68hc12 | picochip)
311
+ # Motorola 68HC11/12.
312
+ basic_machine=$basic_machine-unknown
313
+ os=-none
314
+ ;;
315
+ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
316
+ ;;
317
+ ms1)
318
+ basic_machine=mt-unknown
319
+ ;;
320
+
321
+ # We use `pc' rather than `unknown'
322
+ # because (1) that's what they normally are, and
323
+ # (2) the word "unknown" tends to confuse beginning users.
324
+ i*86 | x86_64)
325
+ basic_machine=$basic_machine-pc
326
+ ;;
327
+ # Object if more than one company name word.
328
+ *-*-*)
329
+ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
330
+ exit 1
331
+ ;;
332
+ # Recognize the basic CPU types with company name.
333
+ 580-* \
334
+ | a29k-* \
335
+ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
336
+ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
337
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
338
+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
339
+ | avr-* | avr32-* \
340
+ | bfin-* | bs2000-* \
341
+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
342
+ | clipper-* | craynv-* | cydra-* \
343
+ | d10v-* | d30v-* | dlx-* \
344
+ | elxsi-* \
345
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
346
+ | h8300-* | h8500-* \
347
+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
348
+ | i*86-* | i860-* | i960-* | ia64-* \
349
+ | ip2k-* | iq2000-* \
350
+ | lm32-* \
351
+ | m32c-* | m32r-* | m32rle-* \
352
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
353
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
354
+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
355
+ | mips16-* \
356
+ | mips64-* | mips64el-* \
357
+ | mips64octeon-* | mips64octeonel-* \
358
+ | mips64orion-* | mips64orionel-* \
359
+ | mips64r5900-* | mips64r5900el-* \
360
+ | mips64vr-* | mips64vrel-* \
361
+ | mips64vr4100-* | mips64vr4100el-* \
362
+ | mips64vr4300-* | mips64vr4300el-* \
363
+ | mips64vr5000-* | mips64vr5000el-* \
364
+ | mips64vr5900-* | mips64vr5900el-* \
365
+ | mipsisa32-* | mipsisa32el-* \
366
+ | mipsisa32r2-* | mipsisa32r2el-* \
367
+ | mipsisa64-* | mipsisa64el-* \
368
+ | mipsisa64r2-* | mipsisa64r2el-* \
369
+ | mipsisa64sb1-* | mipsisa64sb1el-* \
370
+ | mipsisa64sr71k-* | mipsisa64sr71kel-* \
371
+ | mipstx39-* | mipstx39el-* \
372
+ | mmix-* \
373
+ | mt-* \
374
+ | msp430-* \
375
+ | nios-* | nios2-* \
376
+ | none-* | np1-* | ns16k-* | ns32k-* \
377
+ | orion-* \
378
+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
379
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
380
+ | pyramid-* \
381
+ | romp-* | rs6000-* | rx-* \
382
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
383
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
384
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
385
+ | sparclite-* \
386
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
387
+ | tahoe-* | thumb-* \
388
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
389
+ | tile-* | tilegx-* \
390
+ | tron-* \
391
+ | ubicom32-* \
392
+ | v850-* | v850e-* | vax-* \
393
+ | we32k-* \
394
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
395
+ | xstormy16-* | xtensa*-* \
396
+ | ymp-* \
397
+ | z8k-* | z80-*)
398
+ ;;
399
+ # Recognize the basic CPU types without company name, with glob match.
400
+ xtensa*)
401
+ basic_machine=$basic_machine-unknown
402
+ ;;
403
+ # Recognize the various machine names and aliases which stand
404
+ # for a CPU type and a company and sometimes even an OS.
405
+ 386bsd)
406
+ basic_machine=i386-unknown
407
+ os=-bsd
408
+ ;;
409
+ 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
410
+ basic_machine=m68000-att
411
+ ;;
412
+ 3b*)
413
+ basic_machine=we32k-att
414
+ ;;
415
+ a29khif)
416
+ basic_machine=a29k-amd
417
+ os=-udi
418
+ ;;
419
+ abacus)
420
+ basic_machine=abacus-unknown
421
+ ;;
422
+ adobe68k)
423
+ basic_machine=m68010-adobe
424
+ os=-scout
425
+ ;;
426
+ alliant | fx80)
427
+ basic_machine=fx80-alliant
428
+ ;;
429
+ altos | altos3068)
430
+ basic_machine=m68k-altos
431
+ ;;
432
+ am29k)
433
+ basic_machine=a29k-none
434
+ os=-bsd
435
+ ;;
436
+ amd64)
437
+ basic_machine=x86_64-pc
438
+ ;;
439
+ amd64-*)
440
+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
441
+ ;;
442
+ amdahl)
443
+ basic_machine=580-amdahl
444
+ os=-sysv
445
+ ;;
446
+ amiga | amiga-*)
447
+ basic_machine=m68k-unknown
448
+ ;;
449
+ amigaos | amigados)
450
+ basic_machine=m68k-unknown
451
+ os=-amigaos
452
+ ;;
453
+ amigaunix | amix)
454
+ basic_machine=m68k-unknown
455
+ os=-sysv4
456
+ ;;
457
+ apollo68)
458
+ basic_machine=m68k-apollo
459
+ os=-sysv
460
+ ;;
461
+ apollo68bsd)
462
+ basic_machine=m68k-apollo
463
+ os=-bsd
464
+ ;;
465
+ aros)
466
+ basic_machine=i386-pc
467
+ os=-aros
468
+ ;;
469
+ aux)
470
+ basic_machine=m68k-apple
471
+ os=-aux
472
+ ;;
473
+ balance)
474
+ basic_machine=ns32k-sequent
475
+ os=-dynix
476
+ ;;
477
+ blackfin)
478
+ basic_machine=bfin-unknown
479
+ os=-linux
480
+ ;;
481
+ blackfin-*)
482
+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
483
+ os=-linux
484
+ ;;
485
+ bluegene*)
486
+ basic_machine=powerpc-ibm
487
+ os=-cnk
488
+ ;;
489
+ c90)
490
+ basic_machine=c90-cray
491
+ os=-unicos
492
+ ;;
493
+ cegcc)
494
+ basic_machine=arm-unknown
495
+ os=-cegcc
496
+ ;;
497
+ convex-c1)
498
+ basic_machine=c1-convex
499
+ os=-bsd
500
+ ;;
501
+ convex-c2)
502
+ basic_machine=c2-convex
503
+ os=-bsd
504
+ ;;
505
+ convex-c32)
506
+ basic_machine=c32-convex
507
+ os=-bsd
508
+ ;;
509
+ convex-c34)
510
+ basic_machine=c34-convex
511
+ os=-bsd
512
+ ;;
513
+ convex-c38)
514
+ basic_machine=c38-convex
515
+ os=-bsd
516
+ ;;
517
+ cray | j90)
518
+ basic_machine=j90-cray
519
+ os=-unicos
520
+ ;;
521
+ craynv)
522
+ basic_machine=craynv-cray
523
+ os=-unicosmp
524
+ ;;
525
+ cr16)
526
+ basic_machine=cr16-unknown
527
+ os=-elf
528
+ ;;
529
+ crds | unos)
530
+ basic_machine=m68k-crds
531
+ ;;
532
+ crisv32 | crisv32-* | etraxfs*)
533
+ basic_machine=crisv32-axis
534
+ ;;
535
+ cris | cris-* | etrax*)
536
+ basic_machine=cris-axis
537
+ ;;
538
+ crx)
539
+ basic_machine=crx-unknown
540
+ os=-elf
541
+ ;;
542
+ da30 | da30-*)
543
+ basic_machine=m68k-da30
544
+ ;;
545
+ decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
546
+ basic_machine=mips-dec
547
+ ;;
548
+ decsystem10* | dec10*)
549
+ basic_machine=pdp10-dec
550
+ os=-tops10
551
+ ;;
552
+ decsystem20* | dec20*)
553
+ basic_machine=pdp10-dec
554
+ os=-tops20
555
+ ;;
556
+ delta | 3300 | motorola-3300 | motorola-delta \
557
+ | 3300-motorola | delta-motorola)
558
+ basic_machine=m68k-motorola
559
+ ;;
560
+ delta88)
561
+ basic_machine=m88k-motorola
562
+ os=-sysv3
563
+ ;;
564
+ dicos)
565
+ basic_machine=i686-pc
566
+ os=-dicos
567
+ ;;
568
+ djgpp)
569
+ basic_machine=i586-pc
570
+ os=-msdosdjgpp
571
+ ;;
572
+ dpx20 | dpx20-*)
573
+ basic_machine=rs6000-bull
574
+ os=-bosx
575
+ ;;
576
+ dpx2* | dpx2*-bull)
577
+ basic_machine=m68k-bull
578
+ os=-sysv3
579
+ ;;
580
+ ebmon29k)
581
+ basic_machine=a29k-amd
582
+ os=-ebmon
583
+ ;;
584
+ elxsi)
585
+ basic_machine=elxsi-elxsi
586
+ os=-bsd
587
+ ;;
588
+ encore | umax | mmax)
589
+ basic_machine=ns32k-encore
590
+ ;;
591
+ es1800 | OSE68k | ose68k | ose | OSE)
592
+ basic_machine=m68k-ericsson
593
+ os=-ose
594
+ ;;
595
+ fx2800)
596
+ basic_machine=i860-alliant
597
+ ;;
598
+ genix)
599
+ basic_machine=ns32k-ns
600
+ ;;
601
+ gmicro)
602
+ basic_machine=tron-gmicro
603
+ os=-sysv
604
+ ;;
605
+ go32)
606
+ basic_machine=i386-pc
607
+ os=-go32
608
+ ;;
609
+ h3050r* | hiux*)
610
+ basic_machine=hppa1.1-hitachi
611
+ os=-hiuxwe2
612
+ ;;
613
+ h8300hms)
614
+ basic_machine=h8300-hitachi
615
+ os=-hms
616
+ ;;
617
+ h8300xray)
618
+ basic_machine=h8300-hitachi
619
+ os=-xray
620
+ ;;
621
+ h8500hms)
622
+ basic_machine=h8500-hitachi
623
+ os=-hms
624
+ ;;
625
+ harris)
626
+ basic_machine=m88k-harris
627
+ os=-sysv3
628
+ ;;
629
+ hp300-*)
630
+ basic_machine=m68k-hp
631
+ ;;
632
+ hp300bsd)
633
+ basic_machine=m68k-hp
634
+ os=-bsd
635
+ ;;
636
+ hp300hpux)
637
+ basic_machine=m68k-hp
638
+ os=-hpux
639
+ ;;
640
+ hp3k9[0-9][0-9] | hp9[0-9][0-9])
641
+ basic_machine=hppa1.0-hp
642
+ ;;
643
+ hp9k2[0-9][0-9] | hp9k31[0-9])
644
+ basic_machine=m68000-hp
645
+ ;;
646
+ hp9k3[2-9][0-9])
647
+ basic_machine=m68k-hp
648
+ ;;
649
+ hp9k6[0-9][0-9] | hp6[0-9][0-9])
650
+ basic_machine=hppa1.0-hp
651
+ ;;
652
+ hp9k7[0-79][0-9] | hp7[0-79][0-9])
653
+ basic_machine=hppa1.1-hp
654
+ ;;
655
+ hp9k78[0-9] | hp78[0-9])
656
+ # FIXME: really hppa2.0-hp
657
+ basic_machine=hppa1.1-hp
658
+ ;;
659
+ hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
660
+ # FIXME: really hppa2.0-hp
661
+ basic_machine=hppa1.1-hp
662
+ ;;
663
+ hp9k8[0-9][13679] | hp8[0-9][13679])
664
+ basic_machine=hppa1.1-hp
665
+ ;;
666
+ hp9k8[0-9][0-9] | hp8[0-9][0-9])
667
+ basic_machine=hppa1.0-hp
668
+ ;;
669
+ hppa-next)
670
+ os=-nextstep3
671
+ ;;
672
+ hppaosf)
673
+ basic_machine=hppa1.1-hp
674
+ os=-osf
675
+ ;;
676
+ hppro)
677
+ basic_machine=hppa1.1-hp
678
+ os=-proelf
679
+ ;;
680
+ i370-ibm* | ibm*)
681
+ basic_machine=i370-ibm
682
+ ;;
683
+# I'm not sure what "Sysv32" means. Should this be sysv3.2?
684
+ i*86v32)
685
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
686
+ os=-sysv32
687
+ ;;
688
+ i*86v4*)
689
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
690
+ os=-sysv4
691
+ ;;
692
+ i*86v)
693
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
694
+ os=-sysv
695
+ ;;
696
+ i*86sol2)
697
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
698
+ os=-solaris2
699
+ ;;
700
+ i386mach)
701
+ basic_machine=i386-mach
702
+ os=-mach
703
+ ;;
704
+ i386-vsta | vsta)
705
+ basic_machine=i386-unknown
706
+ os=-vsta
707
+ ;;
708
+ iris | iris4d)
709
+ basic_machine=mips-sgi
710
+ case $os in
711
+ -irix*)
712
+ ;;
713
+ *)
714
+ os=-irix4
715
+ ;;
716
+ esac
717
+ ;;
718
+ isi68 | isi)
719
+ basic_machine=m68k-isi
720
+ os=-sysv
721
+ ;;
722
+ m68knommu)
723
+ basic_machine=m68k-unknown
724
+ os=-linux
725
+ ;;
726
+ m68knommu-*)
727
+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
728
+ os=-linux
729
+ ;;
730
+ m88k-omron*)
731
+ basic_machine=m88k-omron
732
+ ;;
733
+ magnum | m3230)
734
+ basic_machine=mips-mips
735
+ os=-sysv
736
+ ;;
737
+ merlin)
738
+ basic_machine=ns32k-utek
739
+ os=-sysv
740
+ ;;
741
+ microblaze)
742
+ basic_machine=microblaze-xilinx
743
+ ;;
744
+ mingw32)
745
+ basic_machine=i386-pc
746
+ os=-mingw32
747
+ ;;
748
+ mingw32ce)
749
+ basic_machine=arm-unknown
750
+ os=-mingw32ce
751
+ ;;
752
+ miniframe)
753
+ basic_machine=m68000-convergent
754
+ ;;
755
+ *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
756
+ basic_machine=m68k-atari
757
+ os=-mint
758
+ ;;
759
+ mips3*-*)
760
+ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
761
+ ;;
762
+ mips3*)
763
+ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
764
+ ;;
765
+ monitor)
766
+ basic_machine=m68k-rom68k
767
+ os=-coff
768
+ ;;
769
+ morphos)
770
+ basic_machine=powerpc-unknown
771
+ os=-morphos
772
+ ;;
773
+ msdos)
774
+ basic_machine=i386-pc
775
+ os=-msdos
776
+ ;;
777
+ ms1-*)
778
+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
779
+ ;;
780
+ mvs)
781
+ basic_machine=i370-ibm
782
+ os=-mvs
783
+ ;;
784
+ ncr3000)
785
+ basic_machine=i486-ncr
786
+ os=-sysv4
787
+ ;;
788
+ netbsd386)
789
+ basic_machine=i386-unknown
790
+ os=-netbsd
791
+ ;;
792
+ netwinder)
793
+ basic_machine=armv4l-rebel
794
+ os=-linux
795
+ ;;
796
+ news | news700 | news800 | news900)
797
+ basic_machine=m68k-sony
798
+ os=-newsos
799
+ ;;
800
+ news1000)
801
+ basic_machine=m68030-sony
802
+ os=-newsos
803
+ ;;
804
+ news-3600 | risc-news)
805
+ basic_machine=mips-sony
806
+ os=-newsos
807
+ ;;
808
+ necv70)
809
+ basic_machine=v70-nec
810
+ os=-sysv
811
+ ;;
812
+ next | m*-next )
813
+ basic_machine=m68k-next
814
+ case $os in
815
+ -nextstep* )
816
+ ;;
817
+ -ns2*)
818
+ os=-nextstep2
819
+ ;;
820
+ *)
821
+ os=-nextstep3
822
+ ;;
823
+ esac
824
+ ;;
825
+ nh3000)
826
+ basic_machine=m68k-harris
827
+ os=-cxux
828
+ ;;
829
+ nh[45]000)
830
+ basic_machine=m88k-harris
831
+ os=-cxux
832
+ ;;
833
+ nindy960)
834
+ basic_machine=i960-intel
835
+ os=-nindy
836
+ ;;
837
+ mon960)
838
+ basic_machine=i960-intel
839
+ os=-mon960
840
+ ;;
841
+ nonstopux)
842
+ basic_machine=mips-compaq
843
+ os=-nonstopux
844
+ ;;
845
+ np1)
846
+ basic_machine=np1-gould
847
+ ;;
848
+ nsr-tandem)
849
+ basic_machine=nsr-tandem
850
+ ;;
851
+ op50n-* | op60c-*)
852
+ basic_machine=hppa1.1-oki
853
+ os=-proelf
854
+ ;;
855
+ openrisc | openrisc-*)
856
+ basic_machine=or32-unknown
857
+ ;;
858
+ os400)
859
+ basic_machine=powerpc-ibm
860
+ os=-os400
861
+ ;;
862
+ OSE68000 | ose68000)
863
+ basic_machine=m68000-ericsson
864
+ os=-ose
865
+ ;;
866
+ os68k)
867
+ basic_machine=m68k-none
868
+ os=-os68k
869
+ ;;
870
+ pa-hitachi)
871
+ basic_machine=hppa1.1-hitachi
872
+ os=-hiuxwe2
873
+ ;;
874
+ paragon)
875
+ basic_machine=i860-intel
876
+ os=-osf
877
+ ;;
878
+ parisc)
879
+ basic_machine=hppa-unknown
880
+ os=-linux
881
+ ;;
882
+ parisc-*)
883
+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
884
+ os=-linux
885
+ ;;
886
+ pbd)
887
+ basic_machine=sparc-tti
888
+ ;;
889
+ pbb)
890
+ basic_machine=m68k-tti
891
+ ;;
892
+ pc532 | pc532-*)
893
+ basic_machine=ns32k-pc532
894
+ ;;
895
+ pc98)
896
+ basic_machine=i386-pc
897
+ ;;
898
+ pc98-*)
899
+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
900
+ ;;
901
+ pentium | p5 | k5 | k6 | nexgen | viac3)
902
+ basic_machine=i586-pc
903
+ ;;
904
+ pentiumpro | p6 | 6x86 | athlon | athlon_*)
905
+ basic_machine=i686-pc
906
+ ;;
907
+ pentiumii | pentium2 | pentiumiii | pentium3)
908
+ basic_machine=i686-pc
909
+ ;;
910
+ pentium4)
911
+ basic_machine=i786-pc
912
+ ;;
913
+ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
914
+ basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
915
+ ;;
916
+ pentiumpro-* | p6-* | 6x86-* | athlon-*)
917
+ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
918
+ ;;
919
+ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
920
+ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
921
+ ;;
922
+ pentium4-*)
923
+ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
924
+ ;;
925
+ pn)
926
+ basic_machine=pn-gould
927
+ ;;
928
+ power) basic_machine=power-ibm
929
+ ;;
930
+ ppc) basic_machine=powerpc-unknown
931
+ ;;
932
+ ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
933
+ ;;
934
+ ppcle | powerpclittle | ppc-le | powerpc-little)
935
+ basic_machine=powerpcle-unknown
936
+ ;;
937
+ ppcle-* | powerpclittle-*)
938
+ basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
939
+ ;;
940
+ ppc64) basic_machine=powerpc64-unknown
941
+ ;;
942
+ ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
943
+ ;;
944
+ ppc64le | powerpc64little | ppc64-le | powerpc64-little)
945
+ basic_machine=powerpc64le-unknown
946
+ ;;
947
+ ppc64le-* | powerpc64little-*)
948
+ basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
949
+ ;;
950
+ ps2)
951
+ basic_machine=i386-ibm
952
+ ;;
953
+ pw32)
954
+ basic_machine=i586-unknown
955
+ os=-pw32
956
+ ;;
957
+ rdos)
958
+ basic_machine=i386-pc
959
+ os=-rdos
960
+ ;;
961
+ rom68k)
962
+ basic_machine=m68k-rom68k
963
+ os=-coff
964
+ ;;
965
+ rm[46]00)
966
+ basic_machine=mips-siemens
967
+ ;;
968
+ rtpc | rtpc-*)
969
+ basic_machine=romp-ibm
970
+ ;;
971
+ s390 | s390-*)
972
+ basic_machine=s390-ibm
973
+ ;;
974
+ s390x | s390x-*)
975
+ basic_machine=s390x-ibm
976
+ ;;
977
+ sa29200)
978
+ basic_machine=a29k-amd
979
+ os=-udi
980
+ ;;
981
+ sb1)
982
+ basic_machine=mipsisa64sb1-unknown
983
+ ;;
984
+ sb1el)
985
+ basic_machine=mipsisa64sb1el-unknown
986
+ ;;
987
+ sde)
988
+ basic_machine=mipsisa32-sde
989
+ os=-elf
990
+ ;;
991
+ sei)
992
+ basic_machine=mips-sei
993
+ os=-seiux
994
+ ;;
995
+ sequent)
996
+ basic_machine=i386-sequent
997
+ ;;
998
+ sh)
999
+ basic_machine=sh-hitachi
1000
+ os=-hms
1001
+ ;;
1002
+ sh5el)
1003
+ basic_machine=sh5le-unknown
1004
+ ;;
1005
+ sh64)
1006
+ basic_machine=sh64-unknown
1007
+ ;;
1008
+ sparclite-wrs | simso-wrs)
1009
+ basic_machine=sparclite-wrs
1010
+ os=-vxworks
1011
+ ;;
1012
+ sps7)
1013
+ basic_machine=m68k-bull
1014
+ os=-sysv2
1015
+ ;;
1016
+ spur)
1017
+ basic_machine=spur-unknown
1018
+ ;;
1019
+ st2000)
1020
+ basic_machine=m68k-tandem
1021
+ ;;
1022
+ stratus)
1023
+ basic_machine=i860-stratus
1024
+ os=-sysv4
1025
+ ;;
1026
+ sun2)
1027
+ basic_machine=m68000-sun
1028
+ ;;
1029
+ sun2os3)
1030
+ basic_machine=m68000-sun
1031
+ os=-sunos3
1032
+ ;;
1033
+ sun2os4)
1034
+ basic_machine=m68000-sun
1035
+ os=-sunos4
1036
+ ;;
1037
+ sun3os3)
1038
+ basic_machine=m68k-sun
1039
+ os=-sunos3
1040
+ ;;
1041
+ sun3os4)
1042
+ basic_machine=m68k-sun
1043
+ os=-sunos4
1044
+ ;;
1045
+ sun4os3)
1046
+ basic_machine=sparc-sun
1047
+ os=-sunos3
1048
+ ;;
1049
+ sun4os4)
1050
+ basic_machine=sparc-sun
1051
+ os=-sunos4
1052
+ ;;
1053
+ sun4sol2)
1054
+ basic_machine=sparc-sun
1055
+ os=-solaris2
1056
+ ;;
1057
+ sun3 | sun3-*)
1058
+ basic_machine=m68k-sun
1059
+ ;;
1060
+ sun4)
1061
+ basic_machine=sparc-sun
1062
+ ;;
1063
+ sun386 | sun386i | roadrunner)
1064
+ basic_machine=i386-sun
1065
+ ;;
1066
+ sv1)
1067
+ basic_machine=sv1-cray
1068
+ os=-unicos
1069
+ ;;
1070
+ symmetry)
1071
+ basic_machine=i386-sequent
1072
+ os=-dynix
1073
+ ;;
1074
+ t3e)
1075
+ basic_machine=alphaev5-cray
1076
+ os=-unicos
1077
+ ;;
1078
+ t90)
1079
+ basic_machine=t90-cray
1080
+ os=-unicos
1081
+ ;;
1082
+ tic54x | c54x*)
1083
+ basic_machine=tic54x-unknown
1084
+ os=-coff
1085
+ ;;
1086
+ tic55x | c55x*)
1087
+ basic_machine=tic55x-unknown
1088
+ os=-coff
1089
+ ;;
1090
+ tic6x | c6x*)
1091
+ basic_machine=tic6x-unknown
1092
+ os=-coff
1093
+ ;;
1094
+ # This must be matched before tile*.
1095
+ tilegx*)
1096
+ basic_machine=tilegx-unknown
1097
+ os=-linux-gnu
1098
+ ;;
1099
+ tile*)
1100
+ basic_machine=tile-unknown
1101
+ os=-linux-gnu
1102
+ ;;
1103
+ tx39)
1104
+ basic_machine=mipstx39-unknown
1105
+ ;;
1106
+ tx39el)
1107
+ basic_machine=mipstx39el-unknown
1108
+ ;;
1109
+ toad1)
1110
+ basic_machine=pdp10-xkl
1111
+ os=-tops20
1112
+ ;;
1113
+ tower | tower-32)
1114
+ basic_machine=m68k-ncr
1115
+ ;;
1116
+ tpf)
1117
+ basic_machine=s390x-ibm
1118
+ os=-tpf
1119
+ ;;
1120
+ udi29k)
1121
+ basic_machine=a29k-amd
1122
+ os=-udi
1123
+ ;;
1124
+ ultra3)
1125
+ basic_machine=a29k-nyu
1126
+ os=-sym1
1127
+ ;;
1128
+ v810 | necv810)
1129
+ basic_machine=v810-nec
1130
+ os=-none
1131
+ ;;
1132
+ vaxv)
1133
+ basic_machine=vax-dec
1134
+ os=-sysv
1135
+ ;;
1136
+ vms)
1137
+ basic_machine=vax-dec
1138
+ os=-vms
1139
+ ;;
1140
+ vpp*|vx|vx-*)
1141
+ basic_machine=f301-fujitsu
1142
+ ;;
1143
+ vxworks960)
1144
+ basic_machine=i960-wrs
1145
+ os=-vxworks
1146
+ ;;
1147
+ vxworks68)
1148
+ basic_machine=m68k-wrs
1149
+ os=-vxworks
1150
+ ;;
1151
+ vxworks29k)
1152
+ basic_machine=a29k-wrs
1153
+ os=-vxworks
1154
+ ;;
1155
+ w65*)
1156
+ basic_machine=w65-wdc
1157
+ os=-none
1158
+ ;;
1159
+ w89k-*)
1160
+ basic_machine=hppa1.1-winbond
1161
+ os=-proelf
1162
+ ;;
1163
+ xbox)
1164
+ basic_machine=i686-pc
1165
+ os=-mingw32
1166
+ ;;
1167
+ xps | xps100)
1168
+ basic_machine=xps100-honeywell
1169
+ ;;
1170
+ ymp)
1171
+ basic_machine=ymp-cray
1172
+ os=-unicos
1173
+ ;;
1174
+ z8k-*-coff)
1175
+ basic_machine=z8k-unknown
1176
+ os=-sim
1177
+ ;;
1178
+ z80-*-coff)
1179
+ basic_machine=z80-unknown
1180
+ os=-sim
1181
+ ;;
1182
+ none)
1183
+ basic_machine=none-none
1184
+ os=-none
1185
+ ;;
1186
+
1187
+# Here we handle the default manufacturer of certain CPU types. It is in
1188
+# some cases the only manufacturer, in others, it is the most popular.
1189
+ w89k)
1190
+ basic_machine=hppa1.1-winbond
1191
+ ;;
1192
+ op50n)
1193
+ basic_machine=hppa1.1-oki
1194
+ ;;
1195
+ op60c)
1196
+ basic_machine=hppa1.1-oki
1197
+ ;;
1198
+ romp)
1199
+ basic_machine=romp-ibm
1200
+ ;;
1201
+ mmix)
1202
+ basic_machine=mmix-knuth
1203
+ ;;
1204
+ rs6000)
1205
+ basic_machine=rs6000-ibm
1206
+ ;;
1207
+ vax)
1208
+ basic_machine=vax-dec
1209
+ ;;
1210
+ pdp10)
1211
+ # there are many clones, so DEC is not a safe bet
1212
+ basic_machine=pdp10-unknown
1213
+ ;;
1214
+ pdp11)
1215
+ basic_machine=pdp11-dec
1216
+ ;;
1217
+ we32k)
1218
+ basic_machine=we32k-att
1219
+ ;;
1220
+ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
1221
+ basic_machine=sh-unknown
1222
+ ;;
1223
+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
1224
+ basic_machine=sparc-sun
1225
+ ;;
1226
+ cydra)
1227
+ basic_machine=cydra-cydrome
1228
+ ;;
1229
+ orion)
1230
+ basic_machine=orion-highlevel
1231
+ ;;
1232
+ orion105)
1233
+ basic_machine=clipper-highlevel
1234
+ ;;
1235
+ mac | mpw | mac-mpw)
1236
+ basic_machine=m68k-apple
1237
+ ;;
1238
+ pmac | pmac-mpw)
1239
+ basic_machine=powerpc-apple
1240
+ ;;
1241
+ *-unknown)
1242
+ # Make sure to match an already-canonicalized machine name.
1243
+ ;;
1244
+ *)
1245
+ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
1246
+ exit 1
1247
+ ;;
1248
+esac
1249
+
1250
+# Here we canonicalize certain aliases for manufacturers.
1251
+case $basic_machine in
1252
+ *-digital*)
1253
+ basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
1254
+ ;;
1255
+ *-commodore*)
1256
+ basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
1257
+ ;;
1258
+ *)
1259
+ ;;
1260
+esac
1261
+
1262
+# Decode manufacturer-specific aliases for certain operating systems.
1263
+
1264
+if [ x"$os" != x"" ]
1265
+then
1266
+case $os in
1267
+ # First match some system type aliases
1268
+ # that might get confused with valid system types.
1269
+ # -solaris* is a basic system type, with this one exception.
1270
+ -auroraux)
1271
+ os=-auroraux
1272
+ ;;
1273
+ -solaris1 | -solaris1.*)
1274
+ os=`echo $os | sed -e 's|solaris1|sunos4|'`
1275
+ ;;
1276
+ -solaris)
1277
+ os=-solaris2
1278
+ ;;
1279
+ -svr4*)
1280
+ os=-sysv4
1281
+ ;;
1282
+ -unixware*)
1283
+ os=-sysv4.2uw
1284
+ ;;
1285
+ -gnu/linux*)
1286
+ os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
1287
+ ;;
1288
+ # First accept the basic system types.
1289
+ # The portable systems comes first.
1290
+ # Each alternative MUST END IN A *, to match a version number.
1291
+ # -sysv* is not here because it comes later, after sysvr4.
1292
+ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
1293
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
1294
+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
1295
+ | -sym* | -kopensolaris* \
1296
+ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
1297
+ | -aos* | -aros* \
1298
+ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
1299
+ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
1300
+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
1301
+ | -openbsd* | -solidbsd* \
1302
+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
1303
+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
1304
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
1305
+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1306
+ | -chorusos* | -chorusrdb* | -cegcc* \
1307
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1308
+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
1309
+ | -uxpv* | -beos* | -mpeix* | -udk* \
1310
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
1311
+ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
1312
+ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
1313
+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1314
+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1315
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1316
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
1317
+ # Remember, each alternative MUST END IN *, to match a version number.
1318
+ ;;
1319
+ -qnx*)
1320
+ case $basic_machine in
1321
+ x86-* | i*86-*)
1322
+ ;;
1323
+ *)
1324
+ os=-nto$os
1325
+ ;;
1326
+ esac
1327
+ ;;
1328
+ -nto-qnx*)
1329
+ ;;
1330
+ -nto*)
1331
+ os=`echo $os | sed -e 's|nto|nto-qnx|'`
1332
+ ;;
1333
+ -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
1334
+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
1335
+ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
1336
+ ;;
1337
+ -mac*)
1338
+ os=`echo $os | sed -e 's|mac|macos|'`
1339
+ ;;
1340
+ -linux-dietlibc)
1341
+ os=-linux-dietlibc
1342
+ ;;
1343
+ -linux*)
1344
+ os=`echo $os | sed -e 's|linux|linux-gnu|'`
1345
+ ;;
1346
+ -sunos5*)
1347
+ os=`echo $os | sed -e 's|sunos5|solaris2|'`
1348
+ ;;
1349
+ -sunos6*)
1350
+ os=`echo $os | sed -e 's|sunos6|solaris3|'`
1351
+ ;;
1352
+ -opened*)
1353
+ os=-openedition
1354
+ ;;
1355
+ -os400*)
1356
+ os=-os400
1357
+ ;;
1358
+ -wince*)
1359
+ os=-wince
1360
+ ;;
1361
+ -osfrose*)
1362
+ os=-osfrose
1363
+ ;;
1364
+ -osf*)
1365
+ os=-osf
1366
+ ;;
1367
+ -utek*)
1368
+ os=-bsd
1369
+ ;;
1370
+ -dynix*)
1371
+ os=-bsd
1372
+ ;;
1373
+ -acis*)
1374
+ os=-aos
1375
+ ;;
1376
+ -atheos*)
1377
+ os=-atheos
1378
+ ;;
1379
+ -syllable*)
1380
+ os=-syllable
1381
+ ;;
1382
+ -386bsd)
1383
+ os=-bsd
1384
+ ;;
1385
+ -ctix* | -uts*)
1386
+ os=-sysv
1387
+ ;;
1388
+ -nova*)
1389
+ os=-rtmk-nova
1390
+ ;;
1391
+ -ns2 )
1392
+ os=-nextstep2
1393
+ ;;
1394
+ -nsk*)
1395
+ os=-nsk
1396
+ ;;
1397
+ # Preserve the version number of sinix5.
1398
+ -sinix5.*)
1399
+ os=`echo $os | sed -e 's|sinix|sysv|'`
1400
+ ;;
1401
+ -sinix*)
1402
+ os=-sysv4
1403
+ ;;
1404
+ -tpf*)
1405
+ os=-tpf
1406
+ ;;
1407
+ -triton*)
1408
+ os=-sysv3
1409
+ ;;
1410
+ -oss*)
1411
+ os=-sysv3
1412
+ ;;
1413
+ -svr4)
1414
+ os=-sysv4
1415
+ ;;
1416
+ -svr3)
1417
+ os=-sysv3
1418
+ ;;
1419
+ -sysvr4)
1420
+ os=-sysv4
1421
+ ;;
1422
+ # This must come after -sysvr4.
1423
+ -sysv*)
1424
+ ;;
1425
+ -ose*)
1426
+ os=-ose
1427
+ ;;
1428
+ -es1800*)
1429
+ os=-ose
1430
+ ;;
1431
+ -xenix)
1432
+ os=-xenix
1433
+ ;;
1434
+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
1435
+ os=-mint
1436
+ ;;
1437
+ -aros*)
1438
+ os=-aros
1439
+ ;;
1440
+ -kaos*)
1441
+ os=-kaos
1442
+ ;;
1443
+ -zvmoe)
1444
+ os=-zvmoe
1445
+ ;;
1446
+ -dicos*)
1447
+ os=-dicos
1448
+ ;;
1449
+ -nacl*)
1450
+ ;;
1451
+ -none)
1452
+ ;;
1453
+ *)
1454
+ # Get rid of the `-' at the beginning of $os.
1455
+ os=`echo $os | sed 's/[^-]*-//'`
1456
+ echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
1457
+ exit 1
1458
+ ;;
1459
+esac
1460
+else
1461
+
1462
+# Here we handle the default operating systems that come with various machines.
1463
+# The value should be what the vendor currently ships out the door with their
1464
+# machine or put another way, the most popular os provided with the machine.
1465
+
1466
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
1467
+# "-sun"), then you have to tell the case statement up towards the top
1468
+# that MANUFACTURER isn't an operating system. Otherwise, code above
1469
+# will signal an error saying that MANUFACTURER isn't an operating
1470
+# system, and we'll never get to this point.
1471
+
1472
+case $basic_machine in
1473
+ score-*)
1474
+ os=-elf
1475
+ ;;
1476
+ spu-*)
1477
+ os=-elf
1478
+ ;;
1479
+ *-acorn)
1480
+ os=-riscix1.2
1481
+ ;;
1482
+ arm*-rebel)
1483
+ os=-linux
1484
+ ;;
1485
+ arm*-semi)
1486
+ os=-aout
1487
+ ;;
1488
+ c4x-* | tic4x-*)
1489
+ os=-coff
1490
+ ;;
1491
+ # This must come before the *-dec entry.
1492
+ pdp10-*)
1493
+ os=-tops20
1494
+ ;;
1495
+ pdp11-*)
1496
+ os=-none
1497
+ ;;
1498
+ *-dec | vax-*)
1499
+ os=-ultrix4.2
1500
+ ;;
1501
+ m68*-apollo)
1502
+ os=-domain
1503
+ ;;
1504
+ i386-sun)
1505
+ os=-sunos4.0.2
1506
+ ;;
1507
+ m68000-sun)
1508
+ os=-sunos3
1509
+ # This also exists in the configure program, but was not the
1510
+ # default.
1511
+ # os=-sunos4
1512
+ ;;
1513
+ m68*-cisco)
1514
+ os=-aout
1515
+ ;;
1516
+ mep-*)
1517
+ os=-elf
1518
+ ;;
1519
+ mips*-cisco)
1520
+ os=-elf
1521
+ ;;
1522
+ mips*-*)
1523
+ os=-elf
1524
+ ;;
1525
+ or32-*)
1526
+ os=-coff
1527
+ ;;
1528
+ *-tti) # must be before sparc entry or we get the wrong os.
1529
+ os=-sysv3
1530
+ ;;
1531
+ sparc-* | *-sun)
1532
+ os=-sunos4.1.1
1533
+ ;;
1534
+ *-be)
1535
+ os=-beos
1536
+ ;;
1537
+ *-haiku)
1538
+ os=-haiku
1539
+ ;;
1540
+ *-ibm)
1541
+ os=-aix
1542
+ ;;
1543
+ *-knuth)
1544
+ os=-mmixware
1545
+ ;;
1546
+ *-wec)
1547
+ os=-proelf
1548
+ ;;
1549
+ *-winbond)
1550
+ os=-proelf
1551
+ ;;
1552
+ *-oki)
1553
+ os=-proelf
1554
+ ;;
1555
+ *-hp)
1556
+ os=-hpux
1557
+ ;;
1558
+ *-hitachi)
1559
+ os=-hiux
1560
+ ;;
1561
+ i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
1562
+ os=-sysv
1563
+ ;;
1564
+ *-cbm)
1565
+ os=-amigaos
1566
+ ;;
1567
+ *-dg)
1568
+ os=-dgux
1569
+ ;;
1570
+ *-dolphin)
1571
+ os=-sysv3
1572
+ ;;
1573
+ m68k-ccur)
1574
+ os=-rtu
1575
+ ;;
1576
+ m88k-omron*)
1577
+ os=-luna
1578
+ ;;
1579
+ *-next )
1580
+ os=-nextstep
1581
+ ;;
1582
+ *-sequent)
1583
+ os=-ptx
1584
+ ;;
1585
+ *-crds)
1586
+ os=-unos
1587
+ ;;
1588
+ *-ns)
1589
+ os=-genix
1590
+ ;;
1591
+ i370-*)
1592
+ os=-mvs
1593
+ ;;
1594
+ *-next)
1595
+ os=-nextstep3
1596
+ ;;
1597
+ *-gould)
1598
+ os=-sysv
1599
+ ;;
1600
+ *-highlevel)
1601
+ os=-bsd
1602
+ ;;
1603
+ *-encore)
1604
+ os=-bsd
1605
+ ;;
1606
+ *-sgi)
1607
+ os=-irix
1608
+ ;;
1609
+ *-siemens)
1610
+ os=-sysv4
1611
+ ;;
1612
+ *-masscomp)
1613
+ os=-rtu
1614
+ ;;
1615
+ f30[01]-fujitsu | f700-fujitsu)
1616
+ os=-uxpv
1617
+ ;;
1618
+ *-rom68k)
1619
+ os=-coff
1620
+ ;;
1621
+ *-*bug)
1622
+ os=-coff
1623
+ ;;
1624
+ *-apple)
1625
+ os=-macos
1626
+ ;;
1627
+ *-atari*)
1628
+ os=-mint
1629
+ ;;
1630
+ *)
1631
+ os=-none
1632
+ ;;
1633
+esac
1634
+fi
1635
+
1636
+# Here we handle the case where we know the os, and the CPU type, but not the
1637
+# manufacturer. We pick the logical manufacturer.
1638
+vendor=unknown
1639
+case $basic_machine in
1640
+ *-unknown)
1641
+ case $os in
1642
+ -riscix*)
1643
+ vendor=acorn
1644
+ ;;
1645
+ -sunos*)
1646
+ vendor=sun
1647
+ ;;
1648
+ -cnk*|-aix*)
1649
+ vendor=ibm
1650
+ ;;
1651
+ -beos*)
1652
+ vendor=be
1653
+ ;;
1654
+ -hpux*)
1655
+ vendor=hp
1656
+ ;;
1657
+ -mpeix*)
1658
+ vendor=hp
1659
+ ;;
1660
+ -hiux*)
1661
+ vendor=hitachi
1662
+ ;;
1663
+ -unos*)
1664
+ vendor=crds
1665
+ ;;
1666
+ -dgux*)
1667
+ vendor=dg
1668
+ ;;
1669
+ -luna*)
1670
+ vendor=omron
1671
+ ;;
1672
+ -genix*)
1673
+ vendor=ns
1674
+ ;;
1675
+ -mvs* | -opened*)
1676
+ vendor=ibm
1677
+ ;;
1678
+ -os400*)
1679
+ vendor=ibm
1680
+ ;;
1681
+ -ptx*)
1682
+ vendor=sequent
1683
+ ;;
1684
+ -tpf*)
1685
+ vendor=ibm
1686
+ ;;
1687
+ -vxsim* | -vxworks* | -windiss*)
1688
+ vendor=wrs
1689
+ ;;
1690
+ -aux*)
1691
+ vendor=apple
1692
+ ;;
1693
+ -hms*)
1694
+ vendor=hitachi
1695
+ ;;
1696
+ -mpw* | -macos*)
1697
+ vendor=apple
1698
+ ;;
1699
+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
1700
+ vendor=atari
1701
+ ;;
1702
+ -vos*)
1703
+ vendor=stratus
1704
+ ;;
1705
+ esac
1706
+ basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
1707
+ ;;
1708
+esac
1709
+
1710
+echo $basic_machine$os
1711
+exit
1712
+
1713
+# Local variables:
1714
+# eval: (add-hook 'write-file-hooks 'time-stamp)
1715
+# time-stamp-start: "timestamp='"
1716
+# time-stamp-format: "%:y-%02m-%02d"
1717
+# time-stamp-end: "'"
1718
+# End:
56
+++ gnupg2-2.0.14/version
57
@@ -0,0 +1 @@
58
+2.0.14-1
1719
59
--- gnupg2-2.0.14.orig/configure.ac
1720
60
+++ gnupg2-2.0.14/configure.ac
1721
61
@@ -87,6 +87,8 @@ GNUPG_BUILD_PROGRAM(symcryptrun, no)
3232
1572
+# time-stamp-format: "%:y-%02m-%02d"
3233
1573
+# time-stamp-end: "'"
3234
1574
+# End:
3235
--- gnupg2-2.0.14.orig/Makefile.in
3236
+++ gnupg2-2.0.14/Makefile.in
3237
@@ -33,7 +33,6 @@
1575
--- /dev/null
1576
+++ gnupg2-2.0.14/config.sub
1577
@@ -0,0 +1,1714 @@
1578
+#! /bin/sh
1579
+# Configuration validation subroutine script.
1580
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
1581
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
1582
+# Free Software Foundation, Inc.
1583
+
1584
+timestamp='2010-01-22'
1585
+
1586
+# This file is (in principle) common to ALL GNU software.
1587
+# The presence of a machine in this file suggests that SOME GNU software
1588
+# can handle that machine. It does not imply ALL GNU software can.
1589
+#
1590
+# This file is free software; you can redistribute it and/or modify
1591
+# it under the terms of the GNU General Public License as published by
1592
+# the Free Software Foundation; either version 2 of the License, or
1593
+# (at your option) any later version.
1594
+#
1595
+# This program is distributed in the hope that it will be useful,
1596
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
1597
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1598
+# GNU General Public License for more details.
1599
+#
1600
+# You should have received a copy of the GNU General Public License
1601
+# along with this program; if not, write to the Free Software
1602
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
1603
+# 02110-1301, USA.
1604
+#
1605
+# As a special exception to the GNU General Public License, if you
1606
+# distribute this file as part of a program that contains a
1607
+# configuration script generated by Autoconf, you may include it under
1608
+# the same distribution terms that you use for the rest of that program.
1609
+
1610
+
1611
+# Please send patches to <config-patches@gnu.org>. Submit a context
1612
+# diff and a properly formatted GNU ChangeLog entry.
1613
+#
1614
+# Configuration subroutine to validate and canonicalize a configuration type.
1615
+# Supply the specified configuration type as an argument.
1616
+# If it is invalid, we print an error message on stderr and exit with code 1.
1617
+# Otherwise, we print the canonical config type on stdout and succeed.
1618
+
1619
+# You can get the latest version of this script from:
1620
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
1621
+
1622
+# This file is supposed to be the same for all GNU packages
1623
+# and recognize all the CPU types, system types and aliases
1624
+# that are meaningful with *any* GNU software.
1625
+# Each package is responsible for reporting which valid configurations
1626
+# it does not support. The user should be able to distinguish
1627
+# a failure to support a valid configuration from a meaningless
1628
+# configuration.
1629
+
1630
+# The goal of this file is to map all the various variations of a given
1631
+# machine specification into a single specification in the form:
1632
+# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
1633
+# or in some cases, the newer four-part form:
1634
+# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
1635
+# It is wrong to echo any other type of specification.
1636
+
1637
+me=`echo "$0" | sed -e 's,.*/,,'`
1638
+
1639
+usage="\
1640
+Usage: $0 [OPTION] CPU-MFR-OPSYS
1641
+ $0 [OPTION] ALIAS
1642
+
1643
+Canonicalize a configuration name.
1644
+
1645
+Operation modes:
1646
+ -h, --help print this help, then exit
1647
+ -t, --time-stamp print date of last modification, then exit
1648
+ -v, --version print version number, then exit
1649
+
1650
+Report bugs and patches to <config-patches@gnu.org>."
1651
+
1652
+version="\
1653
+GNU config.sub ($timestamp)
1654
+
1655
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
1656
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
1657
+Software Foundation, Inc.
1658
+
1659
+This is free software; see the source for copying conditions. There is NO
1660
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
1661
+
1662
+help="
1663
+Try \`$me --help' for more information."
1664
+
1665
+# Parse command line
1666
+while test $# -gt 0 ; do
1667
+ case $1 in
1668
+ --time-stamp | --time* | -t )
1669
+ echo "$timestamp" ; exit ;;
1670
+ --version | -v )
1671
+ echo "$version" ; exit ;;
1672
+ --help | --h* | -h )
1673
+ echo "$usage"; exit ;;
1674
+ -- ) # Stop option processing
1675
+ shift; break ;;
1676
+ - ) # Use stdin as input.
1677
+ break ;;
1678
+ -* )
1679
+ echo "$me: invalid option $1$help"
1680
+ exit 1 ;;
1681
+
1682
+ *local*)
1683
+ # First pass through any local machine types.
1684
+ echo $1
1685
+ exit ;;
1686
+
1687
+ * )
1688
+ break ;;
1689
+ esac
1690
+done
1691
+
1692
+case $# in
1693
+ 0) echo "$me: missing argument$help" >&2
1694
+ exit 1;;
1695
+ 1) ;;
1696
+ *) echo "$me: too many arguments$help" >&2
1697
+ exit 1;;
1698
+esac
1699
+
1700
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
1701
+# Here we must recognize all the valid KERNEL-OS combinations.
1702
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
1703
+case $maybe_os in
1704
+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
1705
+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
1706
+ kopensolaris*-gnu* | \
1707
+ storm-chaos* | os2-emx* | rtmk-nova*)
1708
+ os=-$maybe_os
1709
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
1710
+ ;;
1711
+ *)
1712
+ basic_machine=`echo $1 | sed 's/-[^-]*$//'`
1713
+ if [ $basic_machine != $1 ]
1714
+ then os=`echo $1 | sed 's/.*-/-/'`
1715
+ else os=; fi
1716
+ ;;
1717
+esac
1718
+
1719
+### Let's recognize common machines as not being operating systems so
1720
+### that things like config.sub decstation-3100 work. We also
1721
+### recognize some manufacturers as not being operating systems, so we
1722
+### can provide default operating systems below.
1723
+case $os in
1724
+ -sun*os*)
1725
+ # Prevent following clause from handling this invalid input.
1726
+ ;;
1727
+ -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
1728
+ -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
1729
+ -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
1730
+ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
1731
+ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
1732
+ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
1733
+ -apple | -axis | -knuth | -cray | -microblaze)
1734
+ os=
1735
+ basic_machine=$1
1736
+ ;;
1737
+ -bluegene*)
1738
+ os=-cnk
1739
+ ;;
1740
+ -sim | -cisco | -oki | -wec | -winbond)
1741
+ os=
1742
+ basic_machine=$1
1743
+ ;;
1744
+ -scout)
1745
+ ;;
1746
+ -wrs)
1747
+ os=-vxworks
1748
+ basic_machine=$1
1749
+ ;;
1750
+ -chorusos*)
1751
+ os=-chorusos
1752
+ basic_machine=$1
1753
+ ;;
1754
+ -chorusrdb)
1755
+ os=-chorusrdb
1756
+ basic_machine=$1
1757
+ ;;
1758
+ -hiux*)
1759
+ os=-hiuxwe2
1760
+ ;;
1761
+ -sco6)
1762
+ os=-sco5v6
1763
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1764
+ ;;
1765
+ -sco5)
1766
+ os=-sco3.2v5
1767
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1768
+ ;;
1769
+ -sco4)
1770
+ os=-sco3.2v4
1771
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1772
+ ;;
1773
+ -sco3.2.[4-9]*)
1774
+ os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
1775
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1776
+ ;;
1777
+ -sco3.2v[4-9]*)
1778
+ # Don't forget version if it is 3.2v4 or newer.
1779
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1780
+ ;;
1781
+ -sco5v6*)
1782
+ # Don't forget version if it is 3.2v4 or newer.
1783
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1784
+ ;;
1785
+ -sco*)
1786
+ os=-sco3.2v2
1787
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1788
+ ;;
1789
+ -udk*)
1790
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1791
+ ;;
1792
+ -isc)
1793
+ os=-isc2.2
1794
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1795
+ ;;
1796
+ -clix*)
1797
+ basic_machine=clipper-intergraph
1798
+ ;;
1799
+ -isc*)
1800
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
1801
+ ;;
1802
+ -lynx*)
1803
+ os=-lynxos
1804
+ ;;
1805
+ -ptx*)
1806
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
1807
+ ;;
1808
+ -windowsnt*)
1809
+ os=`echo $os | sed -e 's/windowsnt/winnt/'`
1810
+ ;;
1811
+ -psos*)
1812
+ os=-psos
1813
+ ;;
1814
+ -mint | -mint[0-9]*)
1815
+ basic_machine=m68k-atari
1816
+ os=-mint
1817
+ ;;
1818
+esac
1819
+
1820
+# Decode aliases for certain CPU-COMPANY combinations.
1821
+case $basic_machine in
1822
+ # Recognize the basic CPU types without company name.
1823
+ # Some are omitted here because they have special meanings below.
1824
+ 1750a | 580 \
1825
+ | a29k \
1826
+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
1827
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
1828
+ | am33_2.0 \
1829
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
1830
+ | bfin \
1831
+ | c4x | clipper \
1832
+ | d10v | d30v | dlx | dsp16xx \
1833
+ | fido | fr30 | frv \
1834
+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
1835
+ | i370 | i860 | i960 | ia64 \
1836
+ | ip2k | iq2000 \
1837
+ | lm32 \
1838
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
1839
+ | maxq | mb | microblaze | mcore | mep | metag \
1840
+ | mips | mipsbe | mipseb | mipsel | mipsle \
1841
+ | mips16 \
1842
+ | mips64 | mips64el \
1843
+ | mips64octeon | mips64octeonel \
1844
+ | mips64orion | mips64orionel \
1845
+ | mips64r5900 | mips64r5900el \
1846
+ | mips64vr | mips64vrel \
1847
+ | mips64vr4100 | mips64vr4100el \
1848
+ | mips64vr4300 | mips64vr4300el \
1849
+ | mips64vr5000 | mips64vr5000el \
1850
+ | mips64vr5900 | mips64vr5900el \
1851
+ | mipsisa32 | mipsisa32el \
1852
+ | mipsisa32r2 | mipsisa32r2el \
1853
+ | mipsisa64 | mipsisa64el \
1854
+ | mipsisa64r2 | mipsisa64r2el \
1855
+ | mipsisa64sb1 | mipsisa64sb1el \
1856
+ | mipsisa64sr71k | mipsisa64sr71kel \
1857
+ | mipstx39 | mipstx39el \
1858
+ | mn10200 | mn10300 \
1859
+ | moxie \
1860
+ | mt \
1861
+ | msp430 \
1862
+ | nios | nios2 \
1863
+ | ns16k | ns32k \
1864
+ | or32 \
1865
+ | pdp10 | pdp11 | pj | pjl \
1866
+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
1867
+ | pyramid \
1868
+ | rx \
1869
+ | score \
1870
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
1871
+ | sh64 | sh64le \
1872
+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
1873
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
1874
+ | spu | strongarm \
1875
+ | tahoe | thumb | tic4x | tic80 | tron \
1876
+ | ubicom32 \
1877
+ | v850 | v850e \
1878
+ | we32k \
1879
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
1880
+ | z8k | z80)
1881
+ basic_machine=$basic_machine-unknown
1882
+ ;;
1883
+ m6811 | m68hc11 | m6812 | m68hc12 | picochip)
1884
+ # Motorola 68HC11/12.
1885
+ basic_machine=$basic_machine-unknown
1886
+ os=-none
1887
+ ;;
1888
+ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
1889
+ ;;
1890
+ ms1)
1891
+ basic_machine=mt-unknown
1892
+ ;;
1893
+
1894
+ # We use `pc' rather than `unknown'
1895
+ # because (1) that's what they normally are, and
1896
+ # (2) the word "unknown" tends to confuse beginning users.
1897
+ i*86 | x86_64)
1898
+ basic_machine=$basic_machine-pc
1899
+ ;;
1900
+ # Object if more than one company name word.
1901
+ *-*-*)
1902
+ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
1903
+ exit 1
1904
+ ;;
1905
+ # Recognize the basic CPU types with company name.
1906
+ 580-* \
1907
+ | a29k-* \
1908
+ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
1909
+ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
1910
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
1911
+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
1912
+ | avr-* | avr32-* \
1913
+ | bfin-* | bs2000-* \
1914
+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
1915
+ | clipper-* | craynv-* | cydra-* \
1916
+ | d10v-* | d30v-* | dlx-* \
1917
+ | elxsi-* \
1918
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
1919
+ | h8300-* | h8500-* \
1920
+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
1921
+ | i*86-* | i860-* | i960-* | ia64-* \
1922
+ | ip2k-* | iq2000-* \
1923
+ | lm32-* \
1924
+ | m32c-* | m32r-* | m32rle-* \
1925
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
1926
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
1927
+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
1928
+ | mips16-* \
1929
+ | mips64-* | mips64el-* \
1930
+ | mips64octeon-* | mips64octeonel-* \
1931
+ | mips64orion-* | mips64orionel-* \
1932
+ | mips64r5900-* | mips64r5900el-* \
1933
+ | mips64vr-* | mips64vrel-* \
1934
+ | mips64vr4100-* | mips64vr4100el-* \
1935
+ | mips64vr4300-* | mips64vr4300el-* \
1936
+ | mips64vr5000-* | mips64vr5000el-* \
1937
+ | mips64vr5900-* | mips64vr5900el-* \
1938
+ | mipsisa32-* | mipsisa32el-* \
1939
+ | mipsisa32r2-* | mipsisa32r2el-* \
1940
+ | mipsisa64-* | mipsisa64el-* \
1941
+ | mipsisa64r2-* | mipsisa64r2el-* \
1942
+ | mipsisa64sb1-* | mipsisa64sb1el-* \
1943
+ | mipsisa64sr71k-* | mipsisa64sr71kel-* \
1944
+ | mipstx39-* | mipstx39el-* \
1945
+ | mmix-* \
1946
+ | mt-* \
1947
+ | msp430-* \
1948
+ | nios-* | nios2-* \
1949
+ | none-* | np1-* | ns16k-* | ns32k-* \
1950
+ | orion-* \
1951
+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
1952
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
1953
+ | pyramid-* \
1954
+ | romp-* | rs6000-* | rx-* \
1955
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
1956
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
1957
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
1958
+ | sparclite-* \
1959
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
1960
+ | tahoe-* | thumb-* \
1961
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
1962
+ | tile-* | tilegx-* \
1963
+ | tron-* \
1964
+ | ubicom32-* \
1965
+ | v850-* | v850e-* | vax-* \
1966
+ | we32k-* \
1967
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
1968
+ | xstormy16-* | xtensa*-* \
1969
+ | ymp-* \
1970
+ | z8k-* | z80-*)
1971
+ ;;
1972
+ # Recognize the basic CPU types without company name, with glob match.
1973
+ xtensa*)
1974
+ basic_machine=$basic_machine-unknown
1975
+ ;;
1976
+ # Recognize the various machine names and aliases which stand
1977
+ # for a CPU type and a company and sometimes even an OS.
1978
+ 386bsd)
1979
+ basic_machine=i386-unknown
1980
+ os=-bsd
1981
+ ;;
1982
+ 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
1983
+ basic_machine=m68000-att
1984
+ ;;
1985
+ 3b*)
1986
+ basic_machine=we32k-att
1987
+ ;;
1988
+ a29khif)
1989
+ basic_machine=a29k-amd
1990
+ os=-udi
1991
+ ;;
1992
+ abacus)
1993
+ basic_machine=abacus-unknown
1994
+ ;;
1995
+ adobe68k)
1996
+ basic_machine=m68010-adobe
1997
+ os=-scout
1998
+ ;;
1999
+ alliant | fx80)
2000
+ basic_machine=fx80-alliant
2001
+ ;;
2002
+ altos | altos3068)
2003
+ basic_machine=m68k-altos
2004
+ ;;
2005
+ am29k)
2006
+ basic_machine=a29k-none
2007
+ os=-bsd
2008
+ ;;
2009
+ amd64)
2010
+ basic_machine=x86_64-pc
2011
+ ;;
2012
+ amd64-*)
2013
+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
2014
+ ;;
2015
+ amdahl)
2016
+ basic_machine=580-amdahl
2017
+ os=-sysv
2018
+ ;;
2019
+ amiga | amiga-*)
2020
+ basic_machine=m68k-unknown
2021
+ ;;
2022
+ amigaos | amigados)
2023
+ basic_machine=m68k-unknown
2024
+ os=-amigaos
2025
+ ;;
2026
+ amigaunix | amix)
2027
+ basic_machine=m68k-unknown
2028
+ os=-sysv4
2029
+ ;;
2030
+ apollo68)
2031
+ basic_machine=m68k-apollo
2032
+ os=-sysv
2033
+ ;;
2034
+ apollo68bsd)
2035
+ basic_machine=m68k-apollo
2036
+ os=-bsd
2037
+ ;;
2038
+ aros)
2039
+ basic_machine=i386-pc
2040
+ os=-aros
2041
+ ;;
2042
+ aux)
2043
+ basic_machine=m68k-apple
2044
+ os=-aux
2045
+ ;;
2046
+ balance)
2047
+ basic_machine=ns32k-sequent
2048
+ os=-dynix
2049
+ ;;
2050
+ blackfin)
2051
+ basic_machine=bfin-unknown
2052
+ os=-linux
2053
+ ;;
2054
+ blackfin-*)
2055
+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
2056
+ os=-linux
2057
+ ;;
2058
+ bluegene*)
2059
+ basic_machine=powerpc-ibm
2060
+ os=-cnk
2061
+ ;;
2062
+ c90)
2063
+ basic_machine=c90-cray
2064
+ os=-unicos
2065
+ ;;
2066
+ cegcc)
2067
+ basic_machine=arm-unknown
2068
+ os=-cegcc
2069
+ ;;
2070
+ convex-c1)
2071
+ basic_machine=c1-convex
2072
+ os=-bsd
2073
+ ;;
2074
+ convex-c2)
2075
+ basic_machine=c2-convex
2076
+ os=-bsd
2077
+ ;;
2078
+ convex-c32)
2079
+ basic_machine=c32-convex
2080
+ os=-bsd
2081
+ ;;
2082
+ convex-c34)
2083
+ basic_machine=c34-convex
2084
+ os=-bsd
2085
+ ;;
2086
+ convex-c38)
2087
+ basic_machine=c38-convex
2088
+ os=-bsd
2089
+ ;;
2090
+ cray | j90)
2091
+ basic_machine=j90-cray
2092
+ os=-unicos
2093
+ ;;
2094
+ craynv)
2095
+ basic_machine=craynv-cray
2096
+ os=-unicosmp
2097
+ ;;
2098
+ cr16)
2099
+ basic_machine=cr16-unknown
2100
+ os=-elf
2101
+ ;;
2102
+ crds | unos)
2103
+ basic_machine=m68k-crds
2104
+ ;;
2105
+ crisv32 | crisv32-* | etraxfs*)
2106
+ basic_machine=crisv32-axis
2107
+ ;;
2108
+ cris | cris-* | etrax*)
2109
+ basic_machine=cris-axis
2110
+ ;;
2111
+ crx)
2112
+ basic_machine=crx-unknown
2113
+ os=-elf
2114
+ ;;
2115
+ da30 | da30-*)
2116
+ basic_machine=m68k-da30
2117
+ ;;
2118
+ decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
2119
+ basic_machine=mips-dec
2120
+ ;;
2121
+ decsystem10* | dec10*)
2122
+ basic_machine=pdp10-dec
2123
+ os=-tops10
2124
+ ;;
2125
+ decsystem20* | dec20*)
2126
+ basic_machine=pdp10-dec
2127
+ os=-tops20
2128
+ ;;
2129
+ delta | 3300 | motorola-3300 | motorola-delta \
2130
+ | 3300-motorola | delta-motorola)
2131
+ basic_machine=m68k-motorola
2132
+ ;;
2133
+ delta88)
2134
+ basic_machine=m88k-motorola
2135
+ os=-sysv3
2136
+ ;;
2137
+ dicos)
2138
+ basic_machine=i686-pc
2139
+ os=-dicos
2140
+ ;;
2141
+ djgpp)
2142
+ basic_machine=i586-pc
2143
+ os=-msdosdjgpp
2144
+ ;;
2145
+ dpx20 | dpx20-*)
2146
+ basic_machine=rs6000-bull
2147
+ os=-bosx
2148
+ ;;
2149
+ dpx2* | dpx2*-bull)
2150
+ basic_machine=m68k-bull
2151
+ os=-sysv3
2152
+ ;;
2153
+ ebmon29k)
2154
+ basic_machine=a29k-amd
2155
+ os=-ebmon
2156
+ ;;
2157
+ elxsi)
2158
+ basic_machine=elxsi-elxsi
2159
+ os=-bsd
2160
+ ;;
2161
+ encore | umax | mmax)
2162
+ basic_machine=ns32k-encore
2163
+ ;;
2164
+ es1800 | OSE68k | ose68k | ose | OSE)
2165
+ basic_machine=m68k-ericsson
2166
+ os=-ose
2167
+ ;;
2168
+ fx2800)
2169
+ basic_machine=i860-alliant
2170
+ ;;
2171
+ genix)
2172
+ basic_machine=ns32k-ns
2173
+ ;;
2174
+ gmicro)
2175
+ basic_machine=tron-gmicro
2176
+ os=-sysv
2177
+ ;;
2178
+ go32)
2179
+ basic_machine=i386-pc
2180
+ os=-go32
2181
+ ;;
2182
+ h3050r* | hiux*)
2183
+ basic_machine=hppa1.1-hitachi
2184
+ os=-hiuxwe2
2185
+ ;;
2186
+ h8300hms)
2187
+ basic_machine=h8300-hitachi
2188
+ os=-hms
2189
+ ;;
2190
+ h8300xray)
2191
+ basic_machine=h8300-hitachi
2192
+ os=-xray
2193
+ ;;
2194
+ h8500hms)
2195
+ basic_machine=h8500-hitachi
2196
+ os=-hms
2197
+ ;;
2198
+ harris)
2199
+ basic_machine=m88k-harris
2200
+ os=-sysv3
2201
+ ;;
2202
+ hp300-*)
2203
+ basic_machine=m68k-hp
2204
+ ;;
2205
+ hp300bsd)
2206
+ basic_machine=m68k-hp
2207
+ os=-bsd
2208
+ ;;
2209
+ hp300hpux)
2210
+ basic_machine=m68k-hp
2211
+ os=-hpux
2212
+ ;;
2213
+ hp3k9[0-9][0-9] | hp9[0-9][0-9])
2214
+ basic_machine=hppa1.0-hp
2215
+ ;;
2216
+ hp9k2[0-9][0-9] | hp9k31[0-9])
2217
+ basic_machine=m68000-hp
2218
+ ;;
2219
+ hp9k3[2-9][0-9])
2220
+ basic_machine=m68k-hp
2221
+ ;;
2222
+ hp9k6[0-9][0-9] | hp6[0-9][0-9])
2223
+ basic_machine=hppa1.0-hp
2224
+ ;;
2225
+ hp9k7[0-79][0-9] | hp7[0-79][0-9])
2226
+ basic_machine=hppa1.1-hp
2227
+ ;;
2228
+ hp9k78[0-9] | hp78[0-9])
2229
+ # FIXME: really hppa2.0-hp
2230
+ basic_machine=hppa1.1-hp
2231
+ ;;
2232
+ hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
2233
+ # FIXME: really hppa2.0-hp
2234
+ basic_machine=hppa1.1-hp
2235
+ ;;
2236
+ hp9k8[0-9][13679] | hp8[0-9][13679])
2237
+ basic_machine=hppa1.1-hp
2238
+ ;;
2239
+ hp9k8[0-9][0-9] | hp8[0-9][0-9])
2240
+ basic_machine=hppa1.0-hp
2241
+ ;;
2242
+ hppa-next)
2243
+ os=-nextstep3
2244
+ ;;
2245
+ hppaosf)
2246
+ basic_machine=hppa1.1-hp
2247
+ os=-osf
2248
+ ;;
2249
+ hppro)
2250
+ basic_machine=hppa1.1-hp
2251
+ os=-proelf
2252
+ ;;
2253
+ i370-ibm* | ibm*)
2254
+ basic_machine=i370-ibm
2255
+ ;;
2256
+# I'm not sure what "Sysv32" means. Should this be sysv3.2?
2257
+ i*86v32)
2258
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
2259
+ os=-sysv32
2260
+ ;;
2261
+ i*86v4*)
2262
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
2263
+ os=-sysv4
2264
+ ;;
2265
+ i*86v)
2266
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
2267
+ os=-sysv
2268
+ ;;
2269
+ i*86sol2)
2270
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
2271
+ os=-solaris2
2272
+ ;;
2273
+ i386mach)
2274
+ basic_machine=i386-mach
2275
+ os=-mach
2276
+ ;;
2277
+ i386-vsta | vsta)
2278
+ basic_machine=i386-unknown
2279
+ os=-vsta
2280
+ ;;
2281
+ iris | iris4d)
2282
+ basic_machine=mips-sgi
2283
+ case $os in
2284
+ -irix*)
2285
+ ;;
2286
+ *)
2287
+ os=-irix4
2288
+ ;;
2289
+ esac
2290
+ ;;
2291
+ isi68 | isi)
2292
+ basic_machine=m68k-isi
2293
+ os=-sysv
2294
+ ;;
2295
+ m68knommu)
2296
+ basic_machine=m68k-unknown
2297
+ os=-linux
2298
+ ;;
2299
+ m68knommu-*)
2300
+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
2301
+ os=-linux
2302
+ ;;
2303
+ m88k-omron*)
2304
+ basic_machine=m88k-omron
2305
+ ;;
2306
+ magnum | m3230)
2307
+ basic_machine=mips-mips
2308
+ os=-sysv
2309
+ ;;
2310
+ merlin)
2311
+ basic_machine=ns32k-utek
2312
+ os=-sysv
2313
+ ;;
2314
+ microblaze)
2315
+ basic_machine=microblaze-xilinx
2316
+ ;;
2317
+ mingw32)
2318
+ basic_machine=i386-pc
2319
+ os=-mingw32
2320
+ ;;
2321
+ mingw32ce)
2322
+ basic_machine=arm-unknown
2323
+ os=-mingw32ce
2324
+ ;;
2325
+ miniframe)
2326
+ basic_machine=m68000-convergent
2327
+ ;;
2328
+ *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
2329
+ basic_machine=m68k-atari
2330
+ os=-mint
2331
+ ;;
2332
+ mips3*-*)
2333
+ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
2334
+ ;;
2335
+ mips3*)
2336
+ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
2337
+ ;;
2338
+ monitor)
2339
+ basic_machine=m68k-rom68k
2340
+ os=-coff
2341
+ ;;
2342
+ morphos)
2343
+ basic_machine=powerpc-unknown
2344
+ os=-morphos
2345
+ ;;
2346
+ msdos)
2347
+ basic_machine=i386-pc
2348
+ os=-msdos
2349
+ ;;
2350
+ ms1-*)
2351
+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
2352
+ ;;
2353
+ mvs)
2354
+ basic_machine=i370-ibm
2355
+ os=-mvs
2356
+ ;;
2357
+ ncr3000)
2358
+ basic_machine=i486-ncr
2359
+ os=-sysv4
2360
+ ;;
2361
+ netbsd386)
2362
+ basic_machine=i386-unknown
2363
+ os=-netbsd
2364
+ ;;
2365
+ netwinder)
2366
+ basic_machine=armv4l-rebel
2367
+ os=-linux
2368
+ ;;
2369
+ news | news700 | news800 | news900)
2370
+ basic_machine=m68k-sony
2371
+ os=-newsos
2372
+ ;;
2373
+ news1000)
2374
+ basic_machine=m68030-sony
2375
+ os=-newsos
2376
+ ;;
2377
+ news-3600 | risc-news)
2378
+ basic_machine=mips-sony
2379
+ os=-newsos
2380
+ ;;
2381
+ necv70)
2382
+ basic_machine=v70-nec
2383
+ os=-sysv
2384
+ ;;
2385
+ next | m*-next )
2386
+ basic_machine=m68k-next
2387
+ case $os in
2388
+ -nextstep* )
2389
+ ;;
2390
+ -ns2*)
2391
+ os=-nextstep2
2392
+ ;;
2393
+ *)
2394
+ os=-nextstep3
2395
+ ;;
2396
+ esac
2397
+ ;;
2398
+ nh3000)
2399
+ basic_machine=m68k-harris
2400
+ os=-cxux
2401
+ ;;
2402
+ nh[45]000)
2403
+ basic_machine=m88k-harris
2404
+ os=-cxux
2405
+ ;;
2406
+ nindy960)
2407
+ basic_machine=i960-intel
2408
+ os=-nindy
2409
+ ;;
2410
+ mon960)
2411
+ basic_machine=i960-intel
2412
+ os=-mon960
2413
+ ;;
2414
+ nonstopux)
2415
+ basic_machine=mips-compaq
2416
+ os=-nonstopux
2417
+ ;;
2418
+ np1)
2419
+ basic_machine=np1-gould
2420
+ ;;
2421
+ nsr-tandem)
2422
+ basic_machine=nsr-tandem
2423
+ ;;
2424
+ op50n-* | op60c-*)
2425
+ basic_machine=hppa1.1-oki
2426
+ os=-proelf
2427
+ ;;
2428
+ openrisc | openrisc-*)
2429
+ basic_machine=or32-unknown
2430
+ ;;
2431
+ os400)
2432
+ basic_machine=powerpc-ibm
2433
+ os=-os400
2434
+ ;;
2435
+ OSE68000 | ose68000)
2436
+ basic_machine=m68000-ericsson
2437
+ os=-ose
2438
+ ;;
2439
+ os68k)
2440
+ basic_machine=m68k-none
2441
+ os=-os68k
2442
+ ;;
2443
+ pa-hitachi)
2444
+ basic_machine=hppa1.1-hitachi
2445
+ os=-hiuxwe2
2446
+ ;;
2447
+ paragon)
2448
+ basic_machine=i860-intel
2449
+ os=-osf
2450
+ ;;
2451
+ parisc)
2452
+ basic_machine=hppa-unknown
2453
+ os=-linux
2454
+ ;;
2455
+ parisc-*)
2456
+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
2457
+ os=-linux
2458
+ ;;
2459
+ pbd)
2460
+ basic_machine=sparc-tti
2461
+ ;;
2462
+ pbb)
2463
+ basic_machine=m68k-tti
2464
+ ;;
2465
+ pc532 | pc532-*)
2466
+ basic_machine=ns32k-pc532
2467
+ ;;
2468
+ pc98)
2469
+ basic_machine=i386-pc
2470
+ ;;
2471
+ pc98-*)
2472
+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
2473
+ ;;
2474
+ pentium | p5 | k5 | k6 | nexgen | viac3)
2475
+ basic_machine=i586-pc
2476
+ ;;
2477
+ pentiumpro | p6 | 6x86 | athlon | athlon_*)
2478
+ basic_machine=i686-pc
2479
+ ;;
2480
+ pentiumii | pentium2 | pentiumiii | pentium3)
2481
+ basic_machine=i686-pc
2482
+ ;;
2483
+ pentium4)
2484
+ basic_machine=i786-pc
2485
+ ;;
2486
+ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
2487
+ basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
2488
+ ;;
2489
+ pentiumpro-* | p6-* | 6x86-* | athlon-*)
2490
+ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
2491
+ ;;
2492
+ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
2493
+ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
2494
+ ;;
2495
+ pentium4-*)
2496
+ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
2497
+ ;;
2498
+ pn)
2499
+ basic_machine=pn-gould
2500
+ ;;
2501
+ power) basic_machine=power-ibm
2502
+ ;;
2503
+ ppc) basic_machine=powerpc-unknown
2504
+ ;;
2505
+ ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
2506
+ ;;
2507
+ ppcle | powerpclittle | ppc-le | powerpc-little)
2508
+ basic_machine=powerpcle-unknown
2509
+ ;;
2510
+ ppcle-* | powerpclittle-*)
2511
+ basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
2512
+ ;;
2513
+ ppc64) basic_machine=powerpc64-unknown
2514
+ ;;
2515
+ ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
2516
+ ;;
2517
+ ppc64le | powerpc64little | ppc64-le | powerpc64-little)
2518
+ basic_machine=powerpc64le-unknown
2519
+ ;;
2520
+ ppc64le-* | powerpc64little-*)
2521
+ basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
2522
+ ;;
2523
+ ps2)
2524
+ basic_machine=i386-ibm
2525
+ ;;
2526
+ pw32)
2527
+ basic_machine=i586-unknown
2528
+ os=-pw32
2529
+ ;;
2530
+ rdos)
2531
+ basic_machine=i386-pc
2532
+ os=-rdos
2533
+ ;;
2534
+ rom68k)
2535
+ basic_machine=m68k-rom68k
2536
+ os=-coff
2537
+ ;;
2538
+ rm[46]00)
2539
+ basic_machine=mips-siemens
2540
+ ;;
2541
+ rtpc | rtpc-*)
2542
+ basic_machine=romp-ibm
2543
+ ;;
2544
+ s390 | s390-*)
2545
+ basic_machine=s390-ibm
2546
+ ;;
2547
+ s390x | s390x-*)
2548
+ basic_machine=s390x-ibm
2549
+ ;;
2550
+ sa29200)
2551
+ basic_machine=a29k-amd
2552
+ os=-udi
2553
+ ;;
2554
+ sb1)
2555
+ basic_machine=mipsisa64sb1-unknown
2556
+ ;;
2557
+ sb1el)
2558
+ basic_machine=mipsisa64sb1el-unknown
2559
+ ;;
2560
+ sde)
2561
+ basic_machine=mipsisa32-sde
2562
+ os=-elf
2563
+ ;;
2564
+ sei)
2565
+ basic_machine=mips-sei
2566
+ os=-seiux
2567
+ ;;
2568
+ sequent)
2569
+ basic_machine=i386-sequent
2570
+ ;;
2571
+ sh)
2572
+ basic_machine=sh-hitachi
2573
+ os=-hms
2574
+ ;;
2575
+ sh5el)
2576
+ basic_machine=sh5le-unknown
2577
+ ;;
2578
+ sh64)
2579
+ basic_machine=sh64-unknown
2580
+ ;;
2581
+ sparclite-wrs | simso-wrs)
2582
+ basic_machine=sparclite-wrs
2583
+ os=-vxworks
2584
+ ;;
2585
+ sps7)
2586
+ basic_machine=m68k-bull
2587
+ os=-sysv2
2588
+ ;;
2589
+ spur)
2590
+ basic_machine=spur-unknown
2591
+ ;;
2592
+ st2000)
2593
+ basic_machine=m68k-tandem
2594
+ ;;
2595
+ stratus)
2596
+ basic_machine=i860-stratus
2597
+ os=-sysv4
2598
+ ;;
2599
+ sun2)
2600
+ basic_machine=m68000-sun
2601
+ ;;
2602
+ sun2os3)
2603
+ basic_machine=m68000-sun
2604
+ os=-sunos3
2605
+ ;;
2606
+ sun2os4)
2607
+ basic_machine=m68000-sun
2608
+ os=-sunos4
2609
+ ;;
2610
+ sun3os3)
2611
+ basic_machine=m68k-sun
2612
+ os=-sunos3
2613
+ ;;
2614
+ sun3os4)
2615
+ basic_machine=m68k-sun
2616
+ os=-sunos4
2617
+ ;;
2618
+ sun4os3)
2619
+ basic_machine=sparc-sun
2620
+ os=-sunos3
2621
+ ;;
2622
+ sun4os4)
2623
+ basic_machine=sparc-sun
2624
+ os=-sunos4
2625
+ ;;
2626
+ sun4sol2)
2627
+ basic_machine=sparc-sun
2628
+ os=-solaris2
2629
+ ;;
2630
+ sun3 | sun3-*)
2631
+ basic_machine=m68k-sun
2632
+ ;;
2633
+ sun4)
2634
+ basic_machine=sparc-sun
2635
+ ;;
2636
+ sun386 | sun386i | roadrunner)
2637
+ basic_machine=i386-sun
2638
+ ;;
2639
+ sv1)
2640
+ basic_machine=sv1-cray
2641
+ os=-unicos
2642
+ ;;
2643
+ symmetry)
2644
+ basic_machine=i386-sequent
2645
+ os=-dynix
2646
+ ;;
2647
+ t3e)
2648
+ basic_machine=alphaev5-cray
2649
+ os=-unicos
2650
+ ;;
2651
+ t90)
2652
+ basic_machine=t90-cray
2653
+ os=-unicos
2654
+ ;;
2655
+ tic54x | c54x*)
2656
+ basic_machine=tic54x-unknown
2657
+ os=-coff
2658
+ ;;
2659
+ tic55x | c55x*)
2660
+ basic_machine=tic55x-unknown
2661
+ os=-coff
2662
+ ;;
2663
+ tic6x | c6x*)
2664
+ basic_machine=tic6x-unknown
2665
+ os=-coff
2666
+ ;;
2667
+ # This must be matched before tile*.
2668
+ tilegx*)
2669
+ basic_machine=tilegx-unknown
2670
+ os=-linux-gnu
2671
+ ;;
2672
+ tile*)
2673
+ basic_machine=tile-unknown
2674
+ os=-linux-gnu
2675
+ ;;
2676
+ tx39)
2677
+ basic_machine=mipstx39-unknown
2678
+ ;;
2679
+ tx39el)
2680
+ basic_machine=mipstx39el-unknown
2681
+ ;;
2682
+ toad1)
2683
+ basic_machine=pdp10-xkl
2684
+ os=-tops20
2685
+ ;;
2686
+ tower | tower-32)
2687
+ basic_machine=m68k-ncr
2688
+ ;;
2689
+ tpf)
2690
+ basic_machine=s390x-ibm
2691
+ os=-tpf
2692
+ ;;
2693
+ udi29k)
2694
+ basic_machine=a29k-amd
2695
+ os=-udi
2696
+ ;;
2697
+ ultra3)
2698
+ basic_machine=a29k-nyu
2699
+ os=-sym1
2700
+ ;;
2701
+ v810 | necv810)
2702
+ basic_machine=v810-nec
2703
+ os=-none
2704
+ ;;
2705
+ vaxv)
2706
+ basic_machine=vax-dec
2707
+ os=-sysv
2708
+ ;;
2709
+ vms)
2710
+ basic_machine=vax-dec
2711
+ os=-vms
2712
+ ;;
2713
+ vpp*|vx|vx-*)
2714
+ basic_machine=f301-fujitsu
2715
+ ;;
2716
+ vxworks960)
2717
+ basic_machine=i960-wrs
2718
+ os=-vxworks
2719
+ ;;
2720
+ vxworks68)
2721
+ basic_machine=m68k-wrs
2722
+ os=-vxworks
2723
+ ;;
2724
+ vxworks29k)
2725
+ basic_machine=a29k-wrs
2726
+ os=-vxworks
2727
+ ;;
2728
+ w65*)
2729
+ basic_machine=w65-wdc
2730
+ os=-none
2731
+ ;;
2732
+ w89k-*)
2733
+ basic_machine=hppa1.1-winbond
2734
+ os=-proelf
2735
+ ;;
2736
+ xbox)
2737
+ basic_machine=i686-pc
2738
+ os=-mingw32
2739
+ ;;
2740
+ xps | xps100)
2741
+ basic_machine=xps100-honeywell
2742
+ ;;
2743
+ ymp)
2744
+ basic_machine=ymp-cray
2745
+ os=-unicos
2746
+ ;;
2747
+ z8k-*-coff)
2748
+ basic_machine=z8k-unknown
2749
+ os=-sim
2750
+ ;;
2751
+ z80-*-coff)
2752
+ basic_machine=z80-unknown
2753
+ os=-sim
2754
+ ;;
2755
+ none)
2756
+ basic_machine=none-none
2757
+ os=-none
2758
+ ;;
2759
+
2760
+# Here we handle the default manufacturer of certain CPU types. It is in
2761
+# some cases the only manufacturer, in others, it is the most popular.
2762
+ w89k)
2763
+ basic_machine=hppa1.1-winbond
2764
+ ;;
2765
+ op50n)
2766
+ basic_machine=hppa1.1-oki
2767
+ ;;
2768
+ op60c)
2769
+ basic_machine=hppa1.1-oki
2770
+ ;;
2771
+ romp)
2772
+ basic_machine=romp-ibm
2773
+ ;;
2774
+ mmix)
2775
+ basic_machine=mmix-knuth
2776
+ ;;
2777
+ rs6000)
2778
+ basic_machine=rs6000-ibm
2779
+ ;;
2780
+ vax)
2781
+ basic_machine=vax-dec
2782
+ ;;
2783
+ pdp10)
2784
+ # there are many clones, so DEC is not a safe bet
2785
+ basic_machine=pdp10-unknown
2786
+ ;;
2787
+ pdp11)
2788
+ basic_machine=pdp11-dec
2789
+ ;;
2790
+ we32k)
2791
+ basic_machine=we32k-att
2792
+ ;;
2793
+ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
2794
+ basic_machine=sh-unknown
2795
+ ;;
2796
+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
2797
+ basic_machine=sparc-sun
2798
+ ;;
2799
+ cydra)
2800
+ basic_machine=cydra-cydrome
2801
+ ;;
2802
+ orion)
2803
+ basic_machine=orion-highlevel
2804
+ ;;
2805
+ orion105)
2806
+ basic_machine=clipper-highlevel
2807
+ ;;
2808
+ mac | mpw | mac-mpw)
2809
+ basic_machine=m68k-apple
2810
+ ;;
2811
+ pmac | pmac-mpw)
2812
+ basic_machine=powerpc-apple
2813
+ ;;
2814
+ *-unknown)
2815
+ # Make sure to match an already-canonicalized machine name.
2816
+ ;;
2817
+ *)
2818
+ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
2819
+ exit 1
2820
+ ;;
2821
+esac
2822
+
2823
+# Here we canonicalize certain aliases for manufacturers.
2824
+case $basic_machine in
2825
+ *-digital*)
2826
+ basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
2827
+ ;;
2828
+ *-commodore*)
2829
+ basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
2830
+ ;;
2831
+ *)
2832
+ ;;
2833
+esac
2834
+
2835
+# Decode manufacturer-specific aliases for certain operating systems.
2836
+
2837
+if [ x"$os" != x"" ]
2838
+then
2839
+case $os in
2840
+ # First match some system type aliases
2841
+ # that might get confused with valid system types.
2842
+ # -solaris* is a basic system type, with this one exception.
2843
+ -auroraux)
2844
+ os=-auroraux
2845
+ ;;
2846
+ -solaris1 | -solaris1.*)
2847
+ os=`echo $os | sed -e 's|solaris1|sunos4|'`
2848
+ ;;
2849
+ -solaris)
2850
+ os=-solaris2
2851
+ ;;
2852
+ -svr4*)
2853
+ os=-sysv4
2854
+ ;;
2855
+ -unixware*)
2856
+ os=-sysv4.2uw
2857
+ ;;
2858
+ -gnu/linux*)
2859
+ os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
2860
+ ;;
2861
+ # First accept the basic system types.
2862
+ # The portable systems comes first.
2863
+ # Each alternative MUST END IN A *, to match a version number.
2864
+ # -sysv* is not here because it comes later, after sysvr4.
2865
+ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
2866
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
2867
+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
2868
+ | -sym* | -kopensolaris* \
2869
+ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
2870
+ | -aos* | -aros* \
2871
+ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
2872
+ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
2873
+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
2874
+ | -openbsd* | -solidbsd* \
2875
+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
2876
+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
2877
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
2878
+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
2879
+ | -chorusos* | -chorusrdb* | -cegcc* \
2880
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
2881
+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
2882
+ | -uxpv* | -beos* | -mpeix* | -udk* \
2883
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
2884
+ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
2885
+ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
2886
+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
2887
+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
2888
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
2889
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
2890
+ # Remember, each alternative MUST END IN *, to match a version number.
2891
+ ;;
2892
+ -qnx*)
2893
+ case $basic_machine in
2894
+ x86-* | i*86-*)
2895
+ ;;
2896
+ *)
2897
+ os=-nto$os
2898
+ ;;
2899
+ esac
2900
+ ;;
2901
+ -nto-qnx*)
2902
+ ;;
2903
+ -nto*)
2904
+ os=`echo $os | sed -e 's|nto|nto-qnx|'`
2905
+ ;;
2906
+ -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
2907
+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
2908
+ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
2909
+ ;;
2910
+ -mac*)
2911
+ os=`echo $os | sed -e 's|mac|macos|'`
2912
+ ;;
2913
+ -linux-dietlibc)
2914
+ os=-linux-dietlibc
2915
+ ;;
2916
+ -linux*)
2917
+ os=`echo $os | sed -e 's|linux|linux-gnu|'`
2918
+ ;;
2919
+ -sunos5*)
2920
+ os=`echo $os | sed -e 's|sunos5|solaris2|'`
2921
+ ;;
2922
+ -sunos6*)
2923
+ os=`echo $os | sed -e 's|sunos6|solaris3|'`
2924
+ ;;
2925
+ -opened*)
2926
+ os=-openedition
2927
+ ;;
2928
+ -os400*)
2929
+ os=-os400
2930
+ ;;
2931
+ -wince*)
2932
+ os=-wince
2933
+ ;;
2934
+ -osfrose*)
2935
+ os=-osfrose
2936
+ ;;
2937
+ -osf*)
2938
+ os=-osf
2939
+ ;;
2940
+ -utek*)
2941
+ os=-bsd
2942
+ ;;
2943
+ -dynix*)
2944
+ os=-bsd
2945
+ ;;
2946
+ -acis*)
2947
+ os=-aos
2948
+ ;;
2949
+ -atheos*)
2950
+ os=-atheos
2951
+ ;;
2952
+ -syllable*)
2953
+ os=-syllable
2954
+ ;;
2955
+ -386bsd)
2956
+ os=-bsd
2957
+ ;;
2958
+ -ctix* | -uts*)
2959
+ os=-sysv
2960
+ ;;
2961
+ -nova*)
2962
+ os=-rtmk-nova
2963
+ ;;
2964
+ -ns2 )
2965
+ os=-nextstep2
2966
+ ;;
2967
+ -nsk*)
2968
+ os=-nsk
2969
+ ;;
2970
+ # Preserve the version number of sinix5.
2971
+ -sinix5.*)
2972
+ os=`echo $os | sed -e 's|sinix|sysv|'`
2973
+ ;;
2974
+ -sinix*)
2975
+ os=-sysv4
2976
+ ;;
2977
+ -tpf*)
2978
+ os=-tpf
2979
+ ;;
2980
+ -triton*)
2981
+ os=-sysv3
2982
+ ;;
2983
+ -oss*)
2984
+ os=-sysv3
2985
+ ;;
2986
+ -svr4)
2987
+ os=-sysv4
2988
+ ;;
2989
+ -svr3)
2990
+ os=-sysv3
2991
+ ;;
2992
+ -sysvr4)
2993
+ os=-sysv4
2994
+ ;;
2995
+ # This must come after -sysvr4.
2996
+ -sysv*)
2997
+ ;;
2998
+ -ose*)
2999
+ os=-ose
3000
+ ;;
3001
+ -es1800*)
3002
+ os=-ose
3003
+ ;;
3004
+ -xenix)
3005
+ os=-xenix
3006
+ ;;
3007
+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
3008
+ os=-mint
3009
+ ;;
3010
+ -aros*)
3011
+ os=-aros
3012
+ ;;
3013
+ -kaos*)
3014
+ os=-kaos
3015
+ ;;
3016
+ -zvmoe)
3017
+ os=-zvmoe
3018
+ ;;
3019
+ -dicos*)
3020
+ os=-dicos
3021
+ ;;
3022
+ -nacl*)
3023
+ ;;
3024
+ -none)
3025
+ ;;
3026
+ *)
3027
+ # Get rid of the `-' at the beginning of $os.
3028
+ os=`echo $os | sed 's/[^-]*-//'`
3029
+ echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
3030
+ exit 1
3031
+ ;;
3032
+esac
3033
+else
3034
+
3035
+# Here we handle the default operating systems that come with various machines.
3036
+# The value should be what the vendor currently ships out the door with their
3037
+# machine or put another way, the most popular os provided with the machine.
3038
+
3039
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
3040
+# "-sun"), then you have to tell the case statement up towards the top
3041
+# that MANUFACTURER isn't an operating system. Otherwise, code above
3042
+# will signal an error saying that MANUFACTURER isn't an operating
3043
+# system, and we'll never get to this point.
3044
+
3045
+case $basic_machine in
3046
+ score-*)
3047
+ os=-elf
3048
+ ;;
3049
+ spu-*)
3050
+ os=-elf
3051
+ ;;
3052
+ *-acorn)
3053
+ os=-riscix1.2
3054
+ ;;
3055
+ arm*-rebel)
3056
+ os=-linux
3057
+ ;;
3058
+ arm*-semi)
3059
+ os=-aout
3060
+ ;;
3061
+ c4x-* | tic4x-*)
3062
+ os=-coff
3063
+ ;;
3064
+ # This must come before the *-dec entry.
3065
+ pdp10-*)
3066
+ os=-tops20
3067
+ ;;
3068
+ pdp11-*)
3069
+ os=-none
3070
+ ;;
3071
+ *-dec | vax-*)
3072
+ os=-ultrix4.2
3073
+ ;;
3074
+ m68*-apollo)
3075
+ os=-domain
3076
+ ;;
3077
+ i386-sun)
3078
+ os=-sunos4.0.2
3079
+ ;;
3080
+ m68000-sun)
3081
+ os=-sunos3
3082
+ # This also exists in the configure program, but was not the
3083
+ # default.
3084
+ # os=-sunos4
3085
+ ;;
3086
+ m68*-cisco)
3087
+ os=-aout
3088
+ ;;
3089
+ mep-*)
3090
+ os=-elf
3091
+ ;;
3092
+ mips*-cisco)
3093
+ os=-elf
3094
+ ;;
3095
+ mips*-*)
3096
+ os=-elf
3097
+ ;;
3098
+ or32-*)
3099
+ os=-coff
3100
+ ;;
3101
+ *-tti) # must be before sparc entry or we get the wrong os.
3102
+ os=-sysv3
3103
+ ;;
3104
+ sparc-* | *-sun)
3105
+ os=-sunos4.1.1
3106
+ ;;
3107
+ *-be)
3108
+ os=-beos
3109
+ ;;
3110
+ *-haiku)
3111
+ os=-haiku
3112
+ ;;
3113
+ *-ibm)
3114
+ os=-aix
3115
+ ;;
3116
+ *-knuth)
3117
+ os=-mmixware
3118
+ ;;
3119
+ *-wec)
3120
+ os=-proelf
3121
+ ;;
3122
+ *-winbond)
3123
+ os=-proelf
3124
+ ;;
3125
+ *-oki)
3126
+ os=-proelf
3127
+ ;;
3128
+ *-hp)
3129
+ os=-hpux
3130
+ ;;
3131
+ *-hitachi)
3132
+ os=-hiux
3133
+ ;;
3134
+ i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
3135
+ os=-sysv
3136
+ ;;
3137
+ *-cbm)
3138
+ os=-amigaos
3139
+ ;;
3140
+ *-dg)
3141
+ os=-dgux
3142
+ ;;
3143
+ *-dolphin)
3144
+ os=-sysv3
3145
+ ;;
3146
+ m68k-ccur)
3147
+ os=-rtu
3148
+ ;;
3149
+ m88k-omron*)
3150
+ os=-luna
3151
+ ;;
3152
+ *-next )
3153
+ os=-nextstep
3154
+ ;;
3155
+ *-sequent)
3156
+ os=-ptx
3157
+ ;;
3158
+ *-crds)
3159
+ os=-unos
3160
+ ;;
3161
+ *-ns)
3162
+ os=-genix
3163
+ ;;
3164
+ i370-*)
3165
+ os=-mvs
3166
+ ;;
3167
+ *-next)
3168
+ os=-nextstep3
3169
+ ;;
3170
+ *-gould)
3171
+ os=-sysv
3172
+ ;;
3173
+ *-highlevel)
3174
+ os=-bsd
3175
+ ;;
3176
+ *-encore)
3177
+ os=-bsd
3178
+ ;;
3179
+ *-sgi)
3180
+ os=-irix
3181
+ ;;
3182
+ *-siemens)
3183
+ os=-sysv4
3184
+ ;;
3185
+ *-masscomp)
3186
+ os=-rtu
3187
+ ;;
3188
+ f30[01]-fujitsu | f700-fujitsu)
3189
+ os=-uxpv
3190
+ ;;
3191
+ *-rom68k)
3192
+ os=-coff
3193
+ ;;
3194
+ *-*bug)
3195
+ os=-coff
3196
+ ;;
3197
+ *-apple)
3198
+ os=-macos
3199
+ ;;
3200
+ *-atari*)
3201
+ os=-mint
3202
+ ;;
3203
+ *)
3204
+ os=-none
3205
+ ;;
3206
+esac
3207
+fi
3208
+
3209
+# Here we handle the case where we know the os, and the CPU type, but not the
3210
+# manufacturer. We pick the logical manufacturer.
3211
+vendor=unknown
3212
+case $basic_machine in
3213
+ *-unknown)
3214
+ case $os in
3215
+ -riscix*)
3216
+ vendor=acorn
3217
+ ;;
3218
+ -sunos*)
3219
+ vendor=sun
3220
+ ;;
3221
+ -cnk*|-aix*)
3222
+ vendor=ibm
3223
+ ;;
3224
+ -beos*)
3225
+ vendor=be
3226
+ ;;
3227
+ -hpux*)
3228
+ vendor=hp
3229
+ ;;
3230
+ -mpeix*)
3231
+ vendor=hp
3232
+ ;;
3233
+ -hiux*)
3234
+ vendor=hitachi
3235
+ ;;
3236
+ -unos*)
3237
+ vendor=crds
3238
+ ;;
3239
+ -dgux*)
3240
+ vendor=dg
3241
+ ;;
3242
+ -luna*)
3243
+ vendor=omron
3244
+ ;;
3245
+ -genix*)
3246
+ vendor=ns
3247
+ ;;
3248
+ -mvs* | -opened*)
3249
+ vendor=ibm
3250
+ ;;
3251
+ -os400*)
3252
+ vendor=ibm
3253
+ ;;
3254
+ -ptx*)
3255
+ vendor=sequent
3256
+ ;;
3257
+ -tpf*)
3258
+ vendor=ibm
3259
+ ;;
3260
+ -vxsim* | -vxworks* | -windiss*)
3261
+ vendor=wrs
3262
+ ;;
3263
+ -aux*)
3264
+ vendor=apple
3265
+ ;;
3266
+ -hms*)
3267
+ vendor=hitachi
3268
+ ;;
3269
+ -mpw* | -macos*)
3270
+ vendor=apple
3271
+ ;;
3272
+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
3273
+ vendor=atari
3274
+ ;;
3275
+ -vos*)
3276
+ vendor=stratus
3277
+ ;;
3278
+ esac
3279
+ basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
3280
+ ;;
3281
+esac
3282
+
3283
+echo $basic_machine$os
3284
+exit
3285
+
3286
+# Local variables:
3287
+# eval: (add-hook 'write-file-hooks 'time-stamp)
3288
+# time-stamp-start: "timestamp='"
3289
+# time-stamp-format: "%:y-%02m-%02d"
3290
+# time-stamp-end: "'"
3291
+# End:
3292
--- gnupg2-2.0.14.orig/g10/Makefile.in
3293
+++ gnupg2-2.0.14/g10/Makefile.in
3294
@@ -51,7 +51,6 @@
3238
3295
# along with this program; if not, see <http://www.gnu.org/licenses/>.
3239
3296
3240
3297
VPATH = @srcdir@
3242
3299
pkglibdir = $(libdir)/@PACKAGE@
3243
3300
pkgincludedir = $(includedir)/@PACKAGE@
3244
3301
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
3245
@@ -55,10 +54,10 @@ DIST_COMMON = README $(am__configure_dep
3246
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
3247
$(srcdir)/config.h.in $(top_srcdir)/configure ABOUT-NLS \
3248
AUTHORS COPYING COPYING.LIB ChangeLog INSTALL NEWS THANKS TODO \
3249
- scripts/ChangeLog scripts/compile scripts/config.guess \
3250
- scripts/config.rpath scripts/config.sub scripts/depcomp \
3251
- scripts/install-sh scripts/mdate-sh scripts/missing \
3252
- scripts/mkinstalldirs scripts/texinfo.tex
3253
+ config.guess config.sub scripts/ChangeLog scripts/compile \
3254
+ scripts/config.guess scripts/config.rpath scripts/config.sub \
3255
+ scripts/depcomp scripts/install-sh scripts/mdate-sh \
3256
+ scripts/missing scripts/mkinstalldirs scripts/texinfo.tex
3257
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
3258
am__aclocal_m4_deps = $(top_srcdir)/gl/m4/absolute-header.m4 \
3259
$(top_srcdir)/gl/m4/alloca.m4 $(top_srcdir)/gl/m4/allocsa.m4 \
3260
@@ -124,6 +123,7 @@ GZIP_ENV = --best
3261
DIST_ARCHIVES = $(distdir).tar.bz2
3262
distuninstallcheck_listfiles = find . -type f -print
3263
distcleancheck_listfiles = find . -type f -print
3264
+pkgdatadir = @pkgdatadir@
3265
ABSOLUTE_STDINT_H = @ABSOLUTE_STDINT_H@
3266
ACLOCAL = @ACLOCAL@
3267
ADNSLIBS = @ADNSLIBS@
3268
--- /dev/null
3269
+++ gnupg2-2.0.14/version
3270
@@ -0,0 +1 @@
3271
+2.0.14-1
3272
--- gnupg2-2.0.14.orig/configure
3273
+++ gnupg2-2.0.14/configure
3274
@@ -746,6 +746,7 @@ GNUPG_PINENTRY_PGM
3275
GNUPG_AGENT_PGM_FALSE
3276
GNUPG_AGENT_PGM_TRUE
3277
GNUPG_AGENT_PGM
3278
+pkgdatadir
3279
PACKAGE_GT
3280
EGREP
3281
GREP
3282
@@ -4803,6 +4804,9 @@ fi
3283
3284
3285
3286
+# Override for Debian packaging.
3287
+pkgdatadir="\$(datadir)/gnupg2"
3288
+
3289
3290
cat >>confdefs.h <<_ACEOF
3291
#define PACKAGE "$PACKAGE"
3292
--- gnupg2-2.0.14.orig/m4/Makefile.in
3293
+++ gnupg2-2.0.14/m4/Makefile.in
3294
@@ -14,7 +14,6 @@
3295
3296
@SET_MAKE@
3297
VPATH = @srcdir@
3298
-pkgdatadir = $(datadir)/@PACKAGE@
3299
pkglibdir = $(libdir)/@PACKAGE@
3300
pkgincludedir = $(includedir)/@PACKAGE@
3301
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
3302
@@ -64,6 +63,7 @@ CONFIG_CLEAN_FILES =
3303
SOURCES =
3304
DIST_SOURCES =
3302
@@ -190,6 +189,7 @@ DIST_SOURCES = $(am__gpg2_SOURCES_DIST)
3303
ETAGS = etags
3304
CTAGS = ctags
3305
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
3306
+pkgdatadir = @pkgdatadir@
3307
ABSOLUTE_STDINT_H = @ABSOLUTE_STDINT_H@
3308
ACLOCAL = @ACLOCAL@
3309
ADNSLIBS = @ADNSLIBS@
3310
--- gnupg2-2.0.14.orig/tools/Makefile.in
3311
+++ gnupg2-2.0.14/tools/Makefile.in
3312
@@ -52,7 +52,6 @@
3313
3314
3315
VPATH = @srcdir@
3316
-pkgdatadir = $(datadir)/@PACKAGE@
3317
pkglibdir = $(libdir)/@PACKAGE@
3318
pkgincludedir = $(includedir)/@PACKAGE@
3319
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
3320
@@ -211,6 +210,7 @@ DIST_SOURCES = clean-sat.c $(am__gpg_che
3321
ETAGS = etags
3322
CTAGS = ctags
3323
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
3324
+pkgdatadir = @pkgdatadir@
3325
ABSOLUTE_STDINT_H = @ABSOLUTE_STDINT_H@
3326
ACLOCAL = @ACLOCAL@
3327
ADNSLIBS = @ADNSLIBS@
3328
--- gnupg2-2.0.14.orig/jnlib/Makefile.in
3329
+++ gnupg2-2.0.14/jnlib/Makefile.in
3330
@@ -35,7 +35,6 @@
3331
3332
3333
VPATH = @srcdir@
3334
-pkgdatadir = $(datadir)/@PACKAGE@
3335
pkglibdir = $(libdir)/@PACKAGE@
3336
pkgincludedir = $(includedir)/@PACKAGE@
3337
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
3338
@@ -123,6 +122,7 @@ DIST_SOURCES = $(am__libjnlib_a_SOURCES_
3339
ETAGS = etags
3340
CTAGS = ctags
3305
3341
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
3306
3342
+pkgdatadir = @pkgdatadir@
3307
3343
ABSOLUTE_STDINT_H = @ABSOLUTE_STDINT_H@
3325
3361
ABSOLUTE_STDINT_H = @ABSOLUTE_STDINT_H@
3326
3362
ACLOCAL = @ACLOCAL@
3327
3363
ADNSLIBS = @ADNSLIBS@
3328
--- gnupg2-2.0.14.orig/agent/Makefile.in
3329
+++ gnupg2-2.0.14/agent/Makefile.in
3330
@@ -50,7 +50,6 @@
3331
# along with this program; if not, see <http://www.gnu.org/licenses/>.
3332
3333
VPATH = @srcdir@
3334
-pkgdatadir = $(datadir)/@PACKAGE@
3335
pkglibdir = $(libdir)/@PACKAGE@
3336
pkgincludedir = $(includedir)/@PACKAGE@
3337
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
3338
@@ -171,6 +170,7 @@ DIST_SOURCES = $(gpg_agent_SOURCES) $(gp
3339
ETAGS = etags
3340
CTAGS = ctags
3341
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
3342
+pkgdatadir = @pkgdatadir@
3343
ABSOLUTE_STDINT_H = @ABSOLUTE_STDINT_H@
3344
ACLOCAL = @ACLOCAL@
3345
ADNSLIBS = @ADNSLIBS@
3346
--- gnupg2-2.0.14.orig/include/Makefile.in
3347
+++ gnupg2-2.0.14/include/Makefile.in
3364
--- gnupg2-2.0.14.orig/m4/Makefile.in
3365
+++ gnupg2-2.0.14/m4/Makefile.in
3348
3366
@@ -14,7 +14,6 @@
3349
3367
3350
3368
@SET_MAKE@
3379
3397
ABSOLUTE_STDINT_H = @ABSOLUTE_STDINT_H@
3380
3398
ACLOCAL = @ACLOCAL@
3381
3399
ADNSLIBS = @ADNSLIBS@
3382
--- gnupg2-2.0.14.orig/gl/Makefile.in
3383
+++ gnupg2-2.0.14/gl/Makefile.in
3384
@@ -27,7 +27,6 @@
3385
3386
3387
VPATH = @srcdir@
3388
-pkgdatadir = $(datadir)/@PACKAGE@
3389
pkglibdir = $(libdir)/@PACKAGE@
3390
pkgincludedir = $(includedir)/@PACKAGE@
3391
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
3392
@@ -94,6 +93,7 @@ HEADERS = $(noinst_HEADERS)
3400
--- gnupg2-2.0.14.orig/keyserver/Makefile.in
3401
+++ gnupg2-2.0.14/keyserver/Makefile.in
3402
@@ -53,7 +53,6 @@
3403
3404
3405
VPATH = @srcdir@
3406
-pkgdatadir = $(datadir)/@PACKAGE@
3407
pkglibdir = $(libdir)/@PACKAGE@
3408
pkgincludedir = $(includedir)/@PACKAGE@
3409
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
3410
@@ -193,6 +192,7 @@ DIST_SOURCES = $(am__gpg2keys_curl_SOURC
3411
ETAGS = etags
3412
CTAGS = ctags
3413
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
3414
+pkgdatadir = @pkgdatadir@
3415
ABSOLUTE_STDINT_H = @ABSOLUTE_STDINT_H@
3416
ACLOCAL = @ACLOCAL@
3417
ADNSLIBS = @ADNSLIBS@
3418
--- gnupg2-2.0.14.orig/sm/Makefile.in
3419
+++ gnupg2-2.0.14/sm/Makefile.in
3420
@@ -50,7 +50,6 @@
3421
# along with this program; if not, see <http://www.gnu.org/licenses/>.
3422
3423
VPATH = @srcdir@
3424
-pkgdatadir = $(datadir)/@PACKAGE@
3425
pkglibdir = $(libdir)/@PACKAGE@
3426
pkgincludedir = $(includedir)/@PACKAGE@
3427
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
3428
@@ -144,6 +143,7 @@ DIST_SOURCES = $(gpgsm_SOURCES)
3393
3429
ETAGS = etags
3394
3430
CTAGS = ctags
3395
3431
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
3451
3487
ABSOLUTE_STDINT_H = @ABSOLUTE_STDINT_H@
3452
3488
ACLOCAL = @ACLOCAL@
3453
3489
ADNSLIBS = @ADNSLIBS@
3490
--- gnupg2-2.0.14.orig/gl/Makefile.in
3491
+++ gnupg2-2.0.14/gl/Makefile.in
3492
@@ -27,7 +27,6 @@
3493
3494
3495
VPATH = @srcdir@
3496
-pkgdatadir = $(datadir)/@PACKAGE@
3497
pkglibdir = $(libdir)/@PACKAGE@
3498
pkgincludedir = $(includedir)/@PACKAGE@
3499
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
3500
@@ -94,6 +93,7 @@ HEADERS = $(noinst_HEADERS)
3501
ETAGS = etags
3502
CTAGS = ctags
3503
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
3504
+pkgdatadir = @pkgdatadir@
3505
ABSOLUTE_STDINT_H = @ABSOLUTE_STDINT_H@
3506
ACLOCAL = @ACLOCAL@
3507
ADNSLIBS = @ADNSLIBS@
3508
--- gnupg2-2.0.14.orig/include/Makefile.in
3509
+++ gnupg2-2.0.14/include/Makefile.in
3510
@@ -14,7 +14,6 @@
3511
3512
@SET_MAKE@
3513
VPATH = @srcdir@
3514
-pkgdatadir = $(datadir)/@PACKAGE@
3515
pkglibdir = $(libdir)/@PACKAGE@
3516
pkgincludedir = $(includedir)/@PACKAGE@
3517
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
3518
@@ -64,6 +63,7 @@ CONFIG_CLEAN_FILES =
3519
SOURCES =
3520
DIST_SOURCES =
3521
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
3522
+pkgdatadir = @pkgdatadir@
3523
ABSOLUTE_STDINT_H = @ABSOLUTE_STDINT_H@
3524
ACLOCAL = @ACLOCAL@
3525
ADNSLIBS = @ADNSLIBS@
3454
3526
--- gnupg2-2.0.14.orig/doc/gnupg.texi
3455
3527
+++ gnupg2-2.0.14/doc/gnupg.texi
3456
3528
@@ -1,6 +1,6 @@
3523
3595
3524
3596
maintainer-clean-aminfo:
3525
3597
@list='$(INFO_DEPS)'; for i in $$list; do \
3526
--- gnupg2-2.0.14.orig/tools/Makefile.in
3527
+++ gnupg2-2.0.14/tools/Makefile.in
3528
@@ -52,7 +52,6 @@
3529
3530
3531
VPATH = @srcdir@
3532
-pkgdatadir = $(datadir)/@PACKAGE@
3533
pkglibdir = $(libdir)/@PACKAGE@
3534
pkgincludedir = $(includedir)/@PACKAGE@
3535
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
3536
@@ -211,6 +210,7 @@ DIST_SOURCES = clean-sat.c $(am__gpg_che
3537
ETAGS = etags
3538
CTAGS = ctags
3539
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
3540
+pkgdatadir = @pkgdatadir@
3541
ABSOLUTE_STDINT_H = @ABSOLUTE_STDINT_H@
3542
ACLOCAL = @ACLOCAL@
3543
ADNSLIBS = @ADNSLIBS@
3544
--- gnupg2-2.0.14.orig/g10/Makefile.in
3545
+++ gnupg2-2.0.14/g10/Makefile.in
3546
@@ -51,7 +51,6 @@
3547
# along with this program; if not, see <http://www.gnu.org/licenses/>.
3548
3549
VPATH = @srcdir@
3550
-pkgdatadir = $(datadir)/@PACKAGE@
3551
pkglibdir = $(libdir)/@PACKAGE@
3552
pkgincludedir = $(includedir)/@PACKAGE@
3553
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
3554
@@ -190,6 +189,7 @@ DIST_SOURCES = $(am__gpg2_SOURCES_DIST)
3555
ETAGS = etags
3556
CTAGS = ctags
3557
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
3558
+pkgdatadir = @pkgdatadir@
3559
ABSOLUTE_STDINT_H = @ABSOLUTE_STDINT_H@
3560
ACLOCAL = @ACLOCAL@
3561
ADNSLIBS = @ADNSLIBS@
3562
--- gnupg2-2.0.14.orig/keyserver/Makefile.in
3563
+++ gnupg2-2.0.14/keyserver/Makefile.in
3564
@@ -53,7 +53,6 @@
3565
3566
3567
VPATH = @srcdir@
3568
-pkgdatadir = $(datadir)/@PACKAGE@
3569
pkglibdir = $(libdir)/@PACKAGE@
3570
pkgincludedir = $(includedir)/@PACKAGE@
3571
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
3572
@@ -193,6 +192,7 @@ DIST_SOURCES = $(am__gpg2keys_curl_SOURC
3573
ETAGS = etags
3574
CTAGS = ctags
3575
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
3576
+pkgdatadir = @pkgdatadir@
3577
ABSOLUTE_STDINT_H = @ABSOLUTE_STDINT_H@
3578
ACLOCAL = @ACLOCAL@
3579
ADNSLIBS = @ADNSLIBS@
3580
--- gnupg2-2.0.14.orig/jnlib/Makefile.in
3581
+++ gnupg2-2.0.14/jnlib/Makefile.in
3582
@@ -35,7 +35,6 @@
3583
3584
3585
VPATH = @srcdir@
3586
-pkgdatadir = $(datadir)/@PACKAGE@
3587
pkglibdir = $(libdir)/@PACKAGE@
3588
pkgincludedir = $(includedir)/@PACKAGE@
3589
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
3590
@@ -123,6 +122,7 @@ DIST_SOURCES = $(am__libjnlib_a_SOURCES_
3591
ETAGS = etags
3592
CTAGS = ctags
3593
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
3594
+pkgdatadir = @pkgdatadir@
3595
ABSOLUTE_STDINT_H = @ABSOLUTE_STDINT_H@
3596
ACLOCAL = @ACLOCAL@
3597
ADNSLIBS = @ADNSLIBS@
3598
--- gnupg2-2.0.14.orig/sm/Makefile.in
3599
+++ gnupg2-2.0.14/sm/Makefile.in
3598
--- gnupg2-2.0.14.orig/agent/Makefile.in
3599
+++ gnupg2-2.0.14/agent/Makefile.in
3600
3600
@@ -50,7 +50,6 @@
3601
3601
# along with this program; if not, see <http://www.gnu.org/licenses/>.
3602
3602
3605
3605
pkglibdir = $(libdir)/@PACKAGE@
3606
3606
pkgincludedir = $(includedir)/@PACKAGE@
3607
3607
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
3608
@@ -144,6 +143,7 @@ DIST_SOURCES = $(gpgsm_SOURCES)
3608
@@ -171,6 +170,7 @@ DIST_SOURCES = $(gpg_agent_SOURCES) $(gp
3609
3609
ETAGS = etags
3610
3610
CTAGS = ctags
3611
3611
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
Loggerhead is a web-based interface for Breezy
Version: 2.0.1