~javier-lopez/ubuntu/precise/cdo/sru-1023329 : revision 9

1

Description: Upstream changes introduced in version 1.4.4.dfsg.1-2

2

This patch has been created by dpkg-source during the package build.

3

Here's the last changelog entry, hopefully it gives details on why

4

those changes were made:

5

.

6

cdo (1.4.4.dfsg.1-2) unstable; urgency=low

7

.

8

* Make build-dep on grib-api conditional so that we build on sparc, hppa

9

and mips, where grib-api doesn't. Closes: #581801.

10

.

11

The person named in the Author field signed this changelog entry.

12

Author: Alastair McKinstry <mckinstry@debian.org>

13

Bug-Debian: http://bugs.debian.org/581801

14

15

---

16

The information above should follow the Patch Tagging Guidelines, please

17

checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here

18

are templates for supplementary fields that you might want to add:

19

20

Origin: <vendor|upstream|other>, <url of original patch>

21

Bug: <url in upstream bugtracker>

22

Bug-Debian: http://bugs.debian.org/<bugnumber>

23

Forwarded: <no|not-needed|url proving that it has been forwarded>

24

Reviewed-By: <name and email of someone who approved the patch>

25

Last-Update: <YYYY-MM-DD>

26

27

--- cdo-1.4.4.dfsg.1.orig/config/config.guess

28

+++ cdo-1.4.4.dfsg.1/config/config.guess

29

@@ -1,10 +1,10 @@

30

#! /bin/sh

31

# Attempt to guess a canonical system name.

32

33

-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,

34

-# Inc.

35

+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010

36

+# Free Software Foundation, Inc.

37

38

-timestamp='2006-07-02'

39

+timestamp='2009-12-30'

40

41

# This file is free software; you can redistribute it and/or modify it

42

# under the terms of the GNU General Public License as published by

43

@@ -27,16 +27,16 @@ timestamp='2006-07-02'

44

# the same distribution terms that you use for the rest of that program.

45

46

47

-# Originally written by Per Bothner <per@bothner.com>.

48

-# Please send patches to <config-patches@gnu.org>. Submit a context

49

-# diff and a properly formatted ChangeLog entry.

50

+# Originally written by Per Bothner. Please send patches (context

51

+# diff format) to <config-patches@gnu.org> and include a ChangeLog

52

+# entry.

53

#

54

# This script attempts to guess a canonical system name similar to

55

# config.sub. If it succeeds, it prints the system name on stdout, and

56

# exits with 0. Otherwise, it exits with 1.

57

#

58

-# The plan is that this can be called by configure scripts if you

59

-# don't specify an explicit build system type.

60

+# You can get the latest version of this script from:

61

+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD

62

63

me=`echo "$0" | sed -e 's,.*/,,'`

64

65

@@ -56,8 +56,9 @@ version="\

66

GNU config.guess ($timestamp)

67

68

Originally written by Per Bothner.

69

70

-Free Software Foundation, Inc.

71

72

+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free

73

+Software Foundation, Inc.

74

75

This is free software; see the source for copying conditions. There is NO

76

warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."

77

@@ -161,6 +162,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$

78

arm*) machine=arm-unknown ;;

79

sh3el) machine=shl-unknown ;;

80

sh3eb) machine=sh-unknown ;;

81

+ sh5el) machine=sh5le-unknown ;;

82

*) machine=${UNAME_MACHINE_ARCH}-unknown ;;

83

esac

84

# The Operating System including object format, if it has switched

85

@@ -169,7 +171,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$

86

arm*|i386|m68k|ns32k|sh3*|sparc|vax)

87

eval $set_cc_for_build

88

if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \

89

- | grep __ELF__ >/dev/null

90

+ | grep -q __ELF__

91

then

92

# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).

93

# Return netbsd for either. FIX?

94

@@ -323,14 +325,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$

95

case `/usr/bin/uname -p` in

96

sparc) echo sparc-icl-nx7; exit ;;

97

esac ;;

98

+ s390x:SunOS:*:*)

99

+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`

100

+ exit ;;

101

sun4H:SunOS:5.*:*)

102

echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`

103

exit ;;

104

sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)

105

echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`

106

exit ;;

107

- i86pc:SunOS:5.*:*)

108

- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`

109

+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)

110

+ echo i386-pc-auroraux${UNAME_RELEASE}

111

+ exit ;;

112

+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)

113

+ eval $set_cc_for_build

114

+ SUN_ARCH="i386"

115

+ # If there is a compiler, see if it is configured for 64-bit objects.

116

+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.

117

+ # This test works for both compilers.

118

+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then

119

+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \

120

+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \

121

+ grep IS_64BIT_ARCH >/dev/null

122

+ then

123

+ SUN_ARCH="x86_64"

124

+ fi

125

+ fi

126

+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`

127

exit ;;

128

sun4*:SunOS:6*:*)

129

# According to config.sub, this is the proper way to canonicalize

130

@@ -531,7 +552,7 @@ EOF

131

echo rs6000-ibm-aix3.2

132

fi

133

exit ;;

134

- *:AIX:*:[45])

135

+ *:AIX:*:[456])

136

IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`

137

if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then

138

IBM_ARCH=rs6000

139

@@ -639,7 +660,7 @@ EOF

140

# => hppa64-hp-hpux11.23

141

142

if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |

143

- grep __LP64__ >/dev/null

144

+ grep -q __LP64__

145

then

146

HP_ARCH="hppa2.0w"

147

else

148

@@ -780,7 +801,7 @@ EOF

149

i*:CYGWIN*:*)

150

echo ${UNAME_MACHINE}-pc-cygwin

151

exit ;;

152

- i*:MINGW*:*)

153

+ *:MINGW*:*)

154

echo ${UNAME_MACHINE}-pc-mingw32

155

exit ;;

156

i*:windows32*:*)

157

@@ -790,15 +811,24 @@ EOF

158

i*:PW*:*)

159

echo ${UNAME_MACHINE}-pc-pw32

160

exit ;;

161

- x86:Interix*:[3456]*)

162

- echo i586-pc-interix${UNAME_RELEASE}

163

- exit ;;

164

- EM64T:Interix*:[3456]*)

165

- echo x86_64-unknown-interix${UNAME_RELEASE}

166

- exit ;;

167

+ *:Interix*:*)

168

+ case ${UNAME_MACHINE} in

169

+ x86)

170

+ echo i586-pc-interix${UNAME_RELEASE}

171

+ exit ;;

172

+ authenticamd | genuineintel | EM64T)

173

+ echo x86_64-unknown-interix${UNAME_RELEASE}

174

+ exit ;;

175

+ IA64)

176

+ echo ia64-unknown-interix${UNAME_RELEASE}

177

+ exit ;;

178

+ esac ;;

179

[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)

180

echo i${UNAME_MACHINE}-pc-mks

181

exit ;;

182

+ 8664:Windows_NT:*)

183

+ echo x86_64-pc-mks

184

+ exit ;;

185

i*:Windows_NT*:* | Pentium*:Windows_NT*:*)

186

# How do we know it's Interix rather than the generic POSIX subsystem?

187

# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we

188

@@ -828,8 +858,29 @@ EOF

189

i*86:Minix:*:*)

190

echo ${UNAME_MACHINE}-pc-minix

191

exit ;;

192

+ alpha:Linux:*:*)

193

+ case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in

194

+ EV5) UNAME_MACHINE=alphaev5 ;;

195

+ EV56) UNAME_MACHINE=alphaev56 ;;

196

+ PCA56) UNAME_MACHINE=alphapca56 ;;

197

+ PCA57) UNAME_MACHINE=alphapca56 ;;

198

+ EV6) UNAME_MACHINE=alphaev6 ;;

199

+ EV67) UNAME_MACHINE=alphaev67 ;;

200

+ EV68*) UNAME_MACHINE=alphaev68 ;;

201

+ esac

202

+ objdump --private-headers /bin/sh | grep -q ld.so.1

203

+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi

204

+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}

205

+ exit ;;

206

arm*:Linux:*:*)

207

- echo ${UNAME_MACHINE}-unknown-linux-gnu

208

+ eval $set_cc_for_build

209

+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \

210

+ | grep -q __ARM_EABI__

211

+ then

212

+ echo ${UNAME_MACHINE}-unknown-linux-gnu

213

+ else

214

+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi

215

+ fi

216

exit ;;

217

avr32*:Linux:*:*)

218

echo ${UNAME_MACHINE}-unknown-linux-gnu

219

@@ -843,6 +894,17 @@ EOF

220

frv:Linux:*:*)

221

echo frv-unknown-linux-gnu

222

exit ;;

223

+ i*86:Linux:*:*)

224

+ LIBC=gnu

225

+ eval $set_cc_for_build

226

+ sed 's/^ //' << EOF >$dummy.c

227

+ #ifdef __dietlibc__

228

+ LIBC=dietlibc

229

+ #endif

230

+EOF

231

+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`

232

+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"

233

+ exit ;;

234

ia64:Linux:*:*)

235

echo ${UNAME_MACHINE}-unknown-linux-gnu

236

exit ;;

237

@@ -852,74 +914,33 @@ EOF

238

m68*:Linux:*:*)

239

echo ${UNAME_MACHINE}-unknown-linux-gnu

240

exit ;;

241

- mips:Linux:*:*)

242

- eval $set_cc_for_build

243

- sed 's/^ //' << EOF >$dummy.c

244

- #undef CPU

245

- #undef mips

246

- #undef mipsel

247

- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)

248

- CPU=mipsel

249

- #else

250

- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)

251

- CPU=mips

252

- #else

253

- CPU=

254

- #endif

255

- #endif

256

-EOF

257

- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '

258

- /^CPU/{

259

- s: ::g

260

- p

261

- }'`"

262

- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }

263

- ;;

264

- mips64:Linux:*:*)

265

+ mips:Linux:*:* | mips64:Linux:*:*)

266

eval $set_cc_for_build

267

sed 's/^ //' << EOF >$dummy.c

268

#undef CPU

269

- #undef mips64

270

- #undef mips64el

271

+ #undef ${UNAME_MACHINE}

272

+ #undef ${UNAME_MACHINE}el

273

#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)

274

- CPU=mips64el

275

+ CPU=${UNAME_MACHINE}el

276

#else

277

#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)

278

- CPU=mips64

279

+ CPU=${UNAME_MACHINE}

280

#else

281

CPU=

282

#endif

283

#endif

284

EOF

285

- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '

286

- /^CPU/{

287

- s: ::g

288

- p

289

- }'`"

290

+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`

291

test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }

292

;;

293

or32:Linux:*:*)

294

echo or32-unknown-linux-gnu

295

exit ;;

296

- ppc:Linux:*:*)

297

- echo powerpc-unknown-linux-gnu

298

+ padre:Linux:*:*)

299

+ echo sparc-unknown-linux-gnu

300

exit ;;

301

- ppc64:Linux:*:*)

302

- echo powerpc64-unknown-linux-gnu

303

- exit ;;

304

- alpha:Linux:*:*)

305

- case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in

306

- EV5) UNAME_MACHINE=alphaev5 ;;

307

- EV56) UNAME_MACHINE=alphaev56 ;;

308

- PCA56) UNAME_MACHINE=alphapca56 ;;

309

- PCA57) UNAME_MACHINE=alphapca56 ;;

310

- EV6) UNAME_MACHINE=alphaev6 ;;

311

- EV67) UNAME_MACHINE=alphaev67 ;;

312

- EV68*) UNAME_MACHINE=alphaev68 ;;

313

- esac

314

- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null

315

- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi

316

- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}

317

+ parisc64:Linux:*:* | hppa64:Linux:*:*)

318

+ echo hppa64-unknown-linux-gnu

319

exit ;;

320

parisc:Linux:*:* | hppa:Linux:*:*)

321

# Look for CPU level

322

@@ -929,8 +950,11 @@ EOF

323

*) echo hppa-unknown-linux-gnu ;;

324

esac

325

exit ;;

326

- parisc64:Linux:*:* | hppa64:Linux:*:*)

327

- echo hppa64-unknown-linux-gnu

328

+ ppc64:Linux:*:*)

329

+ echo powerpc64-unknown-linux-gnu

330

+ exit ;;

331

+ ppc:Linux:*:*)

332

+ echo powerpc-unknown-linux-gnu

333

exit ;;

334

s390:Linux:*:* | s390x:Linux:*:*)

335

echo ${UNAME_MACHINE}-ibm-linux

336

@@ -950,69 +974,9 @@ EOF

337

x86_64:Linux:*:*)

338

echo x86_64-unknown-linux-gnu

339

exit ;;

340

- i*86:Linux:*:*)

341

- # The BFD linker knows what the default object file format is, so

342

- # first see if it will tell us. cd to the root directory to prevent

343

- # problems with other programs or directories called `ld' in the path.

344

- # Set LC_ALL=C to ensure ld outputs messages in English.

345

- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \

346

- | sed -ne '/supported targets:/!d

347

- s/[ ][ ]*/ /g

348

- s/.*supported targets: *//

349

- s/ .*//

350

- p'`

351

- case "$ld_supported_targets" in

352

- elf32-i386)

353

- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"

354

- ;;

355

- a.out-i386-linux)

356

- echo "${UNAME_MACHINE}-pc-linux-gnuaout"

357

- exit ;;

358

- coff-i386)

359

- echo "${UNAME_MACHINE}-pc-linux-gnucoff"

360

- exit ;;

361

- "")

362

- # Either a pre-BFD a.out linker (linux-gnuoldld) or

363

- # one that does not give us useful --help.

364

- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"

365

- exit ;;

366

- esac

367

- # Determine whether the default compiler is a.out or elf

368

- eval $set_cc_for_build

369

- sed 's/^ //' << EOF >$dummy.c

370

- #include <features.h>

371

- #ifdef __ELF__

372

- # ifdef __GLIBC__

373

- # if __GLIBC__ >= 2

374

- LIBC=gnu

375

- # else

376

- LIBC=gnulibc1

377

- # endif

378

- # else

379

- LIBC=gnulibc1

380

- # endif

381

- #else

382

- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)

383

- LIBC=gnu

384

- #else

385

- LIBC=gnuaout

386

- #endif

387

- #endif

388

- #ifdef __dietlibc__

389

- LIBC=dietlibc

390

- #endif

391

-EOF

392

- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '

393

- /^LIBC/{

394

- s: ::g

395

- p

396

- }'`"

397

- test x"${LIBC}" != x && {

398

- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"

399

- exit

400

- }

401

- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }

402

- ;;

403

+ xtensa*:Linux:*:*)

404

+ echo ${UNAME_MACHINE}-unknown-linux-gnu

405

+ exit ;;

406

i*86:DYNIX/ptx:4*:*)

407

# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.

408

# earlier versions are messed up and put the nodename in both

409

@@ -1041,7 +1005,7 @@ EOF

410

i*86:syllable:*:*)

411

echo ${UNAME_MACHINE}-pc-syllable

412

exit ;;

413

- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)

414

+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)

415

echo i386-unknown-lynxos${UNAME_RELEASE}

416

exit ;;

417

i*86:*DOS:*:*)

418

@@ -1085,8 +1049,11 @@ EOF

419

pc:*:*:*)

420

# Left here for compatibility:

421

# uname -m prints for DJGPP always 'pc', but it prints nothing about

422

- # the processor, so we play safe by assuming i386.

423

- echo i386-pc-msdosdjgpp

424

+ # the processor, so we play safe by assuming i586.

425

+ # Note: whatever this is, it MUST be the same as what config.sub

426

+ # prints for the "djgpp" host, or else GDB configury will decide that

427

+ # this is a cross-build.

428

+ echo i586-pc-msdosdjgpp

429

exit ;;

430

Intel:Mach:3*:*)

431

echo i386-pc-mach3

432

@@ -1124,6 +1091,16 @@ EOF

433

3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)

434

/bin/uname -p 2>/dev/null | grep 86 >/dev/null \

435

&& { echo i486-ncr-sysv4; exit; } ;;

436

+ NCR*:*:4.2:* | MPRAS*:*:4.2:*)

437

+ OS_REL='.3'

438

+ test -r /etc/.relid \

439

+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`

440

+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \

441

+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }

442

+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \

443

+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; }

444

+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \

445

+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;

446

m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)

447

echo m68k-unknown-lynxos${UNAME_RELEASE}

448

exit ;;

449

@@ -1136,7 +1113,7 @@ EOF

450

rs6000:LynxOS:2.*:*)

451

echo rs6000-unknown-lynxos${UNAME_RELEASE}

452

exit ;;

453

- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)

454

+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)

455

echo powerpc-unknown-lynxos${UNAME_RELEASE}

456

exit ;;

457

SM[BE]S:UNIX_SV:*:*)

458

@@ -1199,6 +1176,9 @@ EOF

459

BePC:BeOS:*:*) # BeOS running on Intel PC compatible.

460

echo i586-pc-beos

461

exit ;;

462

+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible.

463

+ echo i586-pc-haiku

464

+ exit ;;

465

SX-4:SUPER-UX:*:*)

466

echo sx4-nec-superux${UNAME_RELEASE}

467

exit ;;

468

@@ -1208,6 +1188,15 @@ EOF

469

SX-6:SUPER-UX:*:*)

470

echo sx6-nec-superux${UNAME_RELEASE}

471

exit ;;

472

+ SX-7:SUPER-UX:*:*)

473

+ echo sx7-nec-superux${UNAME_RELEASE}

474

+ exit ;;

475

+ SX-8:SUPER-UX:*:*)

476

+ echo sx8-nec-superux${UNAME_RELEASE}

477

+ exit ;;

478

+ SX-8R:SUPER-UX:*:*)

479

+ echo sx8r-nec-superux${UNAME_RELEASE}

480

+ exit ;;

481

Power*:Rhapsody:*:*)

482

echo powerpc-apple-rhapsody${UNAME_RELEASE}

483

exit ;;

484

@@ -1217,6 +1206,16 @@ EOF

485

*:Darwin:*:*)

486

UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown

487

case $UNAME_PROCESSOR in

488

+ i386)

489

+ eval $set_cc_for_build

490

+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then

491

+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \

492

+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \

493

+ grep IS_64BIT_ARCH >/dev/null

494

+ then

495

+ UNAME_PROCESSOR="x86_64"

496

+ fi

497

+ fi ;;

498

unknown) UNAME_PROCESSOR=powerpc ;;

499

esac

500

echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}

501

@@ -1298,6 +1297,9 @@ EOF

502

i*86:rdos:*:*)

503

echo ${UNAME_MACHINE}-pc-rdos

504

exit ;;

505

+ i*86:AROS:*:*)

506

+ echo ${UNAME_MACHINE}-pc-aros

507

+ exit ;;

508

esac

509

510

#echo '(No uname command or uname output not recognized.)' 1>&2

511

@@ -1458,9 +1460,9 @@ This script, last modified $timestamp, h

512

the operating system you are using. It is advised that you

513

download the most up to date version of the config scripts from

514

515

- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess

516

+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD

517

and

518

- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub

519

+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD

520

521

If the version you run ($0) is already up to date, please

522

send the following data and any information you think might be

523

--- cdo-1.4.4.dfsg.1.orig/config/mkinstalldirs

524

+++ cdo-1.4.4.dfsg.1/config/mkinstalldirs

525

@@ -1,7 +1,7 @@

526

#! /bin/sh

527

# mkinstalldirs --- make directory hierarchy

528

529

-scriptversion=2006-05-11.19

530

+scriptversion=2009-04-28.21; # UTC

531

532

# Original author: Noah Friedman <friedman@prep.ai.mit.edu>

533

# Created: 1993-05-16

534

@@ -157,5 +157,6 @@ exit $errstatus

535

# eval: (add-hook 'write-file-hooks 'time-stamp)

536

# time-stamp-start: "scriptversion="

537

# time-stamp-format: "%:y-%02m-%02d.%02H"

538

-# time-stamp-end: "$"

539

+# time-stamp-time-zone: "UTC"

540

+# time-stamp-end: "; # UTC"

541

# End:

542

--- cdo-1.4.4.dfsg.1.orig/config/config.sub

543

+++ cdo-1.4.4.dfsg.1/config/config.sub

544

@@ -1,10 +1,10 @@

545

#! /bin/sh

546

# Configuration validation subroutine script.

547

548

-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,

549

-# Inc.

550

+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010

551

+# Free Software Foundation, Inc.

552

553

-timestamp='2006-09-20'

554

+timestamp='2010-01-22'

555

556

# This file is (in principle) common to ALL GNU software.

557

# The presence of a machine in this file suggests that SOME GNU software

558

@@ -32,13 +32,16 @@ timestamp='2006-09-20'

559

560

561

# Please send patches to <config-patches@gnu.org>. Submit a context

562

-# diff and a properly formatted ChangeLog entry.

563

+# diff and a properly formatted GNU ChangeLog entry.

564

#

565

# Configuration subroutine to validate and canonicalize a configuration type.

566

# Supply the specified configuration type as an argument.

567

# If it is invalid, we print an error message on stderr and exit with code 1.

568

# Otherwise, we print the canonical config type on stdout and succeed.

569

570

+# You can get the latest version of this script from:

571

+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD

572

+

573

# This file is supposed to be the same for all GNU packages

574

# and recognize all the CPU types, system types and aliases

575

# that are meaningful with *any* GNU software.

576

@@ -72,8 +75,9 @@ Report bugs and patches to <config-patch

577

version="\

578

GNU config.sub ($timestamp)

579

580

581

-Free Software Foundation, Inc.

582

583

+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free

584

+Software Foundation, Inc.

585

586

This is free software; see the source for copying conditions. There is NO

587

warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."

588

@@ -122,6 +126,7 @@ maybe_os=`echo $1 | sed 's/^$.*$-\([^-

589

case $maybe_os in

590

591

592

+ kopensolaris*-gnu* | \

593

storm-chaos* | os2-emx* | rtmk-nova*)

594

os=-$maybe_os

595

basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'`

596

@@ -148,10 +153,13 @@ case $os in

597

-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\

598

-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \

599

600

- -apple | -axis | -knuth | -cray)

601

+ -apple | -axis | -knuth | -cray | -microblaze)

602

os=

603

basic_machine=$1

604

;;

605

+ -bluegene*)

606

+ os=-cnk

607

+ ;;

608

-sim | -cisco | -oki | -wec | -winbond)

609

os=

610

basic_machine=$1

611

@@ -245,17 +253,20 @@ case $basic_machine in

612

| bfin \

613

| c4x | clipper \

614

| d10v | d30v | dlx | dsp16xx \

615

- | fr30 | frv \

616

+ | fido | fr30 | frv \

617

618

| i370 | i860 | i960 | ia64 \

619

| ip2k | iq2000 \

620

+ | lm32 \

621

| m32c | m32r | m32rle | m68000 | m68k | m88k \

622

- | maxq | mb | microblaze | mcore \

623

+ | maxq | mb | microblaze | mcore | mep | metag \

624

625

| mips16 \

626

| mips64 | mips64el \

627

- | mips64vr | mips64vrel \

628

+ | mips64octeon | mips64octeonel \

629

| mips64orion | mips64orionel \

630

+ | mips64r5900 | mips64r5900el \

631

+ | mips64vr | mips64vrel \

632

| mips64vr4100 | mips64vr4100el \

633

| mips64vr4300 | mips64vr4300el \

634

| mips64vr5000 | mips64vr5000el \

635

@@ -268,6 +279,7 @@ case $basic_machine in

636

| mipsisa64sr71k | mipsisa64sr71kel \

637

| mipstx39 | mipstx39el \

638

| mn10200 | mn10300 \

639

+ | moxie \

640

| mt \

641

| msp430 \

642

| nios | nios2 \

643

@@ -276,20 +288,22 @@ case $basic_machine in

644

| pdp10 | pdp11 | pj | pjl \

645

646

| pyramid \

647

+ | rx \

648

| score \

649

- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \

650

+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \

651

| sh64 | sh64le \

652

653

| sparcv8 | sparcv9 | sparcv9b | sparcv9v \

654

| spu | strongarm \

655

656

+ | ubicom32 \

657

| v850 | v850e \

658

| we32k \

659

660

- | z8k)

661

+ | z8k | z80)

662

basic_machine=$basic_machine-unknown

663

;;

664

- m6811 | m68hc11 | m6812 | m68hc12)

665

+ m6811 | m68hc11 | m6812 | m68hc12 | picochip)

666

# Motorola 68HC11/12.

667

basic_machine=$basic_machine-unknown

668

os=-none

669

@@ -324,19 +338,22 @@ case $basic_machine in

670

| clipper-* | craynv-* | cydra-* \

671

| d10v-* | d30v-* | dlx-* \

672

| elxsi-* \

673

- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \

674

+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \

675

| h8300-* | h8500-* \

676

677

| i*86-* | i860-* | i960-* | ia64-* \

678

| ip2k-* | iq2000-* \

679

+ | lm32-* \

680

| m32c-* | m32r-* | m32rle-* \

681

| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \

682

- | m88110-* | m88k-* | maxq-* | mcore-* \

683

+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \

684

685

| mips16-* \

686

| mips64-* | mips64el-* \

687

- | mips64vr-* | mips64vrel-* \

688

+ | mips64octeon-* | mips64octeonel-* \

689

| mips64orion-* | mips64orionel-* \

690

+ | mips64r5900-* | mips64r5900el-* \

691

+ | mips64vr-* | mips64vrel-* \

692

| mips64vr4100-* | mips64vr4100el-* \

693

| mips64vr4300-* | mips64vr4300el-* \

694

| mips64vr5000-* | mips64vr5000el-* \

695

@@ -357,21 +374,27 @@ case $basic_machine in

696

| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \

697

698

| pyramid-* \

699

- | romp-* | rs6000-* \

700

- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \

701

+ | romp-* | rs6000-* | rx-* \

702

+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \

703

704

705

| sparclite-* \

706

707

| tahoe-* | thumb-* \

708

709

+ | tile-* | tilegx-* \

710

| tron-* \

711

+ | ubicom32-* \

712

| v850-* | v850e-* | vax-* \

713

| we32k-* \

714

| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \

715

- | xstormy16-* | xtensa-* \

716

+ | xstormy16-* | xtensa*-* \

717

| ymp-* \

718

- | z8k-*)

719

+ | z8k-* | z80-*)

720

+ ;;

721

+ # Recognize the basic CPU types without company name, with glob match.

722

+ xtensa*)

723

+ basic_machine=$basic_machine-unknown

724

;;

725

# Recognize the various machine names and aliases which stand

726

# for a CPU type and a company and sometimes even an OS.

727

@@ -435,6 +458,10 @@ case $basic_machine in

728

basic_machine=m68k-apollo

729

os=-bsd

730

;;

731

+ aros)

732

+ basic_machine=i386-pc

733

+ os=-aros

734

+ ;;

735

aux)

736

basic_machine=m68k-apple

737

os=-aux

738

@@ -443,10 +470,26 @@ case $basic_machine in

739

basic_machine=ns32k-sequent

740

os=-dynix

741

;;

742

+ blackfin)

743

+ basic_machine=bfin-unknown

744

+ os=-linux

745

+ ;;

746

+ blackfin-*)

747

+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`

748

+ os=-linux

749

+ ;;

750

+ bluegene*)

751

+ basic_machine=powerpc-ibm

752

+ os=-cnk

753

+ ;;

754

c90)

755

basic_machine=c90-cray

756

os=-unicos

757

;;

758

+ cegcc)

759

+ basic_machine=arm-unknown

760

+ os=-cegcc

761

+ ;;

762

convex-c1)

763

basic_machine=c1-convex

764

os=-bsd

765

@@ -475,8 +518,8 @@ case $basic_machine in

766

basic_machine=craynv-cray

767

os=-unicosmp

768

;;

769

- cr16c)

770

- basic_machine=cr16c-unknown

771

+ cr16)

772

+ basic_machine=cr16-unknown

773

os=-elf

774

;;

775

crds | unos)

776

@@ -514,6 +557,10 @@ case $basic_machine in

777

basic_machine=m88k-motorola

778

os=-sysv3

779

;;

780

+ dicos)

781

+ basic_machine=i686-pc

782

+ os=-dicos

783

+ ;;

784

djgpp)

785

basic_machine=i586-pc

786

os=-msdosdjgpp

787

@@ -668,6 +715,14 @@ case $basic_machine in

788

basic_machine=m68k-isi

789

os=-sysv

790

;;

791

+ m68knommu)

792

+ basic_machine=m68k-unknown

793

+ os=-linux

794

+ ;;

795

+ m68knommu-*)

796

+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`

797

+ os=-linux

798

+ ;;

799

m88k-omron*)

800

basic_machine=m88k-omron

801

;;

802

@@ -679,10 +734,17 @@ case $basic_machine in

803

basic_machine=ns32k-utek

804

os=-sysv

805

;;

806

+ microblaze)

807

+ basic_machine=microblaze-xilinx

808

+ ;;

809

mingw32)

810

basic_machine=i386-pc

811

os=-mingw32

812

;;

813

+ mingw32ce)

814

+ basic_machine=arm-unknown

815

+ os=-mingw32ce

816

+ ;;

817

miniframe)

818

basic_machine=m68000-convergent

819

;;

820

@@ -809,6 +871,14 @@ case $basic_machine in

821

basic_machine=i860-intel

822

os=-osf

823

;;

824

+ parisc)

825

+ basic_machine=hppa-unknown

826

+ os=-linux

827

+ ;;

828

+ parisc-*)

829

+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`

830

+ os=-linux

831

+ ;;

832

pbd)

833

basic_machine=sparc-tti

834

;;

835

@@ -925,6 +995,9 @@ case $basic_machine in

836

basic_machine=sh-hitachi

837

os=-hms

838

;;

839

+ sh5el)

840

+ basic_machine=sh5le-unknown

841

+ ;;

842

sh64)

843

basic_machine=sh64-unknown

844

;;

845

@@ -994,18 +1067,6 @@ case $basic_machine in

846

basic_machine=i386-sequent

847

os=-dynix

848

;;

849

- sx4 | sx4-nec)

850

- basic_machine=sx4-nec

851

- os=-superux

852

- ;;

853

- sx5 | sx5-nec)

854

- basic_machine=sx5-nec

855

- os=-superux

856

- ;;

857

- sx6 | sx6-nec)

858

- basic_machine=sx6-nec

859

- os=-superux

860

- ;;

861

t3e)

862

basic_machine=alphaev5-cray

863

os=-unicos

864

@@ -1026,6 +1087,15 @@ case $basic_machine in

865

basic_machine=tic6x-unknown

866

os=-coff

867

;;

868

+ # This must be matched before tile*.

869

+ tilegx*)

870

+ basic_machine=tilegx-unknown

871

+ os=-linux-gnu

872

+ ;;

873

+ tile*)

874

+ basic_machine=tile-unknown

875

+ os=-linux-gnu

876

+ ;;

877

tx39)

878

basic_machine=mipstx39-unknown

879

;;

880

@@ -1101,6 +1171,10 @@ case $basic_machine in

881

basic_machine=z8k-unknown

882

os=-sim

883

;;

884

+ z80-*-coff)

885

+ basic_machine=z80-unknown

886

+ os=-sim

887

+ ;;

888

none)

889

basic_machine=none-none

890

os=-none

891

@@ -1139,7 +1213,7 @@ case $basic_machine in

892

we32k)

893

basic_machine=we32k-att

894

;;

895

- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)

896

897

basic_machine=sh-unknown

898

;;

899

sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)

900

@@ -1189,6 +1263,9 @@ case $os in

901

# First match some system type aliases

902

# that might get confused with valid system types.

903

# -solaris* is a basic system type, with this one exception.

904

+ -auroraux)

905

+ os=-auroraux

906

+ ;;

907

-solaris1 | -solaris1.*)

908

os=`echo $os | sed -e 's|solaris1|sunos4|'`

909

;;

910

@@ -1209,10 +1286,11 @@ case $os in

911

# Each alternative MUST END IN A *, to match a version number.

912

# -sysv* is not here because it comes later, after sysvr4.

913

914

- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\

915

916

+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\

917

918

+ | -sym* | -kopensolaris* \

919

920

- | -aos* \

921

+ | -aos* | -aros* \

922

923

924

925

@@ -1221,7 +1299,7 @@ case $os in

926

927

928

| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \

929

- | -chorusos* | -chorusrdb* \

930

+ | -chorusos* | -chorusrdb* | -cegcc* \

931

932

| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \

933

| -uxpv* | -beos* | -mpeix* | -udk* \

934

@@ -1231,7 +1309,7 @@ case $os in

935

936

937

| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \

938

- | -skyos* | -haiku* | -rdos* | -toppers*)

939

940

# Remember, each alternative MUST END IN *, to match a version number.

941

;;

942

-qnx*)

943

@@ -1361,6 +1439,11 @@ case $os in

944

-zvmoe)

945

os=-zvmoe

946

;;

947

+ -dicos*)

948

+ os=-dicos

949

+ ;;

950

+ -nacl*)

951

+ ;;

952

-none)

953

;;

954

*)

955

@@ -1426,6 +1509,9 @@ case $basic_machine in

956

m68*-cisco)

957

os=-aout

958

;;

959

+ mep-*)

960

+ os=-elf

961

+ ;;

962

mips*-cisco)

963

os=-elf

964

;;

965

@@ -1555,7 +1641,7 @@ case $basic_machine in

966

-sunos*)

967

vendor=sun

968

;;

969

- -aix*)

970

+ -cnk*|-aix*)

971

vendor=ibm

972

;;

973

-beos*)