Codebase list goffice / 26a6642
Imported Debian snapshot 0.8.17-1.1 Mònica Ramírez Arceda authored 12 years ago Dmitry Smirnov committed 10 years ago
5 changed file(s) with 16 addition(s) and 1178 deletion(s). Raw diff Collapse all Expand all
+13
-0
debian/changelog less more
0 goffice (0.8.17-1.1) unstable; urgency=low
1
2 * Non-maintainer upload.
3 * Fix FTBFS:
4 - debian/rules: Replace manual update of config.{sub,guess} with
5 dh_autotools-dev_updateconfig and dh_autotools-dev_restoreconfig.
6 - debian/control: Add autotools-dev as a build dependency.
7 - Remove debian/patches/refresh-config-sub-guess-0.8.17-1: it's not
8 needed any more. Remove debian/patches: there are no patches.
9 (Closes: #662650)
10
11 -- Mònica Ramírez Arceda <monica@probeta.net> Sat, 24 Mar 2012 01:20:10 +0100
12
013 goffice (0.8.17-1) unstable; urgency=low
114
215 * New upstream stable release.
+1
-1
debian/control less more
11 Section: libs
22 Priority: optional
33 Maintainer: J.H.M. Dassen (Ray) <jdassen@debian.org>
4 Build-Depends: debhelper (>= 7.0.0), dh-buildinfo,
4 Build-Depends: debhelper (>= 7.0.0), dh-buildinfo, autotools-dev (>= 20100122.1),
55 gtk-doc-tools (>= 1.4), libxml-parser-perl,
66 libglib2.0-dev (>= 2.16.0), libglib2.0-doc, libgsf-1-dev (>= 1.14.9),
77 libxml2-dev (>= 2.6.10-2), libxml2-doc,
+0
-1166
debian/patches/refresh-config-sub-guess-0.8.17-1 less more
0 diff -ru goffice-0.8.17.orig/config.guess goffice-0.8.17/config.guess
1 --- goffice-0.8.17.orig/config.guess 2011-06-17 04:24:28.000000000 +0200
2 +++ goffice-0.8.17/config.guess 2011-08-01 13:11:48.000000000 +0200
3 @@ -1,10 +1,10 @@
4 #! /bin/sh
5 # Attempt to guess a canonical system name.
6 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
7 -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
8 -# Free Software Foundation, Inc.
9 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
10 +# 2011 Free Software Foundation, Inc.
11
12 -timestamp='2009-11-20'
13 +timestamp='2011-05-11'
14
15 # This file is free software; you can redistribute it and/or modify it
16 # under the terms of the GNU General Public License as published by
17 @@ -56,8 +56,9 @@
18 GNU config.guess ($timestamp)
19
20 Originally written by Per Bothner.
21 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
22 -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
23 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
24 +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
25 +Software Foundation, Inc.
26
27 This is free software; see the source for copying conditions. There is NO
28 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
29 @@ -139,16 +140,6 @@
30 UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
31 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
32
33 -case "${UNAME_MACHINE}" in
34 - i?86)
35 - test -z "$VENDOR" && VENDOR=pc
36 - ;;
37 - *)
38 - test -z "$VENDOR" && VENDOR=unknown
39 - ;;
40 -esac
41 -test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
42 -
43 # Note: order is significant - the case branches are not exclusive.
44
45 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
46 @@ -190,7 +181,7 @@
47 fi
48 ;;
49 *)
50 - os=netbsd
51 + os=netbsd
52 ;;
53 esac
54 # The OS release
55 @@ -213,19 +204,19 @@
56 exit ;;
57 *:OpenBSD:*:*)
58 UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
59 - echo ${UNAME_MACHINE_ARCH}-${VENDOR}-openbsd${UNAME_RELEASE}
60 + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
61 exit ;;
62 *:ekkoBSD:*:*)
63 - echo ${UNAME_MACHINE}-${VENDOR}-ekkobsd${UNAME_RELEASE}
64 + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
65 exit ;;
66 *:SolidBSD:*:*)
67 - echo ${UNAME_MACHINE}-${VENDOR}-solidbsd${UNAME_RELEASE}
68 + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
69 exit ;;
70 macppc:MirBSD:*:*)
71 - echo powerpc-${VENDOR}-mirbsd${UNAME_RELEASE}
72 + echo powerpc-unknown-mirbsd${UNAME_RELEASE}
73 exit ;;
74 *:MirBSD:*:*)
75 - echo ${UNAME_MACHINE}-${VENDOR}-mirbsd${UNAME_RELEASE}
76 + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
77 exit ;;
78 alpha:OSF1:*:*)
79 case $UNAME_RELEASE in
80 @@ -233,7 +224,7 @@
81 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
82 ;;
83 *5.*)
84 - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
85 + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
86 ;;
87 esac
88 # According to Compaq, /usr/sbin/psrinfo has been available on
89 @@ -279,7 +270,10 @@
90 # A Xn.n version is an unreleased experimental baselevel.
91 # 1.2 uses "1.2" for uname -r.
92 echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
93 - exit ;;
94 + # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
95 + exitcode=$?
96 + trap '' 0
97 + exit $exitcode ;;
98 Alpha\ *:Windows_NT*:*)
99 # How do we know it's Interix rather than the generic POSIX subsystem?
100 # Should we change UNAME_MACHINE based on the output of uname instead
101 @@ -290,13 +284,13 @@
102 echo alpha-dec-winnt3.5
103 exit ;;
104 Amiga*:UNIX_System_V:4.0:*)
105 - echo m68k-${VENDOR}-sysv4
106 + echo m68k-unknown-sysv4
107 exit ;;
108 *:[Aa]miga[Oo][Ss]:*:*)
109 - echo ${UNAME_MACHINE}-${VENDOR}-amigaos
110 + echo ${UNAME_MACHINE}-unknown-amigaos
111 exit ;;
112 *:[Mm]orph[Oo][Ss]:*:*)
113 - echo ${UNAME_MACHINE}-${VENDOR}-morphos
114 + echo ${UNAME_MACHINE}-unknown-morphos
115 exit ;;
116 *:OS/390:*:*)
117 echo i370-ibm-openedition
118 @@ -305,13 +299,13 @@
119 echo s390-ibm-zvmoe
120 exit ;;
121 *:OS400:*:*)
122 - echo powerpc-ibm-os400
123 + echo powerpc-ibm-os400
124 exit ;;
125 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
126 echo arm-acorn-riscix${UNAME_RELEASE}
127 exit ;;
128 arm:riscos:*:*|arm:RISCOS:*:*)
129 - echo arm-${VENDOR}-riscos
130 + echo arm-unknown-riscos
131 exit ;;
132 SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
133 echo hppa1.1-hitachi-hiuxmpp
134 @@ -404,23 +398,23 @@
135 # MiNT. But MiNT is downward compatible to TOS, so this should
136 # be no problem.
137 atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
138 - echo m68k-atari-mint${UNAME_RELEASE}
139 + echo m68k-atari-mint${UNAME_RELEASE}
140 exit ;;
141 atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
142 echo m68k-atari-mint${UNAME_RELEASE}
143 - exit ;;
144 + exit ;;
145 *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
146 - echo m68k-atari-mint${UNAME_RELEASE}
147 + echo m68k-atari-mint${UNAME_RELEASE}
148 exit ;;
149 milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
150 - echo m68k-milan-mint${UNAME_RELEASE}
151 - exit ;;
152 + echo m68k-milan-mint${UNAME_RELEASE}
153 + exit ;;
154 hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
155 - echo m68k-hades-mint${UNAME_RELEASE}
156 - exit ;;
157 + echo m68k-hades-mint${UNAME_RELEASE}
158 + exit ;;
159 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
160 - echo m68k-${VENDOR}-mint${UNAME_RELEASE}
161 - exit ;;
162 + echo m68k-unknown-mint${UNAME_RELEASE}
163 + exit ;;
164 m68k:machten:*:*)
165 echo m68k-apple-machten${UNAME_RELEASE}
166 exit ;;
167 @@ -490,8 +484,8 @@
168 echo m88k-motorola-sysv3
169 exit ;;
170 AViiON:dgux:*:*)
171 - # DG/UX returns AViiON for all architectures
172 - UNAME_PROCESSOR=`/usr/bin/uname -p`
173 + # DG/UX returns AViiON for all architectures
174 + UNAME_PROCESSOR=`/usr/bin/uname -p`
175 if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
176 then
177 if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
178 @@ -504,7 +498,7 @@
179 else
180 echo i586-dg-dgux${UNAME_RELEASE}
181 fi
182 - exit ;;
183 + exit ;;
184 M88*:DolphinOS:*:*) # DolphinOS (SVR3)
185 echo m88k-dolphin-sysv3
186 exit ;;
187 @@ -561,7 +555,7 @@
188 echo rs6000-ibm-aix3.2
189 fi
190 exit ;;
191 - *:AIX:*:[456])
192 + *:AIX:*:[4567])
193 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
194 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
195 IBM_ARCH=rs6000
196 @@ -604,52 +598,52 @@
197 9000/[678][0-9][0-9])
198 if [ -x /usr/bin/getconf ]; then
199 sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
200 - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
201 - case "${sc_cpu_version}" in
202 - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
203 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
204 - 532) # CPU_PA_RISC2_0
205 - case "${sc_kernel_bits}" in
206 - 32) HP_ARCH="hppa2.0n" ;;
207 - 64) HP_ARCH="hppa2.0w" ;;
208 + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
209 + case "${sc_cpu_version}" in
210 + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
211 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
212 + 532) # CPU_PA_RISC2_0
213 + case "${sc_kernel_bits}" in
214 + 32) HP_ARCH="hppa2.0n" ;;
215 + 64) HP_ARCH="hppa2.0w" ;;
216 '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
217 - esac ;;
218 - esac
219 + esac ;;
220 + esac
221 fi
222 if [ "${HP_ARCH}" = "" ]; then
223 eval $set_cc_for_build
224 - sed 's/^ //' << EOF >$dummy.c
225 + sed 's/^ //' << EOF >$dummy.c
226
227 - #define _HPUX_SOURCE
228 - #include <stdlib.h>
229 - #include <unistd.h>
230 -
231 - int main ()
232 - {
233 - #if defined(_SC_KERNEL_BITS)
234 - long bits = sysconf(_SC_KERNEL_BITS);
235 - #endif
236 - long cpu = sysconf (_SC_CPU_VERSION);
237 -
238 - switch (cpu)
239 - {
240 - case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
241 - case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
242 - case CPU_PA_RISC2_0:
243 - #if defined(_SC_KERNEL_BITS)
244 - switch (bits)
245 - {
246 - case 64: puts ("hppa2.0w"); break;
247 - case 32: puts ("hppa2.0n"); break;
248 - default: puts ("hppa2.0"); break;
249 - } break;
250 - #else /* !defined(_SC_KERNEL_BITS) */
251 - puts ("hppa2.0"); break;
252 - #endif
253 - default: puts ("hppa1.0"); break;
254 - }
255 - exit (0);
256 - }
257 + #define _HPUX_SOURCE
258 + #include <stdlib.h>
259 + #include <unistd.h>
260 +
261 + int main ()
262 + {
263 + #if defined(_SC_KERNEL_BITS)
264 + long bits = sysconf(_SC_KERNEL_BITS);
265 + #endif
266 + long cpu = sysconf (_SC_CPU_VERSION);
267 +
268 + switch (cpu)
269 + {
270 + case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
271 + case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
272 + case CPU_PA_RISC2_0:
273 + #if defined(_SC_KERNEL_BITS)
274 + switch (bits)
275 + {
276 + case 64: puts ("hppa2.0w"); break;
277 + case 32: puts ("hppa2.0n"); break;
278 + default: puts ("hppa2.0"); break;
279 + } break;
280 + #else /* !defined(_SC_KERNEL_BITS) */
281 + puts ("hppa2.0"); break;
282 + #endif
283 + default: puts ("hppa1.0"); break;
284 + }
285 + exit (0);
286 + }
287 EOF
288 (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
289 test -z "$HP_ARCH" && HP_ARCH=hppa
290 @@ -730,9 +724,9 @@
291 exit ;;
292 i*86:OSF1:*:*)
293 if [ -x /usr/sbin/sysversion ] ; then
294 - echo ${UNAME_MACHINE}-${VENDOR}-osf1mk
295 + echo ${UNAME_MACHINE}-unknown-osf1mk
296 else
297 - echo ${UNAME_MACHINE}-${VENDOR}-osf1
298 + echo ${UNAME_MACHINE}-unknown-osf1
299 fi
300 exit ;;
301 parisc*:Lites*:*:*)
302 @@ -740,22 +734,22 @@
303 exit ;;
304 C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
305 echo c1-convex-bsd
306 - exit ;;
307 + exit ;;
308 C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
309 if getsysinfo -f scalar_acc
310 then echo c32-convex-bsd
311 else echo c2-convex-bsd
312 fi
313 - exit ;;
314 + exit ;;
315 C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
316 echo c34-convex-bsd
317 - exit ;;
318 + exit ;;
319 C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
320 echo c38-convex-bsd
321 - exit ;;
322 + exit ;;
323 C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
324 echo c4-convex-bsd
325 - exit ;;
326 + exit ;;
327 CRAY*Y-MP:*:*:*)
328 echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
329 exit ;;
330 @@ -779,32 +773,32 @@
331 exit ;;
332 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
333 FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
334 - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
335 - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
336 - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
337 - exit ;;
338 + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
339 + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
340 + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
341 + exit ;;
342 5000:UNIX_System_V:4.*:*)
343 - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
344 - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
345 - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
346 + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
347 + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
348 + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
349 exit ;;
350 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
351 echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
352 exit ;;
353 sparc*:BSD/OS:*:*)
354 - echo sparc-${VENDOR}-bsdi${UNAME_RELEASE}
355 + echo sparc-unknown-bsdi${UNAME_RELEASE}
356 exit ;;
357 *:BSD/OS:*:*)
358 - echo ${UNAME_MACHINE}-${VENDOR}-bsdi${UNAME_RELEASE}
359 + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
360 exit ;;
361 *:FreeBSD:*:*)
362 case ${UNAME_MACHINE} in
363 pc98)
364 - echo i386-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
365 + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
366 amd64)
367 - echo x86_64-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
368 + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
369 *)
370 - echo ${UNAME_MACHINE}-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
371 + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
372 esac
373 exit ;;
374 i*:CYGWIN*:*)
375 @@ -814,22 +808,22 @@
376 echo ${UNAME_MACHINE}-pc-mingw32
377 exit ;;
378 i*:windows32*:*)
379 - # uname -m includes "-pc" on this system.
380 - echo ${UNAME_MACHINE}-mingw32
381 + # uname -m includes "-pc" on this system.
382 + echo ${UNAME_MACHINE}-mingw32
383 exit ;;
384 i*:PW*:*)
385 echo ${UNAME_MACHINE}-pc-pw32
386 exit ;;
387 *:Interix*:*)
388 - case ${UNAME_MACHINE} in
389 + case ${UNAME_MACHINE} in
390 x86)
391 echo i586-pc-interix${UNAME_RELEASE}
392 exit ;;
393 authenticamd | genuineintel | EM64T)
394 - echo x86_64-${VENDOR}-interix${UNAME_RELEASE}
395 + echo x86_64-unknown-interix${UNAME_RELEASE}
396 exit ;;
397 IA64)
398 - echo ia64-${VENDOR}-interix${UNAME_RELEASE}
399 + echo ia64-unknown-interix${UNAME_RELEASE}
400 exit ;;
401 esac ;;
402 [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
403 @@ -848,21 +842,21 @@
404 echo ${UNAME_MACHINE}-pc-uwin
405 exit ;;
406 amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
407 - echo x86_64-${VENDOR}-cygwin
408 + echo x86_64-unknown-cygwin
409 exit ;;
410 p*:CYGWIN*:*)
411 - echo powerpcle-${VENDOR}-cygwin
412 + echo powerpcle-unknown-cygwin
413 exit ;;
414 prep*:SunOS:5.*:*)
415 - echo powerpcle-${VENDOR}-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
416 + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
417 exit ;;
418 *:GNU:*:*)
419 # the GNU system
420 - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-${VENDOR}-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
421 + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
422 exit ;;
423 *:GNU/*:*:*)
424 # other systems with GNU libc and userland
425 - echo ${UNAME_MACHINE}-${VENDOR}-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
426 + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
427 exit ;;
428 i*86:Minix:*:*)
429 echo ${UNAME_MACHINE}-pc-minix
430 @@ -876,23 +870,29 @@
431 EV6) UNAME_MACHINE=alphaev6 ;;
432 EV67) UNAME_MACHINE=alphaev67 ;;
433 EV68*) UNAME_MACHINE=alphaev68 ;;
434 - esac
435 + esac
436 objdump --private-headers /bin/sh | grep -q ld.so.1
437 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
438 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC}
439 + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
440 exit ;;
441 arm*:Linux:*:*)
442 eval $set_cc_for_build
443 if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
444 | grep -q __ARM_EABI__
445 then
446 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
447 + echo ${UNAME_MACHINE}-unknown-linux-gnu
448 else
449 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnueabi
450 + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
451 + | grep -q __ARM_PCS_VFP
452 + then
453 + echo ${UNAME_MACHINE}-unknown-linux-gnueabi
454 + else
455 + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
456 + fi
457 fi
458 exit ;;
459 avr32*:Linux:*:*)
460 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
461 + echo ${UNAME_MACHINE}-unknown-linux-gnu
462 exit ;;
463 cris:Linux:*:*)
464 echo cris-axis-linux-gnu
465 @@ -901,7 +901,7 @@
466 echo crisv32-axis-linux-gnu
467 exit ;;
468 frv:Linux:*:*)
469 - echo frv-${VENDOR}-linux-gnu
470 + echo frv-unknown-linux-gnu
471 exit ;;
472 i*86:Linux:*:*)
473 LIBC=gnu
474 @@ -912,16 +912,16 @@
475 #endif
476 EOF
477 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
478 - echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}"
479 + echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
480 exit ;;
481 ia64:Linux:*:*)
482 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
483 + echo ${UNAME_MACHINE}-unknown-linux-gnu
484 exit ;;
485 m32r*:Linux:*:*)
486 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
487 + echo ${UNAME_MACHINE}-unknown-linux-gnu
488 exit ;;
489 m68*:Linux:*:*)
490 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
491 + echo ${UNAME_MACHINE}-unknown-linux-gnu
492 exit ;;
493 mips:Linux:*:* | mips64:Linux:*:*)
494 eval $set_cc_for_build
495 @@ -940,51 +940,54 @@
496 #endif
497 EOF
498 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
499 - test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
500 + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
501 ;;
502 or32:Linux:*:*)
503 - echo or32-${VENDOR}-linux-gnu
504 + echo or32-unknown-linux-gnu
505 exit ;;
506 padre:Linux:*:*)
507 - echo sparc-${VENDOR}-linux-gnu
508 + echo sparc-unknown-linux-gnu
509 exit ;;
510 parisc64:Linux:*:* | hppa64:Linux:*:*)
511 - echo hppa64-${VENDOR}-linux-gnu
512 + echo hppa64-unknown-linux-gnu
513 exit ;;
514 parisc:Linux:*:* | hppa:Linux:*:*)
515 # Look for CPU level
516 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
517 - PA7*) echo hppa1.1-${VENDOR}-linux-gnu ;;
518 - PA8*) echo hppa2.0-${VENDOR}-linux-gnu ;;
519 - *) echo hppa-${VENDOR}-linux-gnu ;;
520 + PA7*) echo hppa1.1-unknown-linux-gnu ;;
521 + PA8*) echo hppa2.0-unknown-linux-gnu ;;
522 + *) echo hppa-unknown-linux-gnu ;;
523 esac
524 exit ;;
525 ppc64:Linux:*:*)
526 - echo powerpc64-${VENDOR}-linux-gnu
527 + echo powerpc64-unknown-linux-gnu
528 exit ;;
529 ppc:Linux:*:*)
530 - echo powerpc-${VENDOR}-linux-gnu
531 + echo powerpc-unknown-linux-gnu
532 exit ;;
533 s390:Linux:*:* | s390x:Linux:*:*)
534 echo ${UNAME_MACHINE}-ibm-linux
535 exit ;;
536 sh64*:Linux:*:*)
537 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
538 + echo ${UNAME_MACHINE}-unknown-linux-gnu
539 exit ;;
540 sh*:Linux:*:*)
541 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
542 + echo ${UNAME_MACHINE}-unknown-linux-gnu
543 exit ;;
544 sparc:Linux:*:* | sparc64:Linux:*:*)
545 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
546 + echo ${UNAME_MACHINE}-unknown-linux-gnu
547 + exit ;;
548 + tile*:Linux:*:*)
549 + echo ${UNAME_MACHINE}-tilera-linux-gnu
550 exit ;;
551 vax:Linux:*:*)
552 echo ${UNAME_MACHINE}-dec-linux-gnu
553 exit ;;
554 x86_64:Linux:*:*)
555 - echo x86_64-${VENDOR}-linux-gnu
556 + echo x86_64-unknown-linux-gnu
557 exit ;;
558 xtensa*:Linux:*:*)
559 - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
560 + echo ${UNAME_MACHINE}-unknown-linux-gnu
561 exit ;;
562 i*86:DYNIX/ptx:4*:*)
563 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
564 @@ -993,11 +996,11 @@
565 echo i386-sequent-sysv4
566 exit ;;
567 i*86:UNIX_SV:4.2MP:2.*)
568 - # Unixware is an offshoot of SVR4, but it has its own version
569 - # number series starting with 2...
570 - # I am not positive that other SVR4 systems won't match this,
571 + # Unixware is an offshoot of SVR4, but it has its own version
572 + # number series starting with 2...
573 + # I am not positive that other SVR4 systems won't match this,
574 # I just have to hope. -- rms.
575 - # Use sysv4.2uw... so that sysv4* matches it.
576 + # Use sysv4.2uw... so that sysv4* matches it.
577 echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
578 exit ;;
579 i*86:OS/2:*:*)
580 @@ -1006,16 +1009,16 @@
581 echo ${UNAME_MACHINE}-pc-os2-emx
582 exit ;;
583 i*86:XTS-300:*:STOP)
584 - echo ${UNAME_MACHINE}-${VENDOR}-stop
585 + echo ${UNAME_MACHINE}-unknown-stop
586 exit ;;
587 i*86:atheos:*:*)
588 - echo ${UNAME_MACHINE}-${VENDOR}-atheos
589 + echo ${UNAME_MACHINE}-unknown-atheos
590 exit ;;
591 i*86:syllable:*:*)
592 echo ${UNAME_MACHINE}-pc-syllable
593 exit ;;
594 i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
595 - echo i386-${VENDOR}-lynxos${UNAME_RELEASE}
596 + echo i386-unknown-lynxos${UNAME_RELEASE}
597 exit ;;
598 i*86:*DOS:*:*)
599 echo ${UNAME_MACHINE}-pc-msdosdjgpp
600 @@ -1029,13 +1032,13 @@
601 fi
602 exit ;;
603 i*86:*:5:[678]*)
604 - # UnixWare 7.x, OpenUNIX and OpenServer 6.
605 + # UnixWare 7.x, OpenUNIX and OpenServer 6.
606 case `/bin/uname -X | grep "^Machine"` in
607 *486*) UNAME_MACHINE=i486 ;;
608 *Pentium) UNAME_MACHINE=i586 ;;
609 *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
610 esac
611 - echo ${UNAME_MACHINE}-${VENDOR}-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
612 + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
613 exit ;;
614 i*86:*:3.2:*)
615 if test -f /usr/options/cb.name; then
616 @@ -1057,13 +1060,13 @@
617 exit ;;
618 pc:*:*:*)
619 # Left here for compatibility:
620 - # uname -m prints for DJGPP always 'pc', but it prints nothing about
621 - # the processor, so we play safe by assuming i586.
622 + # uname -m prints for DJGPP always 'pc', but it prints nothing about
623 + # the processor, so we play safe by assuming i586.
624 # Note: whatever this is, it MUST be the same as what config.sub
625 # prints for the "djgpp" host, or else GDB configury will decide that
626 # this is a cross-build.
627 echo i586-pc-msdosdjgpp
628 - exit ;;
629 + exit ;;
630 Intel:Mach:3*:*)
631 echo i386-pc-mach3
632 exit ;;
633 @@ -1074,7 +1077,7 @@
634 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
635 echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
636 else # Add other i860-SVR4 vendors below as they are discovered.
637 - echo i860-${VENDOR}-sysv${UNAME_RELEASE} # Unknown i860-SVR4
638 + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
639 fi
640 exit ;;
641 mini*:CTIX:SYS*5:*)
642 @@ -1098,8 +1101,8 @@
643 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
644 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
645 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
646 - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
647 - && { echo i486-ncr-sysv4; exit; } ;;
648 + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
649 + && { echo i486-ncr-sysv4; exit; } ;;
650 NCR*:*:4.2:* | MPRAS*:*:4.2:*)
651 OS_REL='.3'
652 test -r /etc/.relid \
653 @@ -1111,19 +1114,19 @@
654 /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
655 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
656 m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
657 - echo m68k-${VENDOR}-lynxos${UNAME_RELEASE}
658 + echo m68k-unknown-lynxos${UNAME_RELEASE}
659 exit ;;
660 mc68030:UNIX_System_V:4.*:*)
661 echo m68k-atari-sysv4
662 exit ;;
663 TSUNAMI:LynxOS:2.*:*)
664 - echo sparc-${VENDOR}-lynxos${UNAME_RELEASE}
665 + echo sparc-unknown-lynxos${UNAME_RELEASE}
666 exit ;;
667 rs6000:LynxOS:2.*:*)
668 - echo rs6000-${VENDOR}-lynxos${UNAME_RELEASE}
669 + echo rs6000-unknown-lynxos${UNAME_RELEASE}
670 exit ;;
671 PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
672 - echo powerpc-${VENDOR}-lynxos${UNAME_RELEASE}
673 + echo powerpc-unknown-lynxos${UNAME_RELEASE}
674 exit ;;
675 SM[BE]S:UNIX_SV:*:*)
676 echo mips-dde-sysv${UNAME_RELEASE}
677 @@ -1142,10 +1145,10 @@
678 echo ns32k-sni-sysv
679 fi
680 exit ;;
681 - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
682 - # says <Richard.M.Bartel@ccMail.Census.GOV>
683 - echo i586-unisys-sysv4
684 - exit ;;
685 + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
686 + # says <Richard.M.Bartel@ccMail.Census.GOV>
687 + echo i586-unisys-sysv4
688 + exit ;;
689 *:UNIX_System_V:4*:FTX*)
690 # From Gerald Hewes <hewes@openmarket.com>.
691 # How about differentiating between stratus architectures? -djm
692 @@ -1171,11 +1174,11 @@
693 exit ;;
694 R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
695 if [ -d /usr/nec ]; then
696 - echo mips-nec-sysv${UNAME_RELEASE}
697 + echo mips-nec-sysv${UNAME_RELEASE}
698 else
699 - echo mips-${VENDOR}-sysv${UNAME_RELEASE}
700 + echo mips-unknown-sysv${UNAME_RELEASE}
701 fi
702 - exit ;;
703 + exit ;;
704 BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
705 echo powerpc-be-beos
706 exit ;;
707 @@ -1240,6 +1243,9 @@
708 *:QNX:*:4*)
709 echo i386-pc-qnx
710 exit ;;
711 + NEO-?:NONSTOP_KERNEL:*:*)
712 + echo neo-tandem-nsk${UNAME_RELEASE}
713 + exit ;;
714 NSE-?:NONSTOP_KERNEL:*:*)
715 echo nse-tandem-nsk${UNAME_RELEASE}
716 exit ;;
717 @@ -1264,13 +1270,13 @@
718 else
719 UNAME_MACHINE="$cputype"
720 fi
721 - echo ${UNAME_MACHINE}-${VENDOR}-plan9
722 + echo ${UNAME_MACHINE}-unknown-plan9
723 exit ;;
724 *:TOPS-10:*:*)
725 - echo pdp10-${VENDOR}-tops10
726 + echo pdp10-unknown-tops10
727 exit ;;
728 *:TENEX:*:*)
729 - echo pdp10-${VENDOR}-tenex
730 + echo pdp10-unknown-tenex
731 exit ;;
732 KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
733 echo pdp10-dec-tops20
734 @@ -1279,19 +1285,19 @@
735 echo pdp10-xkl-tops20
736 exit ;;
737 *:TOPS-20:*:*)
738 - echo pdp10-${VENDOR}-tops20
739 + echo pdp10-unknown-tops20
740 exit ;;
741 *:ITS:*:*)
742 - echo pdp10-${VENDOR}-its
743 + echo pdp10-unknown-its
744 exit ;;
745 SEI:*:*:SEIUX)
746 - echo mips-sei-seiux${UNAME_RELEASE}
747 + echo mips-sei-seiux${UNAME_RELEASE}
748 exit ;;
749 *:DragonFly:*:*)
750 - echo ${UNAME_MACHINE}-${VENDOR}-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
751 + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
752 exit ;;
753 *:*VMS:*:*)
754 - UNAME_MACHINE=`(uname -p) 2>/dev/null`
755 + UNAME_MACHINE=`(uname -p) 2>/dev/null`
756 case "${UNAME_MACHINE}" in
757 A*) echo alpha-dec-vms ; exit ;;
758 I*) echo ia64-dec-vms ; exit ;;
759 @@ -1331,11 +1337,11 @@
760 #include <sys/param.h>
761 printf ("m68k-sony-newsos%s\n",
762 #ifdef NEWSOS4
763 - "4"
764 + "4"
765 #else
766 - ""
767 + ""
768 #endif
769 - ); exit (0);
770 + ); exit (0);
771 #endif
772 #endif
773
774 diff -ru goffice-0.8.17.orig/config.sub goffice-0.8.17/config.sub
775 --- goffice-0.8.17.orig/config.sub 2011-06-17 04:24:28.000000000 +0200
776 +++ goffice-0.8.17/config.sub 2011-08-01 13:11:48.000000000 +0200
777 @@ -1,10 +1,10 @@
778 #! /bin/sh
779 # Configuration validation subroutine script.
780 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
781 -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
782 -# Free Software Foundation, Inc.
783 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
784 +# 2011 Free Software Foundation, Inc.
785
786 -timestamp='2009-11-20'
787 +timestamp='2011-03-23'
788
789 # This file is (in principle) common to ALL GNU software.
790 # The presence of a machine in this file suggests that SOME GNU software
791 @@ -75,8 +75,9 @@
792 version="\
793 GNU config.sub ($timestamp)
794
795 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
796 -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
797 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
798 +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
799 +Software Foundation, Inc.
800
801 This is free software; see the source for copying conditions. There is NO
802 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
803 @@ -123,8 +124,9 @@
804 # Here we must recognize all the valid KERNEL-OS combinations.
805 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
806 case $maybe_os in
807 - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
808 - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
809 + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
810 + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
811 + knetbsd*-gnu* | netbsd*-gnu* | \
812 kopensolaris*-gnu* | \
813 storm-chaos* | os2-emx* | rtmk-nova*)
814 os=-$maybe_os
815 @@ -156,8 +158,8 @@
816 os=
817 basic_machine=$1
818 ;;
819 - -bluegene*)
820 - os=-cnk
821 + -bluegene*)
822 + os=-cnk
823 ;;
824 -sim | -cisco | -oki | -wec | -winbond)
825 os=
826 @@ -173,10 +175,10 @@
827 os=-chorusos
828 basic_machine=$1
829 ;;
830 - -chorusrdb)
831 - os=-chorusrdb
832 + -chorusrdb)
833 + os=-chorusrdb
834 basic_machine=$1
835 - ;;
836 + ;;
837 -hiux*)
838 os=-hiuxwe2
839 ;;
840 @@ -281,11 +283,13 @@
841 | moxie \
842 | mt \
843 | msp430 \
844 + | nds32 | nds32le | nds32be \
845 | nios | nios2 \
846 | ns16k | ns32k \
847 + | open8 \
848 | or32 \
849 | pdp10 | pdp11 | pj | pjl \
850 - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
851 + | powerpc | powerpc64 | powerpc64le | powerpcle \
852 | pyramid \
853 | rx \
854 | score \
855 @@ -293,15 +297,24 @@
856 | sh64 | sh64le \
857 | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
858 | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
859 - | spu | strongarm \
860 - | tahoe | thumb | tic4x | tic80 | tron \
861 + | spu \
862 + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
863 | ubicom32 \
864 | v850 | v850e \
865 | we32k \
866 - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
867 + | x86 | xc16x | xstormy16 | xtensa \
868 | z8k | z80)
869 basic_machine=$basic_machine-unknown
870 ;;
871 + c54x)
872 + basic_machine=tic54x-unknown
873 + ;;
874 + c55x)
875 + basic_machine=tic55x-unknown
876 + ;;
877 + c6x)
878 + basic_machine=tic6x-unknown
879 + ;;
880 m6811 | m68hc11 | m6812 | m68hc12 | picochip)
881 # Motorola 68HC11/12.
882 basic_machine=$basic_machine-unknown
883 @@ -313,6 +326,18 @@
884 basic_machine=mt-unknown
885 ;;
886
887 + strongarm | thumb | xscale)
888 + basic_machine=arm-unknown
889 + ;;
890 +
891 + xscaleeb)
892 + basic_machine=armeb-unknown
893 + ;;
894 +
895 + xscaleel)
896 + basic_machine=armel-unknown
897 + ;;
898 +
899 # We use `pc' rather than `unknown'
900 # because (1) that's what they normally are, and
901 # (2) the word "unknown" tends to confuse beginning users.
902 @@ -333,7 +358,7 @@
903 | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
904 | avr-* | avr32-* \
905 | bfin-* | bs2000-* \
906 - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
907 + | c[123]* | c30-* | [cjt]90-* | c4x-* \
908 | clipper-* | craynv-* | cydra-* \
909 | d10v-* | d30v-* | dlx-* \
910 | elxsi-* \
911 @@ -367,25 +392,28 @@
912 | mmix-* \
913 | mt-* \
914 | msp430-* \
915 + | nds32-* | nds32le-* | nds32be-* \
916 | nios-* | nios2-* \
917 | none-* | np1-* | ns16k-* | ns32k-* \
918 + | open8-* \
919 | orion-* \
920 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
921 - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
922 + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
923 | pyramid-* \
924 | romp-* | rs6000-* | rx-* \
925 | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
926 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
927 | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
928 | sparclite-* \
929 - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
930 - | tahoe-* | thumb-* \
931 - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
932 + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
933 + | tahoe-* \
934 + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
935 + | tile-* | tilegx-* \
936 | tron-* \
937 | ubicom32-* \
938 | v850-* | v850e-* | vax-* \
939 | we32k-* \
940 - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
941 + | x86-* | x86_64-* | xc16x-* | xps100-* \
942 | xstormy16-* | xtensa*-* \
943 | ymp-* \
944 | z8k-* | z80-*)
945 @@ -410,7 +438,7 @@
946 basic_machine=a29k-amd
947 os=-udi
948 ;;
949 - abacus)
950 + abacus)
951 basic_machine=abacus-unknown
952 ;;
953 adobe68k)
954 @@ -480,11 +508,20 @@
955 basic_machine=powerpc-ibm
956 os=-cnk
957 ;;
958 + c54x-*)
959 + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
960 + ;;
961 + c55x-*)
962 + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
963 + ;;
964 + c6x-*)
965 + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
966 + ;;
967 c90)
968 basic_machine=c90-cray
969 os=-unicos
970 ;;
971 - cegcc)
972 + cegcc)
973 basic_machine=arm-unknown
974 os=-cegcc
975 ;;
976 @@ -516,7 +553,7 @@
977 basic_machine=craynv-cray
978 os=-unicosmp
979 ;;
980 - cr16)
981 + cr16 | cr16-*)
982 basic_machine=cr16-unknown
983 os=-elf
984 ;;
985 @@ -732,7 +769,7 @@
986 basic_machine=ns32k-utek
987 os=-sysv
988 ;;
989 - microblaze)
990 + microblaze)
991 basic_machine=microblaze-xilinx
992 ;;
993 mingw32)
994 @@ -839,6 +876,12 @@
995 np1)
996 basic_machine=np1-gould
997 ;;
998 + neo-tandem)
999 + basic_machine=neo-tandem
1000 + ;;
1001 + nse-tandem)
1002 + basic_machine=nse-tandem
1003 + ;;
1004 nsr-tandem)
1005 basic_machine=nsr-tandem
1006 ;;
1007 @@ -921,9 +964,10 @@
1008 ;;
1009 power) basic_machine=power-ibm
1010 ;;
1011 - ppc) basic_machine=powerpc-unknown
1012 + ppc | ppcbe) basic_machine=powerpc-unknown
1013 ;;
1014 - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
1015 + ppc-* | ppcbe-*)
1016 + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
1017 ;;
1018 ppcle | powerpclittle | ppc-le | powerpc-little)
1019 basic_machine=powerpcle-unknown
1020 @@ -1017,6 +1061,9 @@
1021 basic_machine=i860-stratus
1022 os=-sysv4
1023 ;;
1024 + strongarm-* | thumb-*)
1025 + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
1026 + ;;
1027 sun2)
1028 basic_machine=m68000-sun
1029 ;;
1030 @@ -1073,17 +1120,10 @@
1031 basic_machine=t90-cray
1032 os=-unicos
1033 ;;
1034 - tic54x | c54x*)
1035 - basic_machine=tic54x-unknown
1036 - os=-coff
1037 - ;;
1038 - tic55x | c55x*)
1039 - basic_machine=tic55x-unknown
1040 - os=-coff
1041 - ;;
1042 - tic6x | c6x*)
1043 - basic_machine=tic6x-unknown
1044 - os=-coff
1045 + # This must be matched before tile*.
1046 + tilegx*)
1047 + basic_machine=tilegx-unknown
1048 + os=-linux-gnu
1049 ;;
1050 tile*)
1051 basic_machine=tile-unknown
1052 @@ -1156,6 +1196,9 @@
1053 xps | xps100)
1054 basic_machine=xps100-honeywell
1055 ;;
1056 + xscale-* | xscalee[bl]-*)
1057 + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
1058 + ;;
1059 ymp)
1060 basic_machine=ymp-cray
1061 os=-unicos
1062 @@ -1253,11 +1296,11 @@
1063 if [ x"$os" != x"" ]
1064 then
1065 case $os in
1066 - # First match some system type aliases
1067 - # that might get confused with valid system types.
1068 + # First match some system type aliases
1069 + # that might get confused with valid system types.
1070 # -solaris* is a basic system type, with this one exception.
1071 - -auroraux)
1072 - os=-auroraux
1073 + -auroraux)
1074 + os=-auroraux
1075 ;;
1076 -solaris1 | -solaris1.*)
1077 os=`echo $os | sed -e 's|solaris1|sunos4|'`
1078 @@ -1294,7 +1337,8 @@
1079 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1080 | -chorusos* | -chorusrdb* | -cegcc* \
1081 | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1082 - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
1083 + | -mingw32* | -linux-gnu* | -linux-android* \
1084 + | -linux-newlib* | -linux-uclibc* \
1085 | -uxpv* | -beos* | -mpeix* | -udk* \
1086 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
1087 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
1088 @@ -1341,7 +1385,7 @@
1089 -opened*)
1090 os=-openedition
1091 ;;
1092 - -os400*)
1093 + -os400*)
1094 os=-os400
1095 ;;
1096 -wince*)
1097 @@ -1390,7 +1434,7 @@
1098 -sinix*)
1099 os=-sysv4
1100 ;;
1101 - -tpf*)
1102 + -tpf*)
1103 os=-tpf
1104 ;;
1105 -triton*)
1106 @@ -1435,6 +1479,8 @@
1107 -dicos*)
1108 os=-dicos
1109 ;;
1110 + -nacl*)
1111 + ;;
1112 -none)
1113 ;;
1114 *)
1115 @@ -1457,10 +1503,10 @@
1116 # system, and we'll never get to this point.
1117
1118 case $basic_machine in
1119 - score-*)
1120 + score-*)
1121 os=-elf
1122 ;;
1123 - spu-*)
1124 + spu-*)
1125 os=-elf
1126 ;;
1127 *-acorn)
1128 @@ -1472,8 +1518,17 @@
1129 arm*-semi)
1130 os=-aout
1131 ;;
1132 - c4x-* | tic4x-*)
1133 - os=-coff
1134 + c4x-* | tic4x-*)
1135 + os=-coff
1136 + ;;
1137 + tic54x-*)
1138 + os=-coff
1139 + ;;
1140 + tic55x-*)
1141 + os=-coff
1142 + ;;
1143 + tic6x-*)
1144 + os=-coff
1145 ;;
1146 # This must come before the *-dec entry.
1147 pdp10-*)
1148 @@ -1500,7 +1555,7 @@
1149 m68*-cisco)
1150 os=-aout
1151 ;;
1152 - mep-*)
1153 + mep-*)
1154 os=-elf
1155 ;;
1156 mips*-cisco)
1157 @@ -1527,7 +1582,7 @@
1158 *-ibm)
1159 os=-aix
1160 ;;
1161 - *-knuth)
1162 + *-knuth)
1163 os=-mmixware
1164 ;;
1165 *-wec)
+0
-1
debian/patches/series less more
0 refresh-config-sub-guess-0.8.17-1
+2
-10
debian/rules less more
111111
112112 rm -rf build && mkdir build
113113 rm -f goffice/goffice-paths.h
114 dh_autotools-dev_updateconfig
114115 cd build && env "CC=$(CC) $(LDFLAGS)" ../configure $(confflags)
115116
116117 touch config-stamp
144145 -find -type f -name 'Makefile.am' | sed -e 's/\.am$$//' | xargs rm -f
145146
146147 # Update config.{sub,guess} from autotools-dev, if possible.
147 -for f in config.sub config.guess ; do \
148 if test -r /usr/share/misc/$$f ; then \
149 OLDDATE=`./$$f -t | tr -d -` ; \
150 NEWDATE=`/usr/share/misc/$$f -t | tr -d -` ; \
151 if [ $$OLDDATE -lt $$NEWDATE ] ; then \
152 echo "GNU config automated update of $$f (replacing $$OLDDATE with $$NEWDATE)" 1>&2 ; \
153 cp -f /usr/share/misc/$$f $$f ; \
154 fi; \
155 fi; \
156 done
148 dh_autotools-dev_restoreconfig
157149
158150 dh_clean
159151