|
 |
833980 |
diff -u -Naur potrace-1.11/config.guess potrace-1.11-patched/config.guess
|
|
|
833980 |
--- potrace-1.11/config.guess 2010-11-04 23:08:34.000000000 -0300
|
|
|
833980 |
+++ potrace-1.11-patched/config.guess 2013-05-14 17:54:51.359873528 -0300
|
|
|
833980 |
@@ -1,10 +1,10 @@
|
|
|
833980 |
#! /bin/sh
|
|
|
833980 |
# Attempt to guess a canonical system name.
|
|
|
833980 |
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
|
|
833980 |
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
|
|
|
833980 |
-# Free Software Foundation, Inc.
|
|
|
833980 |
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
|
|
|
833980 |
+# 2011, 2012 Free Software Foundation, Inc.
|
|
|
833980 |
|
|
|
833980 |
-timestamp='2009-06-10'
|
|
|
833980 |
+timestamp='2012-02-10'
|
|
|
833980 |
|
|
|
833980 |
# This file is free software; you can redistribute it and/or modify it
|
|
|
833980 |
# under the terms of the GNU General Public License as published by
|
|
|
833980 |
@@ -17,9 +17,7 @@
|
|
|
833980 |
# General Public License for more details.
|
|
|
833980 |
#
|
|
|
833980 |
# You should have received a copy of the GNU General Public License
|
|
|
833980 |
-# along with this program; if not, write to the Free Software
|
|
|
833980 |
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
|
|
|
833980 |
-# 02110-1301, USA.
|
|
|
833980 |
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
|
833980 |
#
|
|
|
833980 |
# As a special exception to the GNU General Public License, if you
|
|
|
833980 |
# distribute this file as part of a program that contains a
|
|
|
833980 |
@@ -27,16 +25,16 @@
|
|
|
833980 |
# the same distribution terms that you use for the rest of that program.
|
|
|
833980 |
|
|
|
833980 |
|
|
|
833980 |
-# Originally written by Per Bothner <per@bothner.com>.
|
|
|
833980 |
-# Please send patches to <config-patches@gnu.org>. Submit a context
|
|
|
833980 |
-# diff and a properly formatted ChangeLog entry.
|
|
|
833980 |
+# Originally written by Per Bothner. Please send patches (context
|
|
|
833980 |
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
|
|
|
833980 |
+# entry.
|
|
|
833980 |
#
|
|
|
833980 |
# This script attempts to guess a canonical system name similar to
|
|
|
833980 |
# config.sub. If it succeeds, it prints the system name on stdout, and
|
|
|
833980 |
# exits with 0. Otherwise, it exits with 1.
|
|
|
833980 |
#
|
|
|
833980 |
-# The plan is that this can be called by configure scripts if you
|
|
|
833980 |
-# don't specify an explicit build system type.
|
|
|
833980 |
+# You can get the latest version of this script from:
|
|
|
833980 |
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
|
|
|
833980 |
|
|
|
833980 |
me=`echo "$0" | sed -e 's,.*/,,'`
|
|
|
833980 |
|
|
|
833980 |
@@ -56,8 +54,9 @@
|
|
|
833980 |
GNU config.guess ($timestamp)
|
|
|
833980 |
|
|
|
833980 |
Originally written by Per Bothner.
|
|
|
833980 |
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
|
|
|
833980 |
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
|
|
833980 |
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
|
|
|
833980 |
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
|
|
|
833980 |
+Free Software Foundation, Inc.
|
|
|
833980 |
|
|
|
833980 |
This is free software; see the source for copying conditions. There is NO
|
|
|
833980 |
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
|
|
833980 |
@@ -144,7 +143,7 @@
|
|
|
833980 |
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
|
|
833980 |
*:NetBSD:*:*)
|
|
|
833980 |
# NetBSD (nbsd) targets should (where applicable) match one or
|
|
|
833980 |
- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
|
|
|
833980 |
+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
|
|
|
833980 |
# *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
|
|
|
833980 |
# switched to ELF, *-*-netbsd* would select the old
|
|
|
833980 |
# object file format. This provides both forward
|
|
|
833980 |
@@ -180,7 +179,7 @@
|
|
|
833980 |
fi
|
|
|
833980 |
;;
|
|
|
833980 |
*)
|
|
|
833980 |
- os=netbsd
|
|
|
833980 |
+ os=netbsd
|
|
|
833980 |
;;
|
|
|
833980 |
esac
|
|
|
833980 |
# The OS release
|
|
|
833980 |
@@ -223,7 +222,7 @@
|
|
|
833980 |
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
|
|
|
833980 |
;;
|
|
|
833980 |
*5.*)
|
|
|
833980 |
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
|
|
|
833980 |
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
|
|
|
833980 |
;;
|
|
|
833980 |
esac
|
|
|
833980 |
# According to Compaq, /usr/sbin/psrinfo has been available on
|
|
|
833980 |
@@ -269,7 +268,10 @@
|
|
|
833980 |
# A Xn.n version is an unreleased experimental baselevel.
|
|
|
833980 |
# 1.2 uses "1.2" for uname -r.
|
|
|
833980 |
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
|
|
|
833980 |
- exit ;;
|
|
|
833980 |
+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
|
|
|
833980 |
+ exitcode=$?
|
|
|
833980 |
+ trap '' 0
|
|
|
833980 |
+ exit $exitcode ;;
|
|
|
833980 |
Alpha\ *:Windows_NT*:*)
|
|
|
833980 |
# How do we know it's Interix rather than the generic POSIX subsystem?
|
|
|
833980 |
# Should we change UNAME_MACHINE based on the output of uname instead
|
|
|
833980 |
@@ -295,7 +297,7 @@
|
|
|
833980 |
echo s390-ibm-zvmoe
|
|
|
833980 |
exit ;;
|
|
|
833980 |
*:OS400:*:*)
|
|
|
833980 |
- echo powerpc-ibm-os400
|
|
|
833980 |
+ echo powerpc-ibm-os400
|
|
|
833980 |
exit ;;
|
|
|
833980 |
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
|
|
|
833980 |
echo arm-acorn-riscix${UNAME_RELEASE}
|
|
|
833980 |
@@ -333,6 +335,9 @@
|
|
|
833980 |
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
|
|
|
833980 |
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
|
|
833980 |
exit ;;
|
|
|
833980 |
+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
|
|
|
833980 |
+ echo i386-pc-auroraux${UNAME_RELEASE}
|
|
|
833980 |
+ exit ;;
|
|
|
833980 |
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
|
|
|
833980 |
eval $set_cc_for_build
|
|
|
833980 |
SUN_ARCH="i386"
|
|
|
833980 |
@@ -391,23 +396,23 @@
|
|
|
833980 |
# MiNT. But MiNT is downward compatible to TOS, so this should
|
|
|
833980 |
# be no problem.
|
|
|
833980 |
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
|
|
|
833980 |
- echo m68k-atari-mint${UNAME_RELEASE}
|
|
|
833980 |
+ echo m68k-atari-mint${UNAME_RELEASE}
|
|
|
833980 |
exit ;;
|
|
|
833980 |
atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
|
|
|
833980 |
echo m68k-atari-mint${UNAME_RELEASE}
|
|
|
833980 |
- exit ;;
|
|
|
833980 |
+ exit ;;
|
|
|
833980 |
*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
|
|
|
833980 |
- echo m68k-atari-mint${UNAME_RELEASE}
|
|
|
833980 |
+ echo m68k-atari-mint${UNAME_RELEASE}
|
|
|
833980 |
exit ;;
|
|
|
833980 |
milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
|
|
|
833980 |
- echo m68k-milan-mint${UNAME_RELEASE}
|
|
|
833980 |
- exit ;;
|
|
|
833980 |
+ echo m68k-milan-mint${UNAME_RELEASE}
|
|
|
833980 |
+ exit ;;
|
|
|
833980 |
hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
|
|
|
833980 |
- echo m68k-hades-mint${UNAME_RELEASE}
|
|
|
833980 |
- exit ;;
|
|
|
833980 |
+ echo m68k-hades-mint${UNAME_RELEASE}
|
|
|
833980 |
+ exit ;;
|
|
|
833980 |
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
|
|
|
833980 |
- echo m68k-unknown-mint${UNAME_RELEASE}
|
|
|
833980 |
- exit ;;
|
|
|
833980 |
+ echo m68k-unknown-mint${UNAME_RELEASE}
|
|
|
833980 |
+ exit ;;
|
|
|
833980 |
m68k:machten:*:*)
|
|
|
833980 |
echo m68k-apple-machten${UNAME_RELEASE}
|
|
|
833980 |
exit ;;
|
|
|
833980 |
@@ -477,8 +482,8 @@
|
|
|
833980 |
echo m88k-motorola-sysv3
|
|
|
833980 |
exit ;;
|
|
|
833980 |
AViiON:dgux:*:*)
|
|
|
833980 |
- # DG/UX returns AViiON for all architectures
|
|
|
833980 |
- UNAME_PROCESSOR=`/usr/bin/uname -p`
|
|
|
833980 |
+ # DG/UX returns AViiON for all architectures
|
|
|
833980 |
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
|
|
|
833980 |
if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
|
|
|
833980 |
then
|
|
|
833980 |
if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
|
|
|
833980 |
@@ -491,7 +496,7 @@
|
|
|
833980 |
else
|
|
|
833980 |
echo i586-dg-dgux${UNAME_RELEASE}
|
|
|
833980 |
fi
|
|
|
833980 |
- exit ;;
|
|
|
833980 |
+ exit ;;
|
|
|
833980 |
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
|
|
|
833980 |
echo m88k-dolphin-sysv3
|
|
|
833980 |
exit ;;
|
|
|
833980 |
@@ -548,7 +553,7 @@
|
|
|
833980 |
echo rs6000-ibm-aix3.2
|
|
|
833980 |
fi
|
|
|
833980 |
exit ;;
|
|
|
833980 |
- *:AIX:*:[456])
|
|
|
833980 |
+ *:AIX:*:[4567])
|
|
|
833980 |
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
|
|
|
833980 |
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
|
|
|
833980 |
IBM_ARCH=rs6000
|
|
|
833980 |
@@ -591,52 +596,52 @@
|
|
|
833980 |
9000/[678][0-9][0-9])
|
|
|
833980 |
if [ -x /usr/bin/getconf ]; then
|
|
|
833980 |
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
|
|
|
833980 |
- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
|
|
|
833980 |
- case "${sc_cpu_version}" in
|
|
|
833980 |
- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
|
|
|
833980 |
- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
|
|
|
833980 |
- 532) # CPU_PA_RISC2_0
|
|
|
833980 |
- case "${sc_kernel_bits}" in
|
|
|
833980 |
- 32) HP_ARCH="hppa2.0n" ;;
|
|
|
833980 |
- 64) HP_ARCH="hppa2.0w" ;;
|
|
|
833980 |
+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
|
|
|
833980 |
+ case "${sc_cpu_version}" in
|
|
|
833980 |
+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
|
|
|
833980 |
+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
|
|
|
833980 |
+ 532) # CPU_PA_RISC2_0
|
|
|
833980 |
+ case "${sc_kernel_bits}" in
|
|
|
833980 |
+ 32) HP_ARCH="hppa2.0n" ;;
|
|
|
833980 |
+ 64) HP_ARCH="hppa2.0w" ;;
|
|
|
833980 |
'') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
|
|
|
833980 |
- esac ;;
|
|
|
833980 |
- esac
|
|
|
833980 |
+ esac ;;
|
|
|
833980 |
+ esac
|
|
|
833980 |
fi
|
|
|
833980 |
if [ "${HP_ARCH}" = "" ]; then
|
|
|
833980 |
eval $set_cc_for_build
|
|
|
833980 |
- sed 's/^ //' << EOF >$dummy.c
|
|
|
833980 |
+ sed 's/^ //' << EOF >$dummy.c
|
|
|
833980 |
+
|
|
|
833980 |
+ #define _HPUX_SOURCE
|
|
|
833980 |
+ #include <stdlib.h>
|
|
|
833980 |
+ #include <unistd.h>
|
|
|
833980 |
+
|
|
|
833980 |
+ int main ()
|
|
|
833980 |
+ {
|
|
|
833980 |
+ #if defined(_SC_KERNEL_BITS)
|
|
|
833980 |
+ long bits = sysconf(_SC_KERNEL_BITS);
|
|
|
833980 |
+ #endif
|
|
|
833980 |
+ long cpu = sysconf (_SC_CPU_VERSION);
|
|
|
833980 |
|
|
|
833980 |
- #define _HPUX_SOURCE
|
|
|
833980 |
- #include <stdlib.h>
|
|
|
833980 |
- #include <unistd.h>
|
|
|
833980 |
-
|
|
|
833980 |
- int main ()
|
|
|
833980 |
- {
|
|
|
833980 |
- #if defined(_SC_KERNEL_BITS)
|
|
|
833980 |
- long bits = sysconf(_SC_KERNEL_BITS);
|
|
|
833980 |
- #endif
|
|
|
833980 |
- long cpu = sysconf (_SC_CPU_VERSION);
|
|
|
833980 |
-
|
|
|
833980 |
- switch (cpu)
|
|
|
833980 |
- {
|
|
|
833980 |
- case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
|
|
|
833980 |
- case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
|
|
|
833980 |
- case CPU_PA_RISC2_0:
|
|
|
833980 |
- #if defined(_SC_KERNEL_BITS)
|
|
|
833980 |
- switch (bits)
|
|
|
833980 |
- {
|
|
|
833980 |
- case 64: puts ("hppa2.0w"); break;
|
|
|
833980 |
- case 32: puts ("hppa2.0n"); break;
|
|
|
833980 |
- default: puts ("hppa2.0"); break;
|
|
|
833980 |
- } break;
|
|
|
833980 |
- #else /* !defined(_SC_KERNEL_BITS) */
|
|
|
833980 |
- puts ("hppa2.0"); break;
|
|
|
833980 |
- #endif
|
|
|
833980 |
- default: puts ("hppa1.0"); break;
|
|
|
833980 |
- }
|
|
|
833980 |
- exit (0);
|
|
|
833980 |
- }
|
|
|
833980 |
+ switch (cpu)
|
|
|
833980 |
+ {
|
|
|
833980 |
+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
|
|
|
833980 |
+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
|
|
|
833980 |
+ case CPU_PA_RISC2_0:
|
|
|
833980 |
+ #if defined(_SC_KERNEL_BITS)
|
|
|
833980 |
+ switch (bits)
|
|
|
833980 |
+ {
|
|
|
833980 |
+ case 64: puts ("hppa2.0w"); break;
|
|
|
833980 |
+ case 32: puts ("hppa2.0n"); break;
|
|
|
833980 |
+ default: puts ("hppa2.0"); break;
|
|
|
833980 |
+ } break;
|
|
|
833980 |
+ #else /* !defined(_SC_KERNEL_BITS) */
|
|
|
833980 |
+ puts ("hppa2.0"); break;
|
|
|
833980 |
+ #endif
|
|
|
833980 |
+ default: puts ("hppa1.0"); break;
|
|
|
833980 |
+ }
|
|
|
833980 |
+ exit (0);
|
|
|
833980 |
+ }
|
|
|
833980 |
EOF
|
|
|
833980 |
(CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
|
|
|
833980 |
test -z "$HP_ARCH" && HP_ARCH=hppa
|
|
|
833980 |
@@ -727,22 +732,22 @@
|
|
|
833980 |
exit ;;
|
|
|
833980 |
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
|
|
|
833980 |
echo c1-convex-bsd
|
|
|
833980 |
- exit ;;
|
|
|
833980 |
+ exit ;;
|
|
|
833980 |
C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
|
|
|
833980 |
if getsysinfo -f scalar_acc
|
|
|
833980 |
then echo c32-convex-bsd
|
|
|
833980 |
else echo c2-convex-bsd
|
|
|
833980 |
fi
|
|
|
833980 |
- exit ;;
|
|
|
833980 |
+ exit ;;
|
|
|
833980 |
C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
|
|
|
833980 |
echo c34-convex-bsd
|
|
|
833980 |
- exit ;;
|
|
|
833980 |
+ exit ;;
|
|
|
833980 |
C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
|
|
|
833980 |
echo c38-convex-bsd
|
|
|
833980 |
- exit ;;
|
|
|
833980 |
+ exit ;;
|
|
|
833980 |
C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
|
|
|
833980 |
echo c4-convex-bsd
|
|
|
833980 |
- exit ;;
|
|
|
833980 |
+ exit ;;
|
|
|
833980 |
CRAY*Y-MP:*:*:*)
|
|
|
833980 |
echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
|
|
|
833980 |
exit ;;
|
|
|
833980 |
@@ -766,14 +771,14 @@
|
|
|
833980 |
exit ;;
|
|
|
833980 |
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
|
|
|
833980 |
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
|
|
|
833980 |
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
|
|
|
833980 |
- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
|
|
|
833980 |
- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
|
|
|
833980 |
- exit ;;
|
|
|
833980 |
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
|
|
|
833980 |
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
|
|
|
833980 |
+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
|
|
|
833980 |
+ exit ;;
|
|
|
833980 |
5000:UNIX_System_V:4.*:*)
|
|
|
833980 |
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
|
|
|
833980 |
- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
|
|
|
833980 |
- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
|
|
|
833980 |
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
|
|
|
833980 |
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
|
|
|
833980 |
+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
|
|
|
833980 |
exit ;;
|
|
|
833980 |
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
|
|
|
833980 |
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
|
|
|
833980 |
@@ -785,13 +790,12 @@
|
|
|
833980 |
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
|
|
|
833980 |
exit ;;
|
|
|
833980 |
*:FreeBSD:*:*)
|
|
|
833980 |
- case ${UNAME_MACHINE} in
|
|
|
833980 |
- pc98)
|
|
|
833980 |
- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
|
|
|
833980 |
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
|
|
|
833980 |
+ case ${UNAME_PROCESSOR} in
|
|
|
833980 |
amd64)
|
|
|
833980 |
echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
|
|
|
833980 |
*)
|
|
|
833980 |
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
|
|
|
833980 |
+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
|
|
|
833980 |
esac
|
|
|
833980 |
exit ;;
|
|
|
833980 |
i*:CYGWIN*:*)
|
|
|
833980 |
@@ -800,19 +804,22 @@
|
|
|
833980 |
*:MINGW*:*)
|
|
|
833980 |
echo ${UNAME_MACHINE}-pc-mingw32
|
|
|
833980 |
exit ;;
|
|
|
833980 |
+ i*:MSYS*:*)
|
|
|
833980 |
+ echo ${UNAME_MACHINE}-pc-msys
|
|
|
833980 |
+ exit ;;
|
|
|
833980 |
i*:windows32*:*)
|
|
|
833980 |
- # uname -m includes "-pc" on this system.
|
|
|
833980 |
- echo ${UNAME_MACHINE}-mingw32
|
|
|
833980 |
+ # uname -m includes "-pc" on this system.
|
|
|
833980 |
+ echo ${UNAME_MACHINE}-mingw32
|
|
|
833980 |
exit ;;
|
|
|
833980 |
i*:PW*:*)
|
|
|
833980 |
echo ${UNAME_MACHINE}-pc-pw32
|
|
|
833980 |
exit ;;
|
|
|
833980 |
- *:Interix*:[3456]*)
|
|
|
833980 |
- case ${UNAME_MACHINE} in
|
|
|
833980 |
+ *:Interix*:*)
|
|
|
833980 |
+ case ${UNAME_MACHINE} in
|
|
|
833980 |
x86)
|
|
|
833980 |
echo i586-pc-interix${UNAME_RELEASE}
|
|
|
833980 |
exit ;;
|
|
|
833980 |
- EM64T | authenticamd | genuineintel)
|
|
|
833980 |
+ authenticamd | genuineintel | EM64T)
|
|
|
833980 |
echo x86_64-unknown-interix${UNAME_RELEASE}
|
|
|
833980 |
exit ;;
|
|
|
833980 |
IA64)
|
|
|
833980 |
@@ -854,6 +861,27 @@
|
|
|
833980 |
i*86:Minix:*:*)
|
|
|
833980 |
echo ${UNAME_MACHINE}-pc-minix
|
|
|
833980 |
exit ;;
|
|
|
833980 |
+ aarch64:Linux:*:*)
|
|
|
833980 |
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
|
833980 |
+ exit ;;
|
|
|
833980 |
+ aarch64_be:Linux:*:*)
|
|
|
833980 |
+ UNAME_MACHINE=aarch64_be
|
|
|
833980 |
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
|
833980 |
+ exit ;;
|
|
|
833980 |
+ alpha:Linux:*:*)
|
|
|
833980 |
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
|
|
|
833980 |
+ EV5) UNAME_MACHINE=alphaev5 ;;
|
|
|
833980 |
+ EV56) UNAME_MACHINE=alphaev56 ;;
|
|
|
833980 |
+ PCA56) UNAME_MACHINE=alphapca56 ;;
|
|
|
833980 |
+ PCA57) UNAME_MACHINE=alphapca56 ;;
|
|
|
833980 |
+ EV6) UNAME_MACHINE=alphaev6 ;;
|
|
|
833980 |
+ EV67) UNAME_MACHINE=alphaev67 ;;
|
|
|
833980 |
+ EV68*) UNAME_MACHINE=alphaev68 ;;
|
|
|
833980 |
+ esac
|
|
|
833980 |
+ objdump --private-headers /bin/sh | grep -q ld.so.1
|
|
|
833980 |
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
|
|
|
833980 |
+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
|
|
|
833980 |
+ exit ;;
|
|
|
833980 |
arm*:Linux:*:*)
|
|
|
833980 |
eval $set_cc_for_build
|
|
|
833980 |
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
|
|
|
833980 |
@@ -861,20 +889,40 @@
|
|
|
833980 |
then
|
|
|
833980 |
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
|
833980 |
else
|
|
|
833980 |
- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
|
|
|
833980 |
+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
|
|
|
833980 |
+ | grep -q __ARM_PCS_VFP
|
|
|
833980 |
+ then
|
|
|
833980 |
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
|
|
|
833980 |
+ else
|
|
|
833980 |
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
|
|
|
833980 |
+ fi
|
|
|
833980 |
fi
|
|
|
833980 |
exit ;;
|
|
|
833980 |
avr32*:Linux:*:*)
|
|
|
833980 |
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
|
833980 |
exit ;;
|
|
|
833980 |
cris:Linux:*:*)
|
|
|
833980 |
- echo cris-axis-linux-gnu
|
|
|
833980 |
+ echo ${UNAME_MACHINE}-axis-linux-gnu
|
|
|
833980 |
exit ;;
|
|
|
833980 |
crisv32:Linux:*:*)
|
|
|
833980 |
- echo crisv32-axis-linux-gnu
|
|
|
833980 |
+ echo ${UNAME_MACHINE}-axis-linux-gnu
|
|
|
833980 |
exit ;;
|
|
|
833980 |
frv:Linux:*:*)
|
|
|
833980 |
- echo frv-unknown-linux-gnu
|
|
|
833980 |
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
|
833980 |
+ exit ;;
|
|
|
833980 |
+ hexagon:Linux:*:*)
|
|
|
833980 |
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
|
833980 |
+ exit ;;
|
|
|
833980 |
+ i*86:Linux:*:*)
|
|
|
833980 |
+ LIBC=gnu
|
|
|
833980 |
+ eval $set_cc_for_build
|
|
|
833980 |
+ sed 's/^ //' << EOF >$dummy.c
|
|
|
833980 |
+ #ifdef __dietlibc__
|
|
|
833980 |
+ LIBC=dietlibc
|
|
|
833980 |
+ #endif
|
|
|
833980 |
+EOF
|
|
|
833980 |
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
|
|
|
833980 |
+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
|
|
|
833980 |
exit ;;
|
|
|
833980 |
ia64:Linux:*:*)
|
|
|
833980 |
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
|
833980 |
@@ -901,39 +949,18 @@
|
|
|
833980 |
#endif
|
|
|
833980 |
#endif
|
|
|
833980 |
EOF
|
|
|
833980 |
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
|
|
|
833980 |
- /^CPU/{
|
|
|
833980 |
- s: ::g
|
|
|
833980 |
- p
|
|
|
833980 |
- }'`"
|
|
|
833980 |
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
|
|
|
833980 |
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
|
|
|
833980 |
;;
|
|
|
833980 |
or32:Linux:*:*)
|
|
|
833980 |
- echo or32-unknown-linux-gnu
|
|
|
833980 |
- exit ;;
|
|
|
833980 |
- ppc:Linux:*:*)
|
|
|
833980 |
- echo powerpc-unknown-linux-gnu
|
|
|
833980 |
- exit ;;
|
|
|
833980 |
- ppc64:Linux:*:*)
|
|
|
833980 |
- echo powerpc64-unknown-linux-gnu
|
|
|
833980 |
- exit ;;
|
|
|
833980 |
- alpha:Linux:*:*)
|
|
|
833980 |
- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
|
|
|
833980 |
- EV5) UNAME_MACHINE=alphaev5 ;;
|
|
|
833980 |
- EV56) UNAME_MACHINE=alphaev56 ;;
|
|
|
833980 |
- PCA56) UNAME_MACHINE=alphapca56 ;;
|
|
|
833980 |
- PCA57) UNAME_MACHINE=alphapca56 ;;
|
|
|
833980 |
- EV6) UNAME_MACHINE=alphaev6 ;;
|
|
|
833980 |
- EV67) UNAME_MACHINE=alphaev67 ;;
|
|
|
833980 |
- EV68*) UNAME_MACHINE=alphaev68 ;;
|
|
|
833980 |
- esac
|
|
|
833980 |
- objdump --private-headers /bin/sh | grep -q ld.so.1
|
|
|
833980 |
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
|
|
|
833980 |
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
|
|
|
833980 |
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
|
833980 |
exit ;;
|
|
|
833980 |
padre:Linux:*:*)
|
|
|
833980 |
echo sparc-unknown-linux-gnu
|
|
|
833980 |
exit ;;
|
|
|
833980 |
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
|
|
|
833980 |
+ echo hppa64-unknown-linux-gnu
|
|
|
833980 |
+ exit ;;
|
|
|
833980 |
parisc:Linux:*:* | hppa:Linux:*:*)
|
|
|
833980 |
# Look for CPU level
|
|
|
833980 |
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
|
|
|
833980 |
@@ -942,14 +969,17 @@
|
|
|
833980 |
*) echo hppa-unknown-linux-gnu ;;
|
|
|
833980 |
esac
|
|
|
833980 |
exit ;;
|
|
|
833980 |
- parisc64:Linux:*:* | hppa64:Linux:*:*)
|
|
|
833980 |
- echo hppa64-unknown-linux-gnu
|
|
|
833980 |
+ ppc64:Linux:*:*)
|
|
|
833980 |
+ echo powerpc64-unknown-linux-gnu
|
|
|
833980 |
+ exit ;;
|
|
|
833980 |
+ ppc:Linux:*:*)
|
|
|
833980 |
+ echo powerpc-unknown-linux-gnu
|
|
|
833980 |
exit ;;
|
|
|
833980 |
s390:Linux:*:* | s390x:Linux:*:*)
|
|
|
833980 |
echo ${UNAME_MACHINE}-ibm-linux
|
|
|
833980 |
exit ;;
|
|
|
833980 |
sh64*:Linux:*:*)
|
|
|
833980 |
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
|
833980 |
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
|
833980 |
exit ;;
|
|
|
833980 |
sh*:Linux:*:*)
|
|
|
833980 |
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
|
833980 |
@@ -957,67 +987,18 @@
|
|
|
833980 |
sparc:Linux:*:* | sparc64:Linux:*:*)
|
|
|
833980 |
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
|
833980 |
exit ;;
|
|
|
833980 |
+ tile*:Linux:*:*)
|
|
|
833980 |
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
|
833980 |
+ exit ;;
|
|
|
833980 |
vax:Linux:*:*)
|
|
|
833980 |
echo ${UNAME_MACHINE}-dec-linux-gnu
|
|
|
833980 |
exit ;;
|
|
|
833980 |
x86_64:Linux:*:*)
|
|
|
833980 |
- echo x86_64-unknown-linux-gnu
|
|
|
833980 |
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
|
833980 |
exit ;;
|
|
|
833980 |
xtensa*:Linux:*:*)
|
|
|
833980 |
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
|
833980 |
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
|
833980 |
exit ;;
|
|
|
833980 |
- i*86:Linux:*:*)
|
|
|
833980 |
- # The BFD linker knows what the default object file format is, so
|
|
|
833980 |
- # first see if it will tell us. cd to the root directory to prevent
|
|
|
833980 |
- # problems with other programs or directories called `ld' in the path.
|
|
|
833980 |
- # Set LC_ALL=C to ensure ld outputs messages in English.
|
|
|
833980 |
- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
|
|
|
833980 |
- | sed -ne '/supported targets:/!d
|
|
|
833980 |
- s/[ ][ ]*/ /g
|
|
|
833980 |
- s/.*supported targets: *//
|
|
|
833980 |
- s/ .*//
|
|
|
833980 |
- p'`
|
|
|
833980 |
- case "$ld_supported_targets" in
|
|
|
833980 |
- elf32-i386)
|
|
|
833980 |
- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
|
|
|
833980 |
- ;;
|
|
|
833980 |
- esac
|
|
|
833980 |
- # Determine whether the default compiler is a.out or elf
|
|
|
833980 |
- eval $set_cc_for_build
|
|
|
833980 |
- sed 's/^ //' << EOF >$dummy.c
|
|
|
833980 |
- #include <features.h>
|
|
|
833980 |
- #ifdef __ELF__
|
|
|
833980 |
- # ifdef __GLIBC__
|
|
|
833980 |
- # if __GLIBC__ >= 2
|
|
|
833980 |
- LIBC=gnu
|
|
|
833980 |
- # else
|
|
|
833980 |
- LIBC=gnulibc1
|
|
|
833980 |
- # endif
|
|
|
833980 |
- # else
|
|
|
833980 |
- LIBC=gnulibc1
|
|
|
833980 |
- # endif
|
|
|
833980 |
- #else
|
|
|
833980 |
- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
|
|
|
833980 |
- LIBC=gnu
|
|
|
833980 |
- #else
|
|
|
833980 |
- LIBC=gnuaout
|
|
|
833980 |
- #endif
|
|
|
833980 |
- #endif
|
|
|
833980 |
- #ifdef __dietlibc__
|
|
|
833980 |
- LIBC=dietlibc
|
|
|
833980 |
- #endif
|
|
|
833980 |
-EOF
|
|
|
833980 |
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
|
|
|
833980 |
- /^LIBC/{
|
|
|
833980 |
- s: ::g
|
|
|
833980 |
- p
|
|
|
833980 |
- }'`"
|
|
|
833980 |
- test x"${LIBC}" != x && {
|
|
|
833980 |
- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
|
|
|
833980 |
- exit
|
|
|
833980 |
- }
|
|
|
833980 |
- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
|
|
|
833980 |
- ;;
|
|
|
833980 |
i*86:DYNIX/ptx:4*:*)
|
|
|
833980 |
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
|
|
|
833980 |
# earlier versions are messed up and put the nodename in both
|
|
|
833980 |
@@ -1025,11 +1006,11 @@
|
|
|
833980 |
echo i386-sequent-sysv4
|
|
|
833980 |
exit ;;
|
|
|
833980 |
i*86:UNIX_SV:4.2MP:2.*)
|
|
|
833980 |
- # Unixware is an offshoot of SVR4, but it has its own version
|
|
|
833980 |
- # number series starting with 2...
|
|
|
833980 |
- # I am not positive that other SVR4 systems won't match this,
|
|
|
833980 |
+ # Unixware is an offshoot of SVR4, but it has its own version
|
|
|
833980 |
+ # number series starting with 2...
|
|
|
833980 |
+ # I am not positive that other SVR4 systems won't match this,
|
|
|
833980 |
# I just have to hope. -- rms.
|
|
|
833980 |
- # Use sysv4.2uw... so that sysv4* matches it.
|
|
|
833980 |
+ # Use sysv4.2uw... so that sysv4* matches it.
|
|
|
833980 |
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
|
|
|
833980 |
exit ;;
|
|
|
833980 |
i*86:OS/2:*:*)
|
|
|
833980 |
@@ -1061,7 +1042,7 @@
|
|
|
833980 |
fi
|
|
|
833980 |
exit ;;
|
|
|
833980 |
i*86:*:5:[678]*)
|
|
|
833980 |
- # UnixWare 7.x, OpenUNIX and OpenServer 6.
|
|
|
833980 |
+ # UnixWare 7.x, OpenUNIX and OpenServer 6.
|
|
|
833980 |
case `/bin/uname -X | grep "^Machine"` in
|
|
|
833980 |
*486*) UNAME_MACHINE=i486 ;;
|
|
|
833980 |
*Pentium) UNAME_MACHINE=i586 ;;
|
|
|
833980 |
@@ -1089,13 +1070,13 @@
|
|
|
833980 |
exit ;;
|
|
|
833980 |
pc:*:*:*)
|
|
|
833980 |
# Left here for compatibility:
|
|
|
833980 |
- # uname -m prints for DJGPP always 'pc', but it prints nothing about
|
|
|
833980 |
- # the processor, so we play safe by assuming i586.
|
|
|
833980 |
+ # uname -m prints for DJGPP always 'pc', but it prints nothing about
|
|
|
833980 |
+ # the processor, so we play safe by assuming i586.
|
|
|
833980 |
# Note: whatever this is, it MUST be the same as what config.sub
|
|
|
833980 |
# prints for the "djgpp" host, or else GDB configury will decide that
|
|
|
833980 |
# this is a cross-build.
|
|
|
833980 |
echo i586-pc-msdosdjgpp
|
|
|
833980 |
- exit ;;
|
|
|
833980 |
+ exit ;;
|
|
|
833980 |
Intel:Mach:3*:*)
|
|
|
833980 |
echo i386-pc-mach3
|
|
|
833980 |
exit ;;
|
|
|
833980 |
@@ -1130,8 +1111,8 @@
|
|
|
833980 |
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
|
|
|
833980 |
&& { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
|
|
|
833980 |
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
|
|
|
833980 |
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
|
|
|
833980 |
- && { echo i486-ncr-sysv4; exit; } ;;
|
|
|
833980 |
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
|
|
|
833980 |
+ && { echo i486-ncr-sysv4; exit; } ;;
|
|
|
833980 |
NCR*:*:4.2:* | MPRAS*:*:4.2:*)
|
|
|
833980 |
OS_REL='.3'
|
|
|
833980 |
test -r /etc/.relid \
|
|
|
833980 |
@@ -1174,10 +1155,10 @@
|
|
|
833980 |
echo ns32k-sni-sysv
|
|
|
833980 |
fi
|
|
|
833980 |
exit ;;
|
|
|
833980 |
- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
|
|
|
833980 |
- # says <Richard.M.Bartel@ccMail.Census.GOV>
|
|
|
833980 |
- echo i586-unisys-sysv4
|
|
|
833980 |
- exit ;;
|
|
|
833980 |
+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
|
|
|
833980 |
+ # says <Richard.M.Bartel@ccMail.Census.GOV>
|
|
|
833980 |
+ echo i586-unisys-sysv4
|
|
|
833980 |
+ exit ;;
|
|
|
833980 |
*:UNIX_System_V:4*:FTX*)
|
|
|
833980 |
# From Gerald Hewes <hewes@openmarket.com>.
|
|
|
833980 |
# How about differentiating between stratus architectures? -djm
|
|
|
833980 |
@@ -1203,11 +1184,11 @@
|
|
|
833980 |
exit ;;
|
|
|
833980 |
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
|
|
|
833980 |
if [ -d /usr/nec ]; then
|
|
|
833980 |
- echo mips-nec-sysv${UNAME_RELEASE}
|
|
|
833980 |
+ echo mips-nec-sysv${UNAME_RELEASE}
|
|
|
833980 |
else
|
|
|
833980 |
- echo mips-unknown-sysv${UNAME_RELEASE}
|
|
|
833980 |
+ echo mips-unknown-sysv${UNAME_RELEASE}
|
|
|
833980 |
fi
|
|
|
833980 |
- exit ;;
|
|
|
833980 |
+ exit ;;
|
|
|
833980 |
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
|
|
|
833980 |
echo powerpc-be-beos
|
|
|
833980 |
exit ;;
|
|
|
833980 |
@@ -1247,6 +1228,16 @@
|
|
|
833980 |
*:Darwin:*:*)
|
|
|
833980 |
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
|
|
|
833980 |
case $UNAME_PROCESSOR in
|
|
|
833980 |
+ i386)
|
|
|
833980 |
+ eval $set_cc_for_build
|
|
|
833980 |
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
|
|
|
833980 |
+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
|
|
|
833980 |
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
|
|
|
833980 |
+ grep IS_64BIT_ARCH >/dev/null
|
|
|
833980 |
+ then
|
|
|
833980 |
+ UNAME_PROCESSOR="x86_64"
|
|
|
833980 |
+ fi
|
|
|
833980 |
+ fi ;;
|
|
|
833980 |
unknown) UNAME_PROCESSOR=powerpc ;;
|
|
|
833980 |
esac
|
|
|
833980 |
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
|
|
|
833980 |
@@ -1262,6 +1253,9 @@
|
|
|
833980 |
*:QNX:*:4*)
|
|
|
833980 |
echo i386-pc-qnx
|
|
|
833980 |
exit ;;
|
|
|
833980 |
+ NEO-?:NONSTOP_KERNEL:*:*)
|
|
|
833980 |
+ echo neo-tandem-nsk${UNAME_RELEASE}
|
|
|
833980 |
+ exit ;;
|
|
|
833980 |
NSE-?:NONSTOP_KERNEL:*:*)
|
|
|
833980 |
echo nse-tandem-nsk${UNAME_RELEASE}
|
|
|
833980 |
exit ;;
|
|
|
833980 |
@@ -1307,13 +1301,13 @@
|
|
|
833980 |
echo pdp10-unknown-its
|
|
|
833980 |
exit ;;
|
|
|
833980 |
SEI:*:*:SEIUX)
|
|
|
833980 |
- echo mips-sei-seiux${UNAME_RELEASE}
|
|
|
833980 |
+ echo mips-sei-seiux${UNAME_RELEASE}
|
|
|
833980 |
exit ;;
|
|
|
833980 |
*:DragonFly:*:*)
|
|
|
833980 |
echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
|
|
|
833980 |
exit ;;
|
|
|
833980 |
*:*VMS:*:*)
|
|
|
833980 |
- UNAME_MACHINE=`(uname -p) 2>/dev/null`
|
|
|
833980 |
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
|
|
|
833980 |
case "${UNAME_MACHINE}" in
|
|
|
833980 |
A*) echo alpha-dec-vms ; exit ;;
|
|
|
833980 |
I*) echo ia64-dec-vms ; exit ;;
|
|
|
833980 |
@@ -1331,6 +1325,9 @@
|
|
|
833980 |
i*86:AROS:*:*)
|
|
|
833980 |
echo ${UNAME_MACHINE}-pc-aros
|
|
|
833980 |
exit ;;
|
|
|
833980 |
+ x86_64:VMkernel:*:*)
|
|
|
833980 |
+ echo ${UNAME_MACHINE}-unknown-esx
|
|
|
833980 |
+ exit ;;
|
|
|
833980 |
esac
|
|
|
833980 |
|
|
|
833980 |
#echo '(No uname command or uname output not recognized.)' 1>&2
|
|
|
833980 |
@@ -1353,11 +1350,11 @@
|
|
|
833980 |
#include <sys/param.h>
|
|
|
833980 |
printf ("m68k-sony-newsos%s\n",
|
|
|
833980 |
#ifdef NEWSOS4
|
|
|
833980 |
- "4"
|
|
|
833980 |
+ "4"
|
|
|
833980 |
#else
|
|
|
833980 |
- ""
|
|
|
833980 |
+ ""
|
|
|
833980 |
#endif
|
|
|
833980 |
- ); exit (0);
|
|
|
833980 |
+ ); exit (0);
|
|
|
833980 |
#endif
|
|
|
833980 |
#endif
|
|
|
833980 |
|
|
|
833980 |
diff -u -Naur potrace-1.11/config.sub potrace-1.11-patched/config.sub
|
|
|
833980 |
--- potrace-1.11/config.sub 2010-11-04 23:08:34.000000000 -0300
|
|
|
833980 |
+++ potrace-1.11-patched/config.sub 2013-05-14 17:54:51.363873585 -0300
|
|
|
833980 |
@@ -1,10 +1,10 @@
|
|
|
833980 |
#! /bin/sh
|
|
|
833980 |
# Configuration validation subroutine script.
|
|
|
833980 |
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
|
|
833980 |
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
|
|
|
833980 |
-# Free Software Foundation, Inc.
|
|
|
833980 |
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
|
|
|
833980 |
+# 2011, 2012 Free Software Foundation, Inc.
|
|
|
833980 |
|
|
|
833980 |
-timestamp='2009-06-11'
|
|
|
833980 |
+timestamp='2012-04-18'
|
|
|
833980 |
|
|
|
833980 |
# This file is (in principle) common to ALL GNU software.
|
|
|
833980 |
# The presence of a machine in this file suggests that SOME GNU software
|
|
|
833980 |
@@ -21,9 +21,7 @@
|
|
|
833980 |
# GNU General Public License for more details.
|
|
|
833980 |
#
|
|
|
833980 |
# You should have received a copy of the GNU General Public License
|
|
|
833980 |
-# along with this program; if not, write to the Free Software
|
|
|
833980 |
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
|
|
|
833980 |
-# 02110-1301, USA.
|
|
|
833980 |
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
|
833980 |
#
|
|
|
833980 |
# As a special exception to the GNU General Public License, if you
|
|
|
833980 |
# distribute this file as part of a program that contains a
|
|
|
833980 |
@@ -32,13 +30,16 @@
|
|
|
833980 |
|
|
|
833980 |
|
|
|
833980 |
# Please send patches to <config-patches@gnu.org>. Submit a context
|
|
|
833980 |
-# diff and a properly formatted ChangeLog entry.
|
|
|
833980 |
+# diff and a properly formatted GNU ChangeLog entry.
|
|
|
833980 |
#
|
|
|
833980 |
# Configuration subroutine to validate and canonicalize a configuration type.
|
|
|
833980 |
# Supply the specified configuration type as an argument.
|
|
|
833980 |
# If it is invalid, we print an error message on stderr and exit with code 1.
|
|
|
833980 |
# Otherwise, we print the canonical config type on stdout and succeed.
|
|
|
833980 |
|
|
|
833980 |
+# You can get the latest version of this script from:
|
|
|
833980 |
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
|
|
|
833980 |
+
|
|
|
833980 |
# This file is supposed to be the same for all GNU packages
|
|
|
833980 |
# and recognize all the CPU types, system types and aliases
|
|
|
833980 |
# that are meaningful with *any* GNU software.
|
|
|
833980 |
@@ -72,8 +73,9 @@
|
|
|
833980 |
version="\
|
|
|
833980 |
GNU config.sub ($timestamp)
|
|
|
833980 |
|
|
|
833980 |
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
|
|
|
833980 |
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
|
|
833980 |
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
|
|
|
833980 |
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
|
|
|
833980 |
+Free Software Foundation, Inc.
|
|
|
833980 |
|
|
|
833980 |
This is free software; see the source for copying conditions. There is NO
|
|
|
833980 |
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
|
|
833980 |
@@ -120,13 +122,18 @@
|
|
|
833980 |
# Here we must recognize all the valid KERNEL-OS combinations.
|
|
|
833980 |
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
|
|
|
833980 |
case $maybe_os in
|
|
|
833980 |
- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
|
|
|
833980 |
- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
|
|
|
833980 |
+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
|
|
|
833980 |
+ linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
|
|
|
833980 |
+ knetbsd*-gnu* | netbsd*-gnu* | \
|
|
|
833980 |
kopensolaris*-gnu* | \
|
|
|
833980 |
storm-chaos* | os2-emx* | rtmk-nova*)
|
|
|
833980 |
os=-$maybe_os
|
|
|
833980 |
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
|
|
|
833980 |
;;
|
|
|
833980 |
+ android-linux)
|
|
|
833980 |
+ os=-linux-android
|
|
|
833980 |
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
|
|
|
833980 |
+ ;;
|
|
|
833980 |
*)
|
|
|
833980 |
basic_machine=`echo $1 | sed 's/-[^-]*$//'`
|
|
|
833980 |
if [ $basic_machine != $1 ]
|
|
|
833980 |
@@ -149,12 +156,12 @@
|
|
|
833980 |
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
|
|
|
833980 |
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
|
|
|
833980 |
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
|
|
|
833980 |
- -apple | -axis | -knuth | -cray)
|
|
|
833980 |
+ -apple | -axis | -knuth | -cray | -microblaze)
|
|
|
833980 |
os=
|
|
|
833980 |
basic_machine=$1
|
|
|
833980 |
;;
|
|
|
833980 |
- -bluegene*)
|
|
|
833980 |
- os=-cnk
|
|
|
833980 |
+ -bluegene*)
|
|
|
833980 |
+ os=-cnk
|
|
|
833980 |
;;
|
|
|
833980 |
-sim | -cisco | -oki | -wec | -winbond)
|
|
|
833980 |
os=
|
|
|
833980 |
@@ -170,10 +177,10 @@
|
|
|
833980 |
os=-chorusos
|
|
|
833980 |
basic_machine=$1
|
|
|
833980 |
;;
|
|
|
833980 |
- -chorusrdb)
|
|
|
833980 |
- os=-chorusrdb
|
|
|
833980 |
+ -chorusrdb)
|
|
|
833980 |
+ os=-chorusrdb
|
|
|
833980 |
basic_machine=$1
|
|
|
833980 |
- ;;
|
|
|
833980 |
+ ;;
|
|
|
833980 |
-hiux*)
|
|
|
833980 |
os=-hiuxwe2
|
|
|
833980 |
;;
|
|
|
833980 |
@@ -218,6 +225,12 @@
|
|
|
833980 |
-isc*)
|
|
|
833980 |
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
|
|
833980 |
;;
|
|
|
833980 |
+ -lynx*178)
|
|
|
833980 |
+ os=-lynxos178
|
|
|
833980 |
+ ;;
|
|
|
833980 |
+ -lynx*5)
|
|
|
833980 |
+ os=-lynxos5
|
|
|
833980 |
+ ;;
|
|
|
833980 |
-lynx*)
|
|
|
833980 |
os=-lynxos
|
|
|
833980 |
;;
|
|
|
833980 |
@@ -242,17 +255,22 @@
|
|
|
833980 |
# Some are omitted here because they have special meanings below.
|
|
|
833980 |
1750a | 580 \
|
|
|
833980 |
| a29k \
|
|
|
833980 |
+ | aarch64 | aarch64_be \
|
|
|
833980 |
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
|
|
|
833980 |
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
|
|
|
833980 |
| am33_2.0 \
|
|
|
833980 |
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
|
|
|
833980 |
+ | be32 | be64 \
|
|
|
833980 |
| bfin \
|
|
|
833980 |
| c4x | clipper \
|
|
|
833980 |
| d10v | d30v | dlx | dsp16xx \
|
|
|
833980 |
+ | epiphany \
|
|
|
833980 |
| fido | fr30 | frv \
|
|
|
833980 |
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
|
|
|
833980 |
+ | hexagon \
|
|
|
833980 |
| i370 | i860 | i960 | ia64 \
|
|
|
833980 |
| ip2k | iq2000 \
|
|
|
833980 |
+ | le32 | le64 \
|
|
|
833980 |
| lm32 \
|
|
|
833980 |
| m32c | m32r | m32rle | m68000 | m68k | m88k \
|
|
|
833980 |
| maxq | mb | microblaze | mcore | mep | metag \
|
|
|
833980 |
@@ -278,27 +296,39 @@
|
|
|
833980 |
| moxie \
|
|
|
833980 |
| mt \
|
|
|
833980 |
| msp430 \
|
|
|
833980 |
+ | nds32 | nds32le | nds32be \
|
|
|
833980 |
| nios | nios2 \
|
|
|
833980 |
| ns16k | ns32k \
|
|
|
833980 |
+ | open8 \
|
|
|
833980 |
| or32 \
|
|
|
833980 |
| pdp10 | pdp11 | pj | pjl \
|
|
|
833980 |
- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
|
|
|
833980 |
+ | powerpc | powerpc64 | powerpc64le | powerpcle \
|
|
|
833980 |
| pyramid \
|
|
|
833980 |
+ | rl78 | rx \
|
|
|
833980 |
| score \
|
|
|
833980 |
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
|
|
|
833980 |
| sh64 | sh64le \
|
|
|
833980 |
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
|
|
|
833980 |
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
|
|
|
833980 |
- | spu | strongarm \
|
|
|
833980 |
- | tahoe | thumb | tic4x | tic80 | tron \
|
|
|
833980 |
- | v850 | v850e \
|
|
|
833980 |
+ | spu \
|
|
|
833980 |
+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
|
|
|
833980 |
+ | ubicom32 \
|
|
|
833980 |
+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
|
|
|
833980 |
| we32k \
|
|
|
833980 |
- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
|
|
|
833980 |
+ | x86 | xc16x | xstormy16 | xtensa \
|
|
|
833980 |
| z8k | z80)
|
|
|
833980 |
basic_machine=$basic_machine-unknown
|
|
|
833980 |
;;
|
|
|
833980 |
- m6811 | m68hc11 | m6812 | m68hc12)
|
|
|
833980 |
- # Motorola 68HC11/12.
|
|
|
833980 |
+ c54x)
|
|
|
833980 |
+ basic_machine=tic54x-unknown
|
|
|
833980 |
+ ;;
|
|
|
833980 |
+ c55x)
|
|
|
833980 |
+ basic_machine=tic55x-unknown
|
|
|
833980 |
+ ;;
|
|
|
833980 |
+ c6x)
|
|
|
833980 |
+ basic_machine=tic6x-unknown
|
|
|
833980 |
+ ;;
|
|
|
833980 |
+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
|
|
|
833980 |
basic_machine=$basic_machine-unknown
|
|
|
833980 |
os=-none
|
|
|
833980 |
;;
|
|
|
833980 |
@@ -308,6 +338,21 @@
|
|
|
833980 |
basic_machine=mt-unknown
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
+ strongarm | thumb | xscale)
|
|
|
833980 |
+ basic_machine=arm-unknown
|
|
|
833980 |
+ ;;
|
|
|
833980 |
+ xgate)
|
|
|
833980 |
+ basic_machine=$basic_machine-unknown
|
|
|
833980 |
+ os=-none
|
|
|
833980 |
+ ;;
|
|
|
833980 |
+ xscaleeb)
|
|
|
833980 |
+ basic_machine=armeb-unknown
|
|
|
833980 |
+ ;;
|
|
|
833980 |
+
|
|
|
833980 |
+ xscaleel)
|
|
|
833980 |
+ basic_machine=armel-unknown
|
|
|
833980 |
+ ;;
|
|
|
833980 |
+
|
|
|
833980 |
# We use `pc' rather than `unknown'
|
|
|
833980 |
# because (1) that's what they normally are, and
|
|
|
833980 |
# (2) the word "unknown" tends to confuse beginning users.
|
|
|
833980 |
@@ -322,25 +367,29 @@
|
|
|
833980 |
# Recognize the basic CPU types with company name.
|
|
|
833980 |
580-* \
|
|
|
833980 |
| a29k-* \
|
|
|
833980 |
+ | aarch64-* | aarch64_be-* \
|
|
|
833980 |
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
|
|
|
833980 |
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
|
|
|
833980 |
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
|
|
|
833980 |
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
|
|
|
833980 |
| avr-* | avr32-* \
|
|
|
833980 |
+ | be32-* | be64-* \
|
|
|
833980 |
| bfin-* | bs2000-* \
|
|
|
833980 |
- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
|
|
|
833980 |
+ | c[123]* | c30-* | [cjt]90-* | c4x-* \
|
|
|
833980 |
| clipper-* | craynv-* | cydra-* \
|
|
|
833980 |
| d10v-* | d30v-* | dlx-* \
|
|
|
833980 |
| elxsi-* \
|
|
|
833980 |
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
|
|
|
833980 |
| h8300-* | h8500-* \
|
|
|
833980 |
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
|
|
|
833980 |
+ | hexagon-* \
|
|
|
833980 |
| i*86-* | i860-* | i960-* | ia64-* \
|
|
|
833980 |
| ip2k-* | iq2000-* \
|
|
|
833980 |
+ | le32-* | le64-* \
|
|
|
833980 |
| lm32-* \
|
|
|
833980 |
| m32c-* | m32r-* | m32rle-* \
|
|
|
833980 |
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
|
|
|
833980 |
- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
|
|
|
833980 |
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
|
|
|
833980 |
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
|
|
|
833980 |
| mips16-* \
|
|
|
833980 |
| mips64-* | mips64el-* \
|
|
|
833980 |
@@ -362,24 +411,29 @@
|
|
|
833980 |
| mmix-* \
|
|
|
833980 |
| mt-* \
|
|
|
833980 |
| msp430-* \
|
|
|
833980 |
+ | nds32-* | nds32le-* | nds32be-* \
|
|
|
833980 |
| nios-* | nios2-* \
|
|
|
833980 |
| none-* | np1-* | ns16k-* | ns32k-* \
|
|
|
833980 |
+ | open8-* \
|
|
|
833980 |
| orion-* \
|
|
|
833980 |
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
|
|
|
833980 |
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
|
|
|
833980 |
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
|
|
|
833980 |
| pyramid-* \
|
|
|
833980 |
- | romp-* | rs6000-* \
|
|
|
833980 |
+ | rl78-* | romp-* | rs6000-* | rx-* \
|
|
|
833980 |
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
|
|
|
833980 |
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
|
|
|
833980 |
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
|
|
|
833980 |
| sparclite-* \
|
|
|
833980 |
- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
|
|
|
833980 |
- | tahoe-* | thumb-* \
|
|
|
833980 |
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
|
|
|
833980 |
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
|
|
|
833980 |
+ | tahoe-* \
|
|
|
833980 |
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
|
|
|
833980 |
+ | tile*-* \
|
|
|
833980 |
| tron-* \
|
|
|
833980 |
- | v850-* | v850e-* | vax-* \
|
|
|
833980 |
+ | ubicom32-* \
|
|
|
833980 |
+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
|
|
|
833980 |
+ | vax-* \
|
|
|
833980 |
| we32k-* \
|
|
|
833980 |
- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
|
|
|
833980 |
+ | x86-* | x86_64-* | xc16x-* | xps100-* \
|
|
|
833980 |
| xstormy16-* | xtensa*-* \
|
|
|
833980 |
| ymp-* \
|
|
|
833980 |
| z8k-* | z80-*)
|
|
|
833980 |
@@ -404,7 +458,7 @@
|
|
|
833980 |
basic_machine=a29k-amd
|
|
|
833980 |
os=-udi
|
|
|
833980 |
;;
|
|
|
833980 |
- abacus)
|
|
|
833980 |
+ abacus)
|
|
|
833980 |
basic_machine=abacus-unknown
|
|
|
833980 |
;;
|
|
|
833980 |
adobe68k)
|
|
|
833980 |
@@ -474,11 +528,20 @@
|
|
|
833980 |
basic_machine=powerpc-ibm
|
|
|
833980 |
os=-cnk
|
|
|
833980 |
;;
|
|
|
833980 |
+ c54x-*)
|
|
|
833980 |
+ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
|
|
|
833980 |
+ ;;
|
|
|
833980 |
+ c55x-*)
|
|
|
833980 |
+ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
|
|
|
833980 |
+ ;;
|
|
|
833980 |
+ c6x-*)
|
|
|
833980 |
+ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
|
|
|
833980 |
+ ;;
|
|
|
833980 |
c90)
|
|
|
833980 |
basic_machine=c90-cray
|
|
|
833980 |
os=-unicos
|
|
|
833980 |
;;
|
|
|
833980 |
- cegcc)
|
|
|
833980 |
+ cegcc)
|
|
|
833980 |
basic_machine=arm-unknown
|
|
|
833980 |
os=-cegcc
|
|
|
833980 |
;;
|
|
|
833980 |
@@ -510,7 +573,7 @@
|
|
|
833980 |
basic_machine=craynv-cray
|
|
|
833980 |
os=-unicosmp
|
|
|
833980 |
;;
|
|
|
833980 |
- cr16)
|
|
|
833980 |
+ cr16 | cr16-*)
|
|
|
833980 |
basic_machine=cr16-unknown
|
|
|
833980 |
os=-elf
|
|
|
833980 |
;;
|
|
|
833980 |
@@ -668,7 +731,6 @@
|
|
|
833980 |
i370-ibm* | ibm*)
|
|
|
833980 |
basic_machine=i370-ibm
|
|
|
833980 |
;;
|
|
|
833980 |
-# I'm not sure what "Sysv32" means. Should this be sysv3.2?
|
|
|
833980 |
i*86v32)
|
|
|
833980 |
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
|
|
|
833980 |
os=-sysv32
|
|
|
833980 |
@@ -726,6 +788,9 @@
|
|
|
833980 |
basic_machine=ns32k-utek
|
|
|
833980 |
os=-sysv
|
|
|
833980 |
;;
|
|
|
833980 |
+ microblaze)
|
|
|
833980 |
+ basic_machine=microblaze-xilinx
|
|
|
833980 |
+ ;;
|
|
|
833980 |
mingw32)
|
|
|
833980 |
basic_machine=i386-pc
|
|
|
833980 |
os=-mingw32
|
|
|
833980 |
@@ -762,10 +827,18 @@
|
|
|
833980 |
ms1-*)
|
|
|
833980 |
basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
|
|
|
833980 |
;;
|
|
|
833980 |
+ msys)
|
|
|
833980 |
+ basic_machine=i386-pc
|
|
|
833980 |
+ os=-msys
|
|
|
833980 |
+ ;;
|
|
|
833980 |
mvs)
|
|
|
833980 |
basic_machine=i370-ibm
|
|
|
833980 |
os=-mvs
|
|
|
833980 |
;;
|
|
|
833980 |
+ nacl)
|
|
|
833980 |
+ basic_machine=le32-unknown
|
|
|
833980 |
+ os=-nacl
|
|
|
833980 |
+ ;;
|
|
|
833980 |
ncr3000)
|
|
|
833980 |
basic_machine=i486-ncr
|
|
|
833980 |
os=-sysv4
|
|
|
833980 |
@@ -830,6 +903,12 @@
|
|
|
833980 |
np1)
|
|
|
833980 |
basic_machine=np1-gould
|
|
|
833980 |
;;
|
|
|
833980 |
+ neo-tandem)
|
|
|
833980 |
+ basic_machine=neo-tandem
|
|
|
833980 |
+ ;;
|
|
|
833980 |
+ nse-tandem)
|
|
|
833980 |
+ basic_machine=nse-tandem
|
|
|
833980 |
+ ;;
|
|
|
833980 |
nsr-tandem)
|
|
|
833980 |
basic_machine=nsr-tandem
|
|
|
833980 |
;;
|
|
|
833980 |
@@ -912,9 +991,10 @@
|
|
|
833980 |
;;
|
|
|
833980 |
power) basic_machine=power-ibm
|
|
|
833980 |
;;
|
|
|
833980 |
- ppc) basic_machine=powerpc-unknown
|
|
|
833980 |
+ ppc | ppcbe) basic_machine=powerpc-unknown
|
|
|
833980 |
;;
|
|
|
833980 |
- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
|
|
|
833980 |
+ ppc-* | ppcbe-*)
|
|
|
833980 |
+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
|
|
|
833980 |
;;
|
|
|
833980 |
ppcle | powerpclittle | ppc-le | powerpc-little)
|
|
|
833980 |
basic_machine=powerpcle-unknown
|
|
|
833980 |
@@ -1008,6 +1088,9 @@
|
|
|
833980 |
basic_machine=i860-stratus
|
|
|
833980 |
os=-sysv4
|
|
|
833980 |
;;
|
|
|
833980 |
+ strongarm-* | thumb-*)
|
|
|
833980 |
+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
|
|
|
833980 |
+ ;;
|
|
|
833980 |
sun2)
|
|
|
833980 |
basic_machine=m68000-sun
|
|
|
833980 |
;;
|
|
|
833980 |
@@ -1064,20 +1147,8 @@
|
|
|
833980 |
basic_machine=t90-cray
|
|
|
833980 |
os=-unicos
|
|
|
833980 |
;;
|
|
|
833980 |
- tic54x | c54x*)
|
|
|
833980 |
- basic_machine=tic54x-unknown
|
|
|
833980 |
- os=-coff
|
|
|
833980 |
- ;;
|
|
|
833980 |
- tic55x | c55x*)
|
|
|
833980 |
- basic_machine=tic55x-unknown
|
|
|
833980 |
- os=-coff
|
|
|
833980 |
- ;;
|
|
|
833980 |
- tic6x | c6x*)
|
|
|
833980 |
- basic_machine=tic6x-unknown
|
|
|
833980 |
- os=-coff
|
|
|
833980 |
- ;;
|
|
|
833980 |
tile*)
|
|
|
833980 |
- basic_machine=tile-unknown
|
|
|
833980 |
+ basic_machine=$basic_machine-unknown
|
|
|
833980 |
os=-linux-gnu
|
|
|
833980 |
;;
|
|
|
833980 |
tx39)
|
|
|
833980 |
@@ -1147,6 +1218,9 @@
|
|
|
833980 |
xps | xps100)
|
|
|
833980 |
basic_machine=xps100-honeywell
|
|
|
833980 |
;;
|
|
|
833980 |
+ xscale-* | xscalee[bl]-*)
|
|
|
833980 |
+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
|
|
|
833980 |
+ ;;
|
|
|
833980 |
ymp)
|
|
|
833980 |
basic_machine=ymp-cray
|
|
|
833980 |
os=-unicos
|
|
|
833980 |
@@ -1244,9 +1318,12 @@
|
|
|
833980 |
if [ x"$os" != x"" ]
|
|
|
833980 |
then
|
|
|
833980 |
case $os in
|
|
|
833980 |
- # First match some system type aliases
|
|
|
833980 |
- # that might get confused with valid system types.
|
|
|
833980 |
+ # First match some system type aliases
|
|
|
833980 |
+ # that might get confused with valid system types.
|
|
|
833980 |
# -solaris* is a basic system type, with this one exception.
|
|
|
833980 |
+ -auroraux)
|
|
|
833980 |
+ os=-auroraux
|
|
|
833980 |
+ ;;
|
|
|
833980 |
-solaris1 | -solaris1.*)
|
|
|
833980 |
os=`echo $os | sed -e 's|solaris1|sunos4|'`
|
|
|
833980 |
;;
|
|
|
833980 |
@@ -1268,8 +1345,8 @@
|
|
|
833980 |
# -sysv* is not here because it comes later, after sysvr4.
|
|
|
833980 |
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
|
|
|
833980 |
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
|
|
|
833980 |
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
|
|
|
833980 |
- | -kopensolaris* \
|
|
|
833980 |
+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
|
|
|
833980 |
+ | -sym* | -kopensolaris* \
|
|
|
833980 |
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
|
|
|
833980 |
| -aos* | -aros* \
|
|
|
833980 |
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
|
|
|
833980 |
@@ -1281,8 +1358,9 @@
|
|
|
833980 |
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
|
|
|
833980 |
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
|
|
|
833980 |
| -chorusos* | -chorusrdb* | -cegcc* \
|
|
|
833980 |
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
|
|
833980 |
- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
|
|
|
833980 |
+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
|
|
833980 |
+ | -mingw32* | -linux-gnu* | -linux-android* \
|
|
|
833980 |
+ | -linux-newlib* | -linux-uclibc* \
|
|
|
833980 |
| -uxpv* | -beos* | -mpeix* | -udk* \
|
|
|
833980 |
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
|
|
|
833980 |
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
|
|
|
833980 |
@@ -1290,7 +1368,7 @@
|
|
|
833980 |
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
|
|
|
833980 |
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
|
|
|
833980 |
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
|
|
|
833980 |
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
|
|
|
833980 |
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
|
|
|
833980 |
# Remember, each alternative MUST END IN *, to match a version number.
|
|
|
833980 |
;;
|
|
|
833980 |
-qnx*)
|
|
|
833980 |
@@ -1329,7 +1407,7 @@
|
|
|
833980 |
-opened*)
|
|
|
833980 |
os=-openedition
|
|
|
833980 |
;;
|
|
|
833980 |
- -os400*)
|
|
|
833980 |
+ -os400*)
|
|
|
833980 |
os=-os400
|
|
|
833980 |
;;
|
|
|
833980 |
-wince*)
|
|
|
833980 |
@@ -1378,7 +1456,7 @@
|
|
|
833980 |
-sinix*)
|
|
|
833980 |
os=-sysv4
|
|
|
833980 |
;;
|
|
|
833980 |
- -tpf*)
|
|
|
833980 |
+ -tpf*)
|
|
|
833980 |
os=-tpf
|
|
|
833980 |
;;
|
|
|
833980 |
-triton*)
|
|
|
833980 |
@@ -1423,6 +1501,8 @@
|
|
|
833980 |
-dicos*)
|
|
|
833980 |
os=-dicos
|
|
|
833980 |
;;
|
|
|
833980 |
+ -nacl*)
|
|
|
833980 |
+ ;;
|
|
|
833980 |
-none)
|
|
|
833980 |
;;
|
|
|
833980 |
*)
|
|
|
833980 |
@@ -1445,10 +1525,10 @@
|
|
|
833980 |
# system, and we'll never get to this point.
|
|
|
833980 |
|
|
|
833980 |
case $basic_machine in
|
|
|
833980 |
- score-*)
|
|
|
833980 |
+ score-*)
|
|
|
833980 |
os=-elf
|
|
|
833980 |
;;
|
|
|
833980 |
- spu-*)
|
|
|
833980 |
+ spu-*)
|
|
|
833980 |
os=-elf
|
|
|
833980 |
;;
|
|
|
833980 |
*-acorn)
|
|
|
833980 |
@@ -1460,8 +1540,20 @@
|
|
|
833980 |
arm*-semi)
|
|
|
833980 |
os=-aout
|
|
|
833980 |
;;
|
|
|
833980 |
- c4x-* | tic4x-*)
|
|
|
833980 |
- os=-coff
|
|
|
833980 |
+ c4x-* | tic4x-*)
|
|
|
833980 |
+ os=-coff
|
|
|
833980 |
+ ;;
|
|
|
833980 |
+ hexagon-*)
|
|
|
833980 |
+ os=-elf
|
|
|
833980 |
+ ;;
|
|
|
833980 |
+ tic54x-*)
|
|
|
833980 |
+ os=-coff
|
|
|
833980 |
+ ;;
|
|
|
833980 |
+ tic55x-*)
|
|
|
833980 |
+ os=-coff
|
|
|
833980 |
+ ;;
|
|
|
833980 |
+ tic6x-*)
|
|
|
833980 |
+ os=-coff
|
|
|
833980 |
;;
|
|
|
833980 |
# This must come before the *-dec entry.
|
|
|
833980 |
pdp10-*)
|
|
|
833980 |
@@ -1481,14 +1573,11 @@
|
|
|
833980 |
;;
|
|
|
833980 |
m68000-sun)
|
|
|
833980 |
os=-sunos3
|
|
|
833980 |
- # This also exists in the configure program, but was not the
|
|
|
833980 |
- # default.
|
|
|
833980 |
- # os=-sunos4
|
|
|
833980 |
;;
|
|
|
833980 |
m68*-cisco)
|
|
|
833980 |
os=-aout
|
|
|
833980 |
;;
|
|
|
833980 |
- mep-*)
|
|
|
833980 |
+ mep-*)
|
|
|
833980 |
os=-elf
|
|
|
833980 |
;;
|
|
|
833980 |
mips*-cisco)
|
|
|
833980 |
@@ -1515,7 +1604,7 @@
|
|
|
833980 |
*-ibm)
|
|
|
833980 |
os=-aix
|
|
|
833980 |
;;
|
|
|
833980 |
- *-knuth)
|
|
|
833980 |
+ *-knuth)
|
|
|
833980 |
os=-mmixware
|
|
|
833980 |
;;
|
|
|
833980 |
*-wec)
|
|
|
833980 |
diff -u -Naur potrace-1.11/configure potrace-1.11-patched/configure
|
|
|
833980 |
--- potrace-1.11/configure 2013-02-19 20:49:06.000000000 -0400
|
|
|
833980 |
+++ potrace-1.11-patched/configure 2013-05-14 17:54:49.727852223 -0300
|
|
|
833980 |
@@ -1415,7 +1415,7 @@
|
|
|
833980 |
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
|
|
|
833980 |
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
|
|
|
833980 |
--with-libpotrace install Potrace library and headers [default=no]
|
|
|
833980 |
- --with-pic try to use only PIC/non-PIC objects [default=use
|
|
|
833980 |
+ --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
|
|
|
833980 |
both]
|
|
|
833980 |
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
|
|
|
833980 |
--with-sysroot=DIR Search for dependent libraries within DIR
|
|
|
833980 |
@@ -4954,6 +4954,11 @@
|
|
|
833980 |
lt_cv_sys_max_cmd_len=196608
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
+ os2*)
|
|
|
833980 |
+ # The test takes a long time on OS/2.
|
|
|
833980 |
+ lt_cv_sys_max_cmd_len=8192
|
|
|
833980 |
+ ;;
|
|
|
833980 |
+
|
|
|
833980 |
osf*)
|
|
|
833980 |
# Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
|
|
|
833980 |
# due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
|
|
|
833980 |
@@ -4993,7 +4998,7 @@
|
|
|
833980 |
# If test is not a shell built-in, we'll probably end up computing a
|
|
|
833980 |
# maximum length that is only half of the actual maximum length, but
|
|
|
833980 |
# we can't tell.
|
|
|
833980 |
- while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
|
|
|
833980 |
+ while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
|
|
|
833980 |
= "X$teststring$teststring"; } >/dev/null 2>&1 &&
|
|
|
833980 |
test $i != 17 # 1/2 MB should be enough
|
|
|
833980 |
do
|
|
|
833980 |
@@ -5419,7 +5424,7 @@
|
|
|
833980 |
lt_cv_deplibs_check_method=pass_all
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
-# This must be Linux ELF.
|
|
|
833980 |
+# This must be glibc/ELF.
|
|
|
833980 |
linux* | k*bsd*-gnu | kopensolaris*-gnu)
|
|
|
833980 |
lt_cv_deplibs_check_method=pass_all
|
|
|
833980 |
;;
|
|
|
833980 |
@@ -6057,13 +6062,13 @@
|
|
|
833980 |
if test -n "$RANLIB"; then
|
|
|
833980 |
case $host_os in
|
|
|
833980 |
openbsd*)
|
|
|
833980 |
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
|
|
|
833980 |
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
|
|
|
833980 |
;;
|
|
|
833980 |
*)
|
|
|
833980 |
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
|
|
|
833980 |
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
|
|
|
833980 |
;;
|
|
|
833980 |
esac
|
|
|
833980 |
- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
|
|
|
833980 |
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
|
|
|
833980 |
fi
|
|
|
833980 |
|
|
|
833980 |
case $host_os in
|
|
|
833980 |
@@ -6210,6 +6215,7 @@
|
|
|
833980 |
# which start with @ or ?.
|
|
|
833980 |
lt_cv_sys_global_symbol_pipe="$AWK '"\
|
|
|
833980 |
" {last_section=section; section=\$ 3};"\
|
|
|
833980 |
+" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
|
|
|
833980 |
" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
|
|
|
833980 |
" \$ 0!~/External *\|/{next};"\
|
|
|
833980 |
" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
|
|
|
833980 |
@@ -6598,7 +6604,7 @@
|
|
|
833980 |
CFLAGS="$SAVE_CFLAGS"
|
|
|
833980 |
fi
|
|
|
833980 |
;;
|
|
|
833980 |
-sparc*-*solaris*)
|
|
|
833980 |
+*-*solaris*)
|
|
|
833980 |
# Find out which ABI we are using.
|
|
|
833980 |
echo 'int i;' > conftest.$ac_ext
|
|
|
833980 |
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
|
|
|
833980 |
@@ -6609,7 +6615,20 @@
|
|
|
833980 |
case `/usr/bin/file conftest.o` in
|
|
|
833980 |
*64-bit*)
|
|
|
833980 |
case $lt_cv_prog_gnu_ld in
|
|
|
833980 |
- yes*) LD="${LD-ld} -m elf64_sparc" ;;
|
|
|
833980 |
+ yes*)
|
|
|
833980 |
+ case $host in
|
|
|
833980 |
+ i?86-*-solaris*)
|
|
|
833980 |
+ LD="${LD-ld} -m elf_x86_64"
|
|
|
833980 |
+ ;;
|
|
|
833980 |
+ sparc*-*-solaris*)
|
|
|
833980 |
+ LD="${LD-ld} -m elf64_sparc"
|
|
|
833980 |
+ ;;
|
|
|
833980 |
+ esac
|
|
|
833980 |
+ # GNU ld 2.21 introduced _sol2 emulations. Use them if available.
|
|
|
833980 |
+ if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
|
|
|
833980 |
+ LD="${LD-ld}_sol2"
|
|
|
833980 |
+ fi
|
|
|
833980 |
+ ;;
|
|
|
833980 |
*)
|
|
|
833980 |
if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
|
|
|
833980 |
LD="${LD-ld} -64"
|
|
|
833980 |
@@ -7249,7 +7268,13 @@
|
|
|
833980 |
$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
|
|
|
833980 |
-dynamiclib -Wl,-single_module conftest.c 2>conftest.err
|
|
|
833980 |
_lt_result=$?
|
|
|
833980 |
- if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
|
|
|
833980 |
+ # If there is a non-empty error log, and "single_module"
|
|
|
833980 |
+ # appears in it, assume the flag caused a linker warning
|
|
|
833980 |
+ if test -s conftest.err && $GREP single_module conftest.err; then
|
|
|
833980 |
+ cat conftest.err >&5
|
|
|
833980 |
+ # Otherwise, if the output was created with a 0 exit code from
|
|
|
833980 |
+ # the compiler, it worked.
|
|
|
833980 |
+ elif test -f libconftest.dylib && test $_lt_result -eq 0; then
|
|
|
833980 |
lt_cv_apple_cc_single_mod=yes
|
|
|
833980 |
else
|
|
|
833980 |
cat conftest.err >&5
|
|
|
833980 |
@@ -7260,6 +7285,7 @@
|
|
|
833980 |
fi
|
|
|
833980 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
|
|
|
833980 |
$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
|
|
|
833980 |
+
|
|
|
833980 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
|
|
|
833980 |
$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
|
|
|
833980 |
if ${lt_cv_ld_exported_symbols_list+:} false; then :
|
|
|
833980 |
@@ -7292,6 +7318,7 @@
|
|
|
833980 |
fi
|
|
|
833980 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
|
|
|
833980 |
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
|
|
|
833980 |
+
|
|
|
833980 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
|
|
|
833980 |
$as_echo_n "checking for -force_load linker flag... " >&6; }
|
|
|
833980 |
if ${lt_cv_ld_force_load+:} false; then :
|
|
|
833980 |
@@ -7313,7 +7340,9 @@
|
|
|
833980 |
echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
|
|
|
833980 |
$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
|
|
|
833980 |
_lt_result=$?
|
|
|
833980 |
- if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
|
|
|
833980 |
+ if test -s conftest.err && $GREP force_load conftest.err; then
|
|
|
833980 |
+ cat conftest.err >&5
|
|
|
833980 |
+ elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
|
|
|
833980 |
lt_cv_ld_force_load=yes
|
|
|
833980 |
else
|
|
|
833980 |
cat conftest.err >&5
|
|
|
833980 |
@@ -7716,7 +7745,22 @@
|
|
|
833980 |
|
|
|
833980 |
# Check whether --with-pic was given.
|
|
|
833980 |
if test "${with_pic+set}" = set; then :
|
|
|
833980 |
- withval=$with_pic; pic_mode="$withval"
|
|
|
833980 |
+ withval=$with_pic; lt_p=${PACKAGE-default}
|
|
|
833980 |
+ case $withval in
|
|
|
833980 |
+ yes|no) pic_mode=$withval ;;
|
|
|
833980 |
+ *)
|
|
|
833980 |
+ pic_mode=default
|
|
|
833980 |
+ # Look at the argument we got. We use all the common list separators.
|
|
|
833980 |
+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
|
|
|
833980 |
+ for lt_pkg in $withval; do
|
|
|
833980 |
+ IFS="$lt_save_ifs"
|
|
|
833980 |
+ if test "X$lt_pkg" = "X$lt_p"; then
|
|
|
833980 |
+ pic_mode=yes
|
|
|
833980 |
+ fi
|
|
|
833980 |
+ done
|
|
|
833980 |
+ IFS="$lt_save_ifs"
|
|
|
833980 |
+ ;;
|
|
|
833980 |
+ esac
|
|
|
833980 |
else
|
|
|
833980 |
pic_mode=default
|
|
|
833980 |
fi
|
|
|
833980 |
@@ -7794,6 +7838,10 @@
|
|
|
833980 |
|
|
|
833980 |
|
|
|
833980 |
|
|
|
833980 |
+
|
|
|
833980 |
+
|
|
|
833980 |
+
|
|
|
833980 |
+
|
|
|
833980 |
test -z "$LN_S" && LN_S="ln -s"
|
|
|
833980 |
|
|
|
833980 |
|
|
|
833980 |
@@ -8253,7 +8301,9 @@
|
|
|
833980 |
case $cc_basename in
|
|
|
833980 |
nvcc*) # Cuda Compiler Driver 2.2
|
|
|
833980 |
lt_prog_compiler_wl='-Xlinker '
|
|
|
833980 |
- lt_prog_compiler_pic='-Xcompiler -fPIC'
|
|
|
833980 |
+ if test -n "$lt_prog_compiler_pic"; then
|
|
|
833980 |
+ lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
|
|
|
833980 |
+ fi
|
|
|
833980 |
;;
|
|
|
833980 |
esac
|
|
|
833980 |
else
|
|
|
833980 |
@@ -8344,18 +8394,33 @@
|
|
|
833980 |
;;
|
|
|
833980 |
*)
|
|
|
833980 |
case `$CC -V 2>&1 | sed 5q` in
|
|
|
833980 |
- *Sun\ F* | *Sun*Fortran*)
|
|
|
833980 |
+ *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
|
|
|
833980 |
# Sun Fortran 8.3 passes all unrecognized flags to the linker
|
|
|
833980 |
lt_prog_compiler_pic='-KPIC'
|
|
|
833980 |
lt_prog_compiler_static='-Bstatic'
|
|
|
833980 |
lt_prog_compiler_wl=''
|
|
|
833980 |
;;
|
|
|
833980 |
+ *Sun\ F* | *Sun*Fortran*)
|
|
|
833980 |
+ lt_prog_compiler_pic='-KPIC'
|
|
|
833980 |
+ lt_prog_compiler_static='-Bstatic'
|
|
|
833980 |
+ lt_prog_compiler_wl='-Qoption ld '
|
|
|
833980 |
+ ;;
|
|
|
833980 |
*Sun\ C*)
|
|
|
833980 |
# Sun C 5.9
|
|
|
833980 |
lt_prog_compiler_pic='-KPIC'
|
|
|
833980 |
lt_prog_compiler_static='-Bstatic'
|
|
|
833980 |
lt_prog_compiler_wl='-Wl,'
|
|
|
833980 |
;;
|
|
|
833980 |
+ *Intel*\ [CF]*Compiler*)
|
|
|
833980 |
+ lt_prog_compiler_wl='-Wl,'
|
|
|
833980 |
+ lt_prog_compiler_pic='-fPIC'
|
|
|
833980 |
+ lt_prog_compiler_static='-static'
|
|
|
833980 |
+ ;;
|
|
|
833980 |
+ *Portland\ Group*)
|
|
|
833980 |
+ lt_prog_compiler_wl='-Wl,'
|
|
|
833980 |
+ lt_prog_compiler_pic='-fpic'
|
|
|
833980 |
+ lt_prog_compiler_static='-Bstatic'
|
|
|
833980 |
+ ;;
|
|
|
833980 |
esac
|
|
|
833980 |
;;
|
|
|
833980 |
esac
|
|
|
833980 |
@@ -8717,7 +8782,6 @@
|
|
|
833980 |
hardcode_direct=no
|
|
|
833980 |
hardcode_direct_absolute=no
|
|
|
833980 |
hardcode_libdir_flag_spec=
|
|
|
833980 |
- hardcode_libdir_flag_spec_ld=
|
|
|
833980 |
hardcode_libdir_separator=
|
|
|
833980 |
hardcode_minus_L=no
|
|
|
833980 |
hardcode_shlibpath_var=unsupported
|
|
|
833980 |
@@ -8970,8 +9034,7 @@
|
|
|
833980 |
xlf* | bgf* | bgxlf* | mpixlf*)
|
|
|
833980 |
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
|
|
|
833980 |
whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
|
|
|
833980 |
- hardcode_libdir_flag_spec=
|
|
|
833980 |
- hardcode_libdir_flag_spec_ld='-rpath $libdir'
|
|
|
833980 |
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
|
|
|
833980 |
archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
|
|
|
833980 |
if test "x$supports_anon_versioning" = xyes; then
|
|
|
833980 |
archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
|
|
|
833980 |
@@ -9351,6 +9414,7 @@
|
|
|
833980 |
# The linker will not automatically build a static lib if we build a DLL.
|
|
|
833980 |
# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
|
|
|
833980 |
enable_shared_with_static_runtimes=yes
|
|
|
833980 |
+ exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
|
|
|
833980 |
export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
|
|
|
833980 |
# Don't use ranlib
|
|
|
833980 |
old_postinstall_cmds='chmod 644 $oldlib'
|
|
|
833980 |
@@ -9396,6 +9460,7 @@
|
|
|
833980 |
hardcode_shlibpath_var=unsupported
|
|
|
833980 |
if test "$lt_cv_ld_force_load" = "yes"; then
|
|
|
833980 |
whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
|
|
|
833980 |
+
|
|
|
833980 |
else
|
|
|
833980 |
whole_archive_flag_spec=''
|
|
|
833980 |
fi
|
|
|
833980 |
@@ -9424,10 +9489,6 @@
|
|
|
833980 |
hardcode_shlibpath_var=no
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
- freebsd1*)
|
|
|
833980 |
- ld_shlibs=no
|
|
|
833980 |
- ;;
|
|
|
833980 |
-
|
|
|
833980 |
# FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
|
|
|
833980 |
# support. Future versions do this automatically, but an explicit c++rt0.o
|
|
|
833980 |
# does not break anything, and helps significantly (at the cost of a little
|
|
|
833980 |
@@ -9440,7 +9501,7 @@
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
# Unfortunately, older versions of FreeBSD 2 do not have this feature.
|
|
|
833980 |
- freebsd2*)
|
|
|
833980 |
+ freebsd2.*)
|
|
|
833980 |
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
|
|
|
833980 |
hardcode_direct=yes
|
|
|
833980 |
hardcode_minus_L=yes
|
|
|
833980 |
@@ -9479,7 +9540,6 @@
|
|
|
833980 |
fi
|
|
|
833980 |
if test "$with_gnu_ld" = no; then
|
|
|
833980 |
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
|
|
|
833980 |
- hardcode_libdir_flag_spec_ld='+b $libdir'
|
|
|
833980 |
hardcode_libdir_separator=:
|
|
|
833980 |
hardcode_direct=yes
|
|
|
833980 |
hardcode_direct_absolute=yes
|
|
|
833980 |
@@ -10103,11 +10163,6 @@
|
|
|
833980 |
|
|
|
833980 |
|
|
|
833980 |
|
|
|
833980 |
-
|
|
|
833980 |
-
|
|
|
833980 |
-
|
|
|
833980 |
-
|
|
|
833980 |
-
|
|
|
833980 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
|
|
|
833980 |
$as_echo_n "checking dynamic linker characteristics... " >&6; }
|
|
|
833980 |
|
|
|
833980 |
@@ -10197,7 +10252,7 @@
|
|
|
833980 |
|
|
|
833980 |
case $host_os in
|
|
|
833980 |
aix3*)
|
|
|
833980 |
- version_type=linux
|
|
|
833980 |
+ version_type=linux # correct to gnu/linux during the next big refactor
|
|
|
833980 |
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
|
|
|
833980 |
shlibpath_var=LIBPATH
|
|
|
833980 |
|
|
|
833980 |
@@ -10206,7 +10261,7 @@
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
aix[4-9]*)
|
|
|
833980 |
- version_type=linux
|
|
|
833980 |
+ version_type=linux # correct to gnu/linux during the next big refactor
|
|
|
833980 |
need_lib_prefix=no
|
|
|
833980 |
need_version=no
|
|
|
833980 |
hardcode_into_libs=yes
|
|
|
833980 |
@@ -10271,7 +10326,7 @@
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
bsdi[45]*)
|
|
|
833980 |
- version_type=linux
|
|
|
833980 |
+ version_type=linux # correct to gnu/linux during the next big refactor
|
|
|
833980 |
need_version=no
|
|
|
833980 |
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
|
|
833980 |
soname_spec='${libname}${release}${shared_ext}$major'
|
|
|
833980 |
@@ -10410,7 +10465,7 @@
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
dgux*)
|
|
|
833980 |
- version_type=linux
|
|
|
833980 |
+ version_type=linux # correct to gnu/linux during the next big refactor
|
|
|
833980 |
need_lib_prefix=no
|
|
|
833980 |
need_version=no
|
|
|
833980 |
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
|
|
|
833980 |
@@ -10418,10 +10473,6 @@
|
|
|
833980 |
shlibpath_var=LD_LIBRARY_PATH
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
-freebsd1*)
|
|
|
833980 |
- dynamic_linker=no
|
|
|
833980 |
- ;;
|
|
|
833980 |
-
|
|
|
833980 |
freebsd* | dragonfly*)
|
|
|
833980 |
# DragonFly does not have aout. When/if they implement a new
|
|
|
833980 |
# versioning mechanism, adjust this.
|
|
|
833980 |
@@ -10429,7 +10480,7 @@
|
|
|
833980 |
objformat=`/usr/bin/objformat`
|
|
|
833980 |
else
|
|
|
833980 |
case $host_os in
|
|
|
833980 |
- freebsd[123]*) objformat=aout ;;
|
|
|
833980 |
+ freebsd[23].*) objformat=aout ;;
|
|
|
833980 |
*) objformat=elf ;;
|
|
|
833980 |
esac
|
|
|
833980 |
fi
|
|
|
833980 |
@@ -10447,7 +10498,7 @@
|
|
|
833980 |
esac
|
|
|
833980 |
shlibpath_var=LD_LIBRARY_PATH
|
|
|
833980 |
case $host_os in
|
|
|
833980 |
- freebsd2*)
|
|
|
833980 |
+ freebsd2.*)
|
|
|
833980 |
shlibpath_overrides_runpath=yes
|
|
|
833980 |
;;
|
|
|
833980 |
freebsd3.[01]* | freebsdelf3.[01]*)
|
|
|
833980 |
@@ -10467,7 +10518,7 @@
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
gnu*)
|
|
|
833980 |
- version_type=linux
|
|
|
833980 |
+ version_type=linux # correct to gnu/linux during the next big refactor
|
|
|
833980 |
need_lib_prefix=no
|
|
|
833980 |
need_version=no
|
|
|
833980 |
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
|
|
|
833980 |
@@ -10478,7 +10529,7 @@
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
haiku*)
|
|
|
833980 |
- version_type=linux
|
|
|
833980 |
+ version_type=linux # correct to gnu/linux during the next big refactor
|
|
|
833980 |
need_lib_prefix=no
|
|
|
833980 |
need_version=no
|
|
|
833980 |
dynamic_linker="$host_os runtime_loader"
|
|
|
833980 |
@@ -10539,7 +10590,7 @@
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
interix[3-9]*)
|
|
|
833980 |
- version_type=linux
|
|
|
833980 |
+ version_type=linux # correct to gnu/linux during the next big refactor
|
|
|
833980 |
need_lib_prefix=no
|
|
|
833980 |
need_version=no
|
|
|
833980 |
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
|
|
|
833980 |
@@ -10555,7 +10606,7 @@
|
|
|
833980 |
nonstopux*) version_type=nonstopux ;;
|
|
|
833980 |
*)
|
|
|
833980 |
if test "$lt_cv_prog_gnu_ld" = yes; then
|
|
|
833980 |
- version_type=linux
|
|
|
833980 |
+ version_type=linux # correct to gnu/linux during the next big refactor
|
|
|
833980 |
else
|
|
|
833980 |
version_type=irix
|
|
|
833980 |
fi ;;
|
|
|
833980 |
@@ -10592,9 +10643,9 @@
|
|
|
833980 |
dynamic_linker=no
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
-# This must be Linux ELF.
|
|
|
833980 |
+# This must be glibc/ELF.
|
|
|
833980 |
linux* | k*bsd*-gnu | kopensolaris*-gnu)
|
|
|
833980 |
- version_type=linux
|
|
|
833980 |
+ version_type=linux # correct to gnu/linux during the next big refactor
|
|
|
833980 |
need_lib_prefix=no
|
|
|
833980 |
need_version=no
|
|
|
833980 |
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
|
|
833980 |
@@ -10688,7 +10739,7 @@
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
newsos6)
|
|
|
833980 |
- version_type=linux
|
|
|
833980 |
+ version_type=linux # correct to gnu/linux during the next big refactor
|
|
|
833980 |
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
|
|
833980 |
shlibpath_var=LD_LIBRARY_PATH
|
|
|
833980 |
shlibpath_overrides_runpath=yes
|
|
|
833980 |
@@ -10757,7 +10808,7 @@
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
solaris*)
|
|
|
833980 |
- version_type=linux
|
|
|
833980 |
+ version_type=linux # correct to gnu/linux during the next big refactor
|
|
|
833980 |
need_lib_prefix=no
|
|
|
833980 |
need_version=no
|
|
|
833980 |
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
|
|
833980 |
@@ -10782,7 +10833,7 @@
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
sysv4 | sysv4.3*)
|
|
|
833980 |
- version_type=linux
|
|
|
833980 |
+ version_type=linux # correct to gnu/linux during the next big refactor
|
|
|
833980 |
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
|
|
833980 |
soname_spec='${libname}${release}${shared_ext}$major'
|
|
|
833980 |
shlibpath_var=LD_LIBRARY_PATH
|
|
|
833980 |
@@ -10806,7 +10857,7 @@
|
|
|
833980 |
|
|
|
833980 |
sysv4*MP*)
|
|
|
833980 |
if test -d /usr/nec ;then
|
|
|
833980 |
- version_type=linux
|
|
|
833980 |
+ version_type=linux # correct to gnu/linux during the next big refactor
|
|
|
833980 |
library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
|
|
|
833980 |
soname_spec='$libname${shared_ext}.$major'
|
|
|
833980 |
shlibpath_var=LD_LIBRARY_PATH
|
|
|
833980 |
@@ -10837,7 +10888,7 @@
|
|
|
833980 |
|
|
|
833980 |
tpf*)
|
|
|
833980 |
# TPF is a cross-target only. Preferred cross-host = GNU/Linux.
|
|
|
833980 |
- version_type=linux
|
|
|
833980 |
+ version_type=linux # correct to gnu/linux during the next big refactor
|
|
|
833980 |
need_lib_prefix=no
|
|
|
833980 |
need_version=no
|
|
|
833980 |
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
|
|
833980 |
@@ -10847,7 +10898,7 @@
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
uts4*)
|
|
|
833980 |
- version_type=linux
|
|
|
833980 |
+ version_type=linux # correct to gnu/linux during the next big refactor
|
|
|
833980 |
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
|
|
833980 |
soname_spec='${libname}${release}${shared_ext}$major'
|
|
|
833980 |
shlibpath_var=LD_LIBRARY_PATH
|
|
|
833980 |
@@ -11629,6 +11680,8 @@
|
|
|
833980 |
|
|
|
833980 |
|
|
|
833980 |
|
|
|
833980 |
+
|
|
|
833980 |
+
|
|
|
833980 |
ac_config_commands="$ac_config_commands libtool"
|
|
|
833980 |
|
|
|
833980 |
|
|
|
833980 |
@@ -12836,6 +12889,7 @@
|
|
|
833980 |
enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
|
|
|
833980 |
SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
|
|
|
833980 |
ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
|
|
|
833980 |
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
|
|
|
833980 |
host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
|
|
|
833980 |
host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
|
|
|
833980 |
host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
|
|
|
833980 |
@@ -12916,7 +12970,6 @@
|
|
|
833980 |
allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
|
|
|
833980 |
no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
|
|
|
833980 |
hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
|
|
|
833980 |
-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
|
|
|
833980 |
hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
|
|
|
833980 |
hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
|
|
|
833980 |
hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
|
|
|
833980 |
@@ -12975,6 +13028,7 @@
|
|
|
833980 |
OBJDUMP \
|
|
|
833980 |
SHELL \
|
|
|
833980 |
ECHO \
|
|
|
833980 |
+PATH_SEPARATOR \
|
|
|
833980 |
SED \
|
|
|
833980 |
GREP \
|
|
|
833980 |
EGREP \
|
|
|
833980 |
@@ -13023,7 +13077,6 @@
|
|
|
833980 |
allow_undefined_flag \
|
|
|
833980 |
no_undefined_flag \
|
|
|
833980 |
hardcode_libdir_flag_spec \
|
|
|
833980 |
-hardcode_libdir_flag_spec_ld \
|
|
|
833980 |
hardcode_libdir_separator \
|
|
|
833980 |
exclude_expsyms \
|
|
|
833980 |
include_expsyms \
|
|
|
833980 |
@@ -13824,8 +13877,8 @@
|
|
|
833980 |
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
|
|
|
833980 |
#
|
|
|
833980 |
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
|
|
|
833980 |
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
|
|
|
833980 |
-# Inc.
|
|
|
833980 |
+# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
|
|
|
833980 |
+# Foundation, Inc.
|
|
|
833980 |
# Written by Gordon Matzigkeit, 1996
|
|
|
833980 |
#
|
|
|
833980 |
# This file is part of GNU Libtool.
|
|
|
833980 |
@@ -13888,6 +13941,9 @@
|
|
|
833980 |
# An echo program that protects backslashes.
|
|
|
833980 |
ECHO=$lt_ECHO
|
|
|
833980 |
|
|
|
833980 |
+# The PATH separator for the build system.
|
|
|
833980 |
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
|
|
|
833980 |
+
|
|
|
833980 |
# The host system.
|
|
|
833980 |
host_alias=$host_alias
|
|
|
833980 |
host=$host
|
|
|
833980 |
@@ -14183,10 +14239,6 @@
|
|
|
833980 |
# This must work even if \$libdir does not exist
|
|
|
833980 |
hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
|
|
|
833980 |
|
|
|
833980 |
-# If ld is used when linking, flag to hardcode \$libdir into a binary
|
|
|
833980 |
-# during linking. This must work even if \$libdir does not exist.
|
|
|
833980 |
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
|
|
|
833980 |
-
|
|
|
833980 |
# Whether we need a single "-rpath" flag with a separated argument.
|
|
|
833980 |
hardcode_libdir_separator=$lt_hardcode_libdir_separator
|
|
|
833980 |
|
|
|
833980 |
diff -u -Naur potrace-1.11/depcomp potrace-1.11-patched/depcomp
|
|
|
833980 |
--- potrace-1.11/depcomp 2010-11-04 23:08:34.000000000 -0300
|
|
|
833980 |
+++ potrace-1.11-patched/depcomp 2013-05-14 17:54:51.635877135 -0300
|
|
|
833980 |
@@ -1,10 +1,10 @@
|
|
|
833980 |
#! /bin/sh
|
|
|
833980 |
# depcomp - compile a program generating dependencies as side-effects
|
|
|
833980 |
|
|
|
833980 |
-scriptversion=2009-04-28.21; # UTC
|
|
|
833980 |
+scriptversion=2012-03-27.16; # UTC
|
|
|
833980 |
|
|
|
833980 |
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
|
|
|
833980 |
-# Software Foundation, Inc.
|
|
|
833980 |
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
|
|
|
833980 |
+# 2011, 2012 Free Software Foundation, Inc.
|
|
|
833980 |
|
|
|
833980 |
# This program is free software; you can redistribute it and/or modify
|
|
|
833980 |
# it under the terms of the GNU General Public License as published by
|
|
|
833980 |
@@ -28,7 +28,7 @@
|
|
|
833980 |
|
|
|
833980 |
case $1 in
|
|
|
833980 |
'')
|
|
|
833980 |
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
|
|
|
833980 |
+ echo "$0: No command. Try '$0 --help' for more information." 1>&2
|
|
|
833980 |
exit 1;
|
|
|
833980 |
;;
|
|
|
833980 |
-h | --h*)
|
|
|
833980 |
@@ -40,11 +40,11 @@
|
|
|
833980 |
|
|
|
833980 |
Environment variables:
|
|
|
833980 |
depmode Dependency tracking mode.
|
|
|
833980 |
- source Source file read by `PROGRAMS ARGS'.
|
|
|
833980 |
- object Object file output by `PROGRAMS ARGS'.
|
|
|
833980 |
+ source Source file read by 'PROGRAMS ARGS'.
|
|
|
833980 |
+ object Object file output by 'PROGRAMS ARGS'.
|
|
|
833980 |
DEPDIR directory where to store dependencies.
|
|
|
833980 |
depfile Dependency file to output.
|
|
|
833980 |
- tmpdepfile Temporary file to use when outputing dependencies.
|
|
|
833980 |
+ tmpdepfile Temporary file to use when outputting dependencies.
|
|
|
833980 |
libtool Whether libtool is used (yes/no).
|
|
|
833980 |
|
|
|
833980 |
Report bugs to <bug-automake@gnu.org>.
|
|
|
833980 |
@@ -57,6 +57,12 @@
|
|
|
833980 |
;;
|
|
|
833980 |
esac
|
|
|
833980 |
|
|
|
833980 |
+# A tabulation character.
|
|
|
833980 |
+tab=' '
|
|
|
833980 |
+# A newline character.
|
|
|
833980 |
+nl='
|
|
|
833980 |
+'
|
|
|
833980 |
+
|
|
|
833980 |
if test -z "$depmode" || test -z "$source" || test -z "$object"; then
|
|
|
833980 |
echo "depcomp: Variables source, object and depmode must be set" 1>&2
|
|
|
833980 |
exit 1
|
|
|
833980 |
@@ -90,10 +96,24 @@
|
|
|
833980 |
# This is just like msvisualcpp but w/o cygpath translation.
|
|
|
833980 |
# Just convert the backslash-escaped backslashes to single forward
|
|
|
833980 |
# slashes to satisfy depend.m4
|
|
|
833980 |
- cygpath_u="sed s,\\\\\\\\,/,g"
|
|
|
833980 |
+ cygpath_u='sed s,\\\\,/,g'
|
|
|
833980 |
depmode=msvisualcpp
|
|
|
833980 |
fi
|
|
|
833980 |
|
|
|
833980 |
+if test "$depmode" = msvc7msys; then
|
|
|
833980 |
+ # This is just like msvc7 but w/o cygpath translation.
|
|
|
833980 |
+ # Just convert the backslash-escaped backslashes to single forward
|
|
|
833980 |
+ # slashes to satisfy depend.m4
|
|
|
833980 |
+ cygpath_u='sed s,\\\\,/,g'
|
|
|
833980 |
+ depmode=msvc7
|
|
|
833980 |
+fi
|
|
|
833980 |
+
|
|
|
833980 |
+if test "$depmode" = xlc; then
|
|
|
833980 |
+ # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
|
|
|
833980 |
+ gccflag=-qmakedep=gcc,-MF
|
|
|
833980 |
+ depmode=gcc
|
|
|
833980 |
+fi
|
|
|
833980 |
+
|
|
|
833980 |
case "$depmode" in
|
|
|
833980 |
gcc3)
|
|
|
833980 |
## gcc 3 implements dependency tracking that does exactly what
|
|
|
833980 |
@@ -148,20 +168,21 @@
|
|
|
833980 |
## The second -e expression handles DOS-style file names with drive letters.
|
|
|
833980 |
sed -e 's/^[^:]*: / /' \
|
|
|
833980 |
-e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
|
|
|
833980 |
-## This next piece of magic avoids the `deleted header file' problem.
|
|
|
833980 |
+## This next piece of magic avoids the "deleted header file" problem.
|
|
|
833980 |
## The problem is that when a header file which appears in a .P file
|
|
|
833980 |
## is deleted, the dependency causes make to die (because there is
|
|
|
833980 |
## typically no way to rebuild the header). We avoid this by adding
|
|
|
833980 |
## dummy dependencies for each header file. Too bad gcc doesn't do
|
|
|
833980 |
## this for us directly.
|
|
|
833980 |
- tr ' ' '
|
|
|
833980 |
-' < "$tmpdepfile" |
|
|
|
833980 |
-## Some versions of gcc put a space before the `:'. On the theory
|
|
|
833980 |
+ tr ' ' "$nl" < "$tmpdepfile" |
|
|
|
833980 |
+## Some versions of gcc put a space before the ':'. On the theory
|
|
|
833980 |
## that the space means something, we add a space to the output as
|
|
|
833980 |
-## well.
|
|
|
833980 |
+## well. hp depmode also adds that space, but also prefixes the VPATH
|
|
|
833980 |
+## to the object. Take care to not repeat it in the output.
|
|
|
833980 |
## Some versions of the HPUX 10.20 sed can't process this invocation
|
|
|
833980 |
## correctly. Breaking it into two sed invocations is a workaround.
|
|
|
833980 |
- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
|
|
|
833980 |
+ sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
|
|
|
833980 |
+ | sed -e 's/$/ :/' >> "$depfile"
|
|
|
833980 |
rm -f "$tmpdepfile"
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
@@ -193,18 +214,15 @@
|
|
|
833980 |
# clever and replace this with sed code, as IRIX sed won't handle
|
|
|
833980 |
# lines with more than a fixed number of characters (4096 in
|
|
|
833980 |
# IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
|
|
|
833980 |
- # the IRIX cc adds comments like `#:fec' to the end of the
|
|
|
833980 |
+ # the IRIX cc adds comments like '#:fec' to the end of the
|
|
|
833980 |
# dependency line.
|
|
|
833980 |
- tr ' ' '
|
|
|
833980 |
-' < "$tmpdepfile" \
|
|
|
833980 |
+ tr ' ' "$nl" < "$tmpdepfile" \
|
|
|
833980 |
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
|
|
|
833980 |
- tr '
|
|
|
833980 |
-' ' ' >> "$depfile"
|
|
|
833980 |
+ tr "$nl" ' ' >> "$depfile"
|
|
|
833980 |
echo >> "$depfile"
|
|
|
833980 |
|
|
|
833980 |
# The second pass generates a dummy entry for each header file.
|
|
|
833980 |
- tr ' ' '
|
|
|
833980 |
-' < "$tmpdepfile" \
|
|
|
833980 |
+ tr ' ' "$nl" < "$tmpdepfile" \
|
|
|
833980 |
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
|
|
|
833980 |
>> "$depfile"
|
|
|
833980 |
else
|
|
|
833980 |
@@ -216,10 +234,17 @@
|
|
|
833980 |
rm -f "$tmpdepfile"
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
+xlc)
|
|
|
833980 |
+ # This case exists only to let depend.m4 do its work. It works by
|
|
|
833980 |
+ # looking at the text of this script. This case will never be run,
|
|
|
833980 |
+ # since it is checked for above.
|
|
|
833980 |
+ exit 1
|
|
|
833980 |
+ ;;
|
|
|
833980 |
+
|
|
|
833980 |
aix)
|
|
|
833980 |
# The C for AIX Compiler uses -M and outputs the dependencies
|
|
|
833980 |
# in a .u file. In older versions, this file always lives in the
|
|
|
833980 |
- # current directory. Also, the AIX compiler puts `$object:' at the
|
|
|
833980 |
+ # current directory. Also, the AIX compiler puts '$object:' at the
|
|
|
833980 |
# start of each line; $object doesn't have directory information.
|
|
|
833980 |
# Version 6 uses the directory in both cases.
|
|
|
833980 |
dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
|
|
|
833980 |
@@ -249,12 +274,11 @@
|
|
|
833980 |
test -f "$tmpdepfile" && break
|
|
|
833980 |
done
|
|
|
833980 |
if test -f "$tmpdepfile"; then
|
|
|
833980 |
- # Each line is of the form `foo.o: dependent.h'.
|
|
|
833980 |
+ # Each line is of the form 'foo.o: dependent.h'.
|
|
|
833980 |
# Do two passes, one to just change these to
|
|
|
833980 |
- # `$object: dependent.h' and one to simply `dependent.h:'.
|
|
|
833980 |
+ # '$object: dependent.h' and one to simply 'dependent.h:'.
|
|
|
833980 |
sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
|
|
|
833980 |
- # That's a tab and a space in the [].
|
|
|
833980 |
- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
|
|
|
833980 |
+ sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
|
|
|
833980 |
else
|
|
|
833980 |
# The sourcefile does not contain any dependencies, so just
|
|
|
833980 |
# store a dummy comment line, to avoid errors with the Makefile
|
|
|
833980 |
@@ -265,23 +289,26 @@
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
icc)
|
|
|
833980 |
- # Intel's C compiler understands `-MD -MF file'. However on
|
|
|
833980 |
- # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
|
|
|
833980 |
+ # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
|
|
|
833980 |
+ # However on
|
|
|
833980 |
+ # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
|
|
|
833980 |
# ICC 7.0 will fill foo.d with something like
|
|
|
833980 |
# foo.o: sub/foo.c
|
|
|
833980 |
# foo.o: sub/foo.h
|
|
|
833980 |
- # which is wrong. We want:
|
|
|
833980 |
+ # which is wrong. We want
|
|
|
833980 |
# sub/foo.o: sub/foo.c
|
|
|
833980 |
# sub/foo.o: sub/foo.h
|
|
|
833980 |
# sub/foo.c:
|
|
|
833980 |
# sub/foo.h:
|
|
|
833980 |
# ICC 7.1 will output
|
|
|
833980 |
# foo.o: sub/foo.c sub/foo.h
|
|
|
833980 |
- # and will wrap long lines using \ :
|
|
|
833980 |
+ # and will wrap long lines using '\':
|
|
|
833980 |
# foo.o: sub/foo.c ... \
|
|
|
833980 |
# sub/foo.h ... \
|
|
|
833980 |
# ...
|
|
|
833980 |
-
|
|
|
833980 |
+ # tcc 0.9.26 (FIXME still under development at the moment of writing)
|
|
|
833980 |
+ # will emit a similar output, but also prepend the continuation lines
|
|
|
833980 |
+ # with horizontal tabulation characters.
|
|
|
833980 |
"$@" -MD -MF "$tmpdepfile"
|
|
|
833980 |
stat=$?
|
|
|
833980 |
if test $stat -eq 0; then :
|
|
|
833980 |
@@ -290,15 +317,21 @@
|
|
|
833980 |
exit $stat
|
|
|
833980 |
fi
|
|
|
833980 |
rm -f "$depfile"
|
|
|
833980 |
- # Each line is of the form `foo.o: dependent.h',
|
|
|
833980 |
- # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
|
|
|
833980 |
+ # Each line is of the form 'foo.o: dependent.h',
|
|
|
833980 |
+ # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
|
|
|
833980 |
# Do two passes, one to just change these to
|
|
|
833980 |
- # `$object: dependent.h' and one to simply `dependent.h:'.
|
|
|
833980 |
- sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
|
|
|
833980 |
- # Some versions of the HPUX 10.20 sed can't process this invocation
|
|
|
833980 |
- # correctly. Breaking it into two sed invocations is a workaround.
|
|
|
833980 |
- sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
|
|
|
833980 |
- sed -e 's/$/ :/' >> "$depfile"
|
|
|
833980 |
+ # '$object: dependent.h' and one to simply 'dependent.h:'.
|
|
|
833980 |
+ sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \
|
|
|
833980 |
+ < "$tmpdepfile" > "$depfile"
|
|
|
833980 |
+ sed '
|
|
|
833980 |
+ s/[ '"$tab"'][ '"$tab"']*/ /g
|
|
|
833980 |
+ s/^ *//
|
|
|
833980 |
+ s/ *\\*$//
|
|
|
833980 |
+ s/^[^:]*: *//
|
|
|
833980 |
+ /^$/d
|
|
|
833980 |
+ /:$/d
|
|
|
833980 |
+ s/$/ :/
|
|
|
833980 |
+ ' < "$tmpdepfile" >> "$depfile"
|
|
|
833980 |
rm -f "$tmpdepfile"
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
@@ -334,7 +367,7 @@
|
|
|
833980 |
done
|
|
|
833980 |
if test -f "$tmpdepfile"; then
|
|
|
833980 |
sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
|
|
|
833980 |
- # Add `dependent.h:' lines.
|
|
|
833980 |
+ # Add 'dependent.h:' lines.
|
|
|
833980 |
sed -ne '2,${
|
|
|
833980 |
s/^ *//
|
|
|
833980 |
s/ \\*$//
|
|
|
833980 |
@@ -349,9 +382,9 @@
|
|
|
833980 |
|
|
|
833980 |
tru64)
|
|
|
833980 |
# The Tru64 compiler uses -MD to generate dependencies as a side
|
|
|
833980 |
- # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
|
|
|
833980 |
+ # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
|
|
|
833980 |
# At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
|
|
|
833980 |
- # dependencies in `foo.d' instead, so we check for that too.
|
|
|
833980 |
+ # dependencies in 'foo.d' instead, so we check for that too.
|
|
|
833980 |
# Subdirectories are respected.
|
|
|
833980 |
dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
|
|
|
833980 |
test "x$dir" = "x$object" && dir=
|
|
|
833980 |
@@ -397,14 +430,59 @@
|
|
|
833980 |
done
|
|
|
833980 |
if test -f "$tmpdepfile"; then
|
|
|
833980 |
sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
|
|
|
833980 |
- # That's a tab and a space in the [].
|
|
|
833980 |
- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
|
|
|
833980 |
+ sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
|
|
|
833980 |
else
|
|
|
833980 |
echo "#dummy" > "$depfile"
|
|
|
833980 |
fi
|
|
|
833980 |
rm -f "$tmpdepfile"
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
+msvc7)
|
|
|
833980 |
+ if test "$libtool" = yes; then
|
|
|
833980 |
+ showIncludes=-Wc,-showIncludes
|
|
|
833980 |
+ else
|
|
|
833980 |
+ showIncludes=-showIncludes
|
|
|
833980 |
+ fi
|
|
|
833980 |
+ "$@" $showIncludes > "$tmpdepfile"
|
|
|
833980 |
+ stat=$?
|
|
|
833980 |
+ grep -v '^Note: including file: ' "$tmpdepfile"
|
|
|
833980 |
+ if test "$stat" = 0; then :
|
|
|
833980 |
+ else
|
|
|
833980 |
+ rm -f "$tmpdepfile"
|
|
|
833980 |
+ exit $stat
|
|
|
833980 |
+ fi
|
|
|
833980 |
+ rm -f "$depfile"
|
|
|
833980 |
+ echo "$object : \\" > "$depfile"
|
|
|
833980 |
+ # The first sed program below extracts the file names and escapes
|
|
|
833980 |
+ # backslashes for cygpath. The second sed program outputs the file
|
|
|
833980 |
+ # name when reading, but also accumulates all include files in the
|
|
|
833980 |
+ # hold buffer in order to output them again at the end. This only
|
|
|
833980 |
+ # works with sed implementations that can handle large buffers.
|
|
|
833980 |
+ sed < "$tmpdepfile" -n '
|
|
|
833980 |
+/^Note: including file: *\(.*\)/ {
|
|
|
833980 |
+ s//\1/
|
|
|
833980 |
+ s/\\/\\\\/g
|
|
|
833980 |
+ p
|
|
|
833980 |
+}' | $cygpath_u | sort -u | sed -n '
|
|
|
833980 |
+s/ /\\ /g
|
|
|
833980 |
+s/\(.*\)/'"$tab"'\1 \\/p
|
|
|
833980 |
+s/.\(.*\) \\/\1:/
|
|
|
833980 |
+H
|
|
|
833980 |
+$ {
|
|
|
833980 |
+ s/.*/'"$tab"'/
|
|
|
833980 |
+ G
|
|
|
833980 |
+ p
|
|
|
833980 |
+}' >> "$depfile"
|
|
|
833980 |
+ rm -f "$tmpdepfile"
|
|
|
833980 |
+ ;;
|
|
|
833980 |
+
|
|
|
833980 |
+msvc7msys)
|
|
|
833980 |
+ # This case exists only to let depend.m4 do its work. It works by
|
|
|
833980 |
+ # looking at the text of this script. This case will never be run,
|
|
|
833980 |
+ # since it is checked for above.
|
|
|
833980 |
+ exit 1
|
|
|
833980 |
+ ;;
|
|
|
833980 |
+
|
|
|
833980 |
#nosideeffect)
|
|
|
833980 |
# This comment above is used by automake to tell side-effect
|
|
|
833980 |
# dependency tracking mechanisms from slower ones.
|
|
|
833980 |
@@ -422,7 +500,7 @@
|
|
|
833980 |
shift
|
|
|
833980 |
fi
|
|
|
833980 |
|
|
|
833980 |
- # Remove `-o $object'.
|
|
|
833980 |
+ # Remove '-o $object'.
|
|
|
833980 |
IFS=" "
|
|
|
833980 |
for arg
|
|
|
833980 |
do
|
|
|
833980 |
@@ -442,15 +520,14 @@
|
|
|
833980 |
done
|
|
|
833980 |
|
|
|
833980 |
test -z "$dashmflag" && dashmflag=-M
|
|
|
833980 |
- # Require at least two characters before searching for `:'
|
|
|
833980 |
+ # Require at least two characters before searching for ':'
|
|
|
833980 |
# in the target name. This is to cope with DOS-style filenames:
|
|
|
833980 |
- # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
|
|
|
833980 |
+ # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
|
|
|
833980 |
"$@" $dashmflag |
|
|
|
833980 |
- sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
|
|
|
833980 |
+ sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
|
|
|
833980 |
rm -f "$depfile"
|
|
|
833980 |
cat < "$tmpdepfile" > "$depfile"
|
|
|
833980 |
- tr ' ' '
|
|
|
833980 |
-' < "$tmpdepfile" | \
|
|
|
833980 |
+ tr ' ' "$nl" < "$tmpdepfile" | \
|
|
|
833980 |
## Some versions of the HPUX 10.20 sed can't process this invocation
|
|
|
833980 |
## correctly. Breaking it into two sed invocations is a workaround.
|
|
|
833980 |
sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
|
|
|
833980 |
@@ -503,9 +580,10 @@
|
|
|
833980 |
touch "$tmpdepfile"
|
|
|
833980 |
${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
|
|
|
833980 |
rm -f "$depfile"
|
|
|
833980 |
- cat < "$tmpdepfile" > "$depfile"
|
|
|
833980 |
- sed '1,2d' "$tmpdepfile" | tr ' ' '
|
|
|
833980 |
-' | \
|
|
|
833980 |
+ # makedepend may prepend the VPATH from the source file name to the object.
|
|
|
833980 |
+ # No need to regex-escape $object, excess matching of '.' is harmless.
|
|
|
833980 |
+ sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
|
|
|
833980 |
+ sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \
|
|
|
833980 |
## Some versions of the HPUX 10.20 sed can't process this invocation
|
|
|
833980 |
## correctly. Breaking it into two sed invocations is a workaround.
|
|
|
833980 |
sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
|
|
|
833980 |
@@ -525,7 +603,7 @@
|
|
|
833980 |
shift
|
|
|
833980 |
fi
|
|
|
833980 |
|
|
|
833980 |
- # Remove `-o $object'.
|
|
|
833980 |
+ # Remove '-o $object'.
|
|
|
833980 |
IFS=" "
|
|
|
833980 |
for arg
|
|
|
833980 |
do
|
|
|
833980 |
@@ -594,8 +672,8 @@
|
|
|
833980 |
sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
|
|
|
833980 |
rm -f "$depfile"
|
|
|
833980 |
echo "$object : \\" > "$depfile"
|
|
|
833980 |
- sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
|
|
|
833980 |
- echo " " >> "$depfile"
|
|
|
833980 |
+ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
|
|
|
833980 |
+ echo "$tab" >> "$depfile"
|
|
|
833980 |
sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
|
|
|
833980 |
rm -f "$tmpdepfile"
|
|
|
833980 |
;;
|
|
|
833980 |
diff -u -Naur potrace-1.11/INSTALL potrace-1.11-patched/INSTALL
|
|
|
833980 |
--- potrace-1.11/INSTALL 2010-11-04 23:08:34.000000000 -0300
|
|
|
833980 |
+++ potrace-1.11-patched/INSTALL 2013-05-14 17:54:51.723878277 -0300
|
|
|
833980 |
@@ -1,8 +1,8 @@
|
|
|
833980 |
Installation Instructions
|
|
|
833980 |
*************************
|
|
|
833980 |
|
|
|
833980 |
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
|
|
|
833980 |
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
|
|
|
833980 |
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
|
|
|
833980 |
+Inc.
|
|
|
833980 |
|
|
|
833980 |
Copying and distribution of this file, with or without modification,
|
|
|
833980 |
are permitted in any medium without royalty provided the copyright
|
|
|
833980 |
@@ -226,6 +226,11 @@
|
|
|
833980 |
|
|
|
833980 |
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
|
|
|
833980 |
|
|
|
833980 |
+ HP-UX `make' updates targets which have the same time stamps as
|
|
|
833980 |
+their prerequisites, which makes it generally unusable when shipped
|
|
|
833980 |
+generated files such as `configure' are involved. Use GNU `make'
|
|
|
833980 |
+instead.
|
|
|
833980 |
+
|
|
|
833980 |
On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
|
|
|
833980 |
parse its `<wchar.h>' header file. The option `-nodtk' can be used as
|
|
|
833980 |
a workaround. If GNU CC is not installed, it is therefore recommended
|
|
|
833980 |
diff -u -Naur potrace-1.11/install-sh potrace-1.11-patched/install-sh
|
|
|
833980 |
--- potrace-1.11/install-sh 2010-11-04 23:08:34.000000000 -0300
|
|
|
833980 |
+++ potrace-1.11-patched/install-sh 2013-05-14 17:54:51.363873585 -0300
|
|
|
833980 |
@@ -1,7 +1,7 @@
|
|
|
833980 |
#!/bin/sh
|
|
|
833980 |
# install - install a program, script, or datafile
|
|
|
833980 |
|
|
|
833980 |
-scriptversion=2009-04-28.21; # UTC
|
|
|
833980 |
+scriptversion=2011-01-19.21; # UTC
|
|
|
833980 |
|
|
|
833980 |
# This originates from X11R5 (mit/util/scripts/install.sh), which was
|
|
|
833980 |
# later released in X11R6 (xc/config/util/install.sh) with the
|
|
|
833980 |
@@ -156,6 +156,10 @@
|
|
|
833980 |
-s) stripcmd=$stripprog;;
|
|
|
833980 |
|
|
|
833980 |
-t) dst_arg=$2
|
|
|
833980 |
+ # Protect names problematic for `test' and other utilities.
|
|
|
833980 |
+ case $dst_arg in
|
|
|
833980 |
+ -* | [=\(\)!]) dst_arg=./$dst_arg;;
|
|
|
833980 |
+ esac
|
|
|
833980 |
shift;;
|
|
|
833980 |
|
|
|
833980 |
-T) no_target_directory=true;;
|
|
|
833980 |
@@ -186,6 +190,10 @@
|
|
|
833980 |
fi
|
|
|
833980 |
shift # arg
|
|
|
833980 |
dst_arg=$arg
|
|
|
833980 |
+ # Protect names problematic for `test' and other utilities.
|
|
|
833980 |
+ case $dst_arg in
|
|
|
833980 |
+ -* | [=\(\)!]) dst_arg=./$dst_arg;;
|
|
|
833980 |
+ esac
|
|
|
833980 |
done
|
|
|
833980 |
fi
|
|
|
833980 |
|
|
|
833980 |
@@ -200,7 +208,11 @@
|
|
|
833980 |
fi
|
|
|
833980 |
|
|
|
833980 |
if test -z "$dir_arg"; then
|
|
|
833980 |
- trap '(exit $?); exit' 1 2 13 15
|
|
|
833980 |
+ do_exit='(exit $ret); exit $ret'
|
|
|
833980 |
+ trap "ret=129; $do_exit" 1
|
|
|
833980 |
+ trap "ret=130; $do_exit" 2
|
|
|
833980 |
+ trap "ret=141; $do_exit" 13
|
|
|
833980 |
+ trap "ret=143; $do_exit" 15
|
|
|
833980 |
|
|
|
833980 |
# Set umask so as not to create temps with too-generous modes.
|
|
|
833980 |
# However, 'strip' requires both read and write access to temps.
|
|
|
833980 |
@@ -228,9 +240,9 @@
|
|
|
833980 |
|
|
|
833980 |
for src
|
|
|
833980 |
do
|
|
|
833980 |
- # Protect names starting with `-'.
|
|
|
833980 |
+ # Protect names problematic for `test' and other utilities.
|
|
|
833980 |
case $src in
|
|
|
833980 |
- -*) src=./$src;;
|
|
|
833980 |
+ -* | [=\(\)!]) src=./$src;;
|
|
|
833980 |
esac
|
|
|
833980 |
|
|
|
833980 |
if test -n "$dir_arg"; then
|
|
|
833980 |
@@ -252,12 +264,7 @@
|
|
|
833980 |
echo "$0: no destination specified." >&2
|
|
|
833980 |
exit 1
|
|
|
833980 |
fi
|
|
|
833980 |
-
|
|
|
833980 |
dst=$dst_arg
|
|
|
833980 |
- # Protect names starting with `-'.
|
|
|
833980 |
- case $dst in
|
|
|
833980 |
- -*) dst=./$dst;;
|
|
|
833980 |
- esac
|
|
|
833980 |
|
|
|
833980 |
# If destination is a directory, append the input filename; won't work
|
|
|
833980 |
# if double slashes aren't ignored.
|
|
|
833980 |
@@ -385,7 +392,7 @@
|
|
|
833980 |
|
|
|
833980 |
case $dstdir in
|
|
|
833980 |
/*) prefix='/';;
|
|
|
833980 |
- -*) prefix='./';;
|
|
|
833980 |
+ [-=\(\)!]*) prefix='./';;
|
|
|
833980 |
*) prefix='';;
|
|
|
833980 |
esac
|
|
|
833980 |
|
|
|
833980 |
@@ -403,7 +410,7 @@
|
|
|
833980 |
|
|
|
833980 |
for d
|
|
|
833980 |
do
|
|
|
833980 |
- test -z "$d" && continue
|
|
|
833980 |
+ test X"$d" = X && continue
|
|
|
833980 |
|
|
|
833980 |
prefix=$prefix$d
|
|
|
833980 |
if test -d "$prefix"; then
|
|
|
833980 |
diff -u -Naur potrace-1.11/ltmain.sh potrace-1.11-patched/ltmain.sh
|
|
|
833980 |
--- potrace-1.11/ltmain.sh 2013-01-21 12:47:52.000000000 -0400
|
|
|
833980 |
+++ potrace-1.11-patched/ltmain.sh 2013-05-14 17:54:44.939789712 -0300
|
|
|
833980 |
@@ -70,7 +70,7 @@
|
|
|
833980 |
# compiler: $LTCC
|
|
|
833980 |
# compiler flags: $LTCFLAGS
|
|
|
833980 |
# linker: $LD (gnu? $with_gnu_ld)
|
|
|
833980 |
-# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1
|
|
|
833980 |
+# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu2
|
|
|
833980 |
# automake: $automake_version
|
|
|
833980 |
# autoconf: $autoconf_version
|
|
|
833980 |
#
|
|
|
833980 |
@@ -80,7 +80,7 @@
|
|
|
833980 |
|
|
|
833980 |
PROGRAM=libtool
|
|
|
833980 |
PACKAGE=libtool
|
|
|
833980 |
-VERSION="2.4.2 Debian-2.4.2-1ubuntu1"
|
|
|
833980 |
+VERSION="2.4.2 Debian-2.4.2-1ubuntu2"
|
|
|
833980 |
TIMESTAMP=""
|
|
|
833980 |
package_revision=1.3337
|
|
|
833980 |
|
|
|
833980 |
diff -u -Naur potrace-1.11/m4/libtool.m4 potrace-1.11-patched/m4/libtool.m4
|
|
|
833980 |
--- potrace-1.11/m4/libtool.m4 2012-02-23 20:32:33.000000000 -0400
|
|
|
833980 |
+++ potrace-1.11-patched/m4/libtool.m4 2013-05-14 17:54:45.035790966 -0300
|
|
|
833980 |
@@ -1,8 +1,8 @@
|
|
|
833980 |
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
|
|
|
833980 |
#
|
|
|
833980 |
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
|
|
|
833980 |
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
|
|
|
833980 |
-# Inc.
|
|
|
833980 |
+# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
|
|
|
833980 |
+# Foundation, Inc.
|
|
|
833980 |
# Written by Gordon Matzigkeit, 1996
|
|
|
833980 |
#
|
|
|
833980 |
# This file is free software; the Free Software Foundation gives
|
|
|
833980 |
@@ -11,8 +11,8 @@
|
|
|
833980 |
|
|
|
833980 |
m4_define([_LT_COPYING], [dnl
|
|
|
833980 |
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
|
|
|
833980 |
-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
|
|
|
833980 |
-# Inc.
|
|
|
833980 |
+# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
|
|
|
833980 |
+# Foundation, Inc.
|
|
|
833980 |
# Written by Gordon Matzigkeit, 1996
|
|
|
833980 |
#
|
|
|
833980 |
# This file is part of GNU Libtool.
|
|
|
833980 |
@@ -146,6 +146,8 @@
|
|
|
833980 |
AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
|
|
|
833980 |
AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
|
|
|
833980 |
|
|
|
833980 |
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
|
|
|
833980 |
+dnl
|
|
|
833980 |
_LT_DECL([], [host_alias], [0], [The host system])dnl
|
|
|
833980 |
_LT_DECL([], [host], [0])dnl
|
|
|
833980 |
_LT_DECL([], [host_os], [0])dnl
|
|
|
833980 |
@@ -637,7 +639,7 @@
|
|
|
833980 |
m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
|
|
|
833980 |
configured by $[0], generated by m4_PACKAGE_STRING.
|
|
|
833980 |
|
|
|
833980 |
-Copyright (C) 2010 Free Software Foundation, Inc.
|
|
|
833980 |
+Copyright (C) 2011 Free Software Foundation, Inc.
|
|
|
833980 |
This config.lt script is free software; the Free Software Foundation
|
|
|
833980 |
gives unlimited permision to copy, distribute and modify it."
|
|
|
833980 |
|
|
|
833980 |
@@ -801,6 +803,7 @@
|
|
|
833980 |
m4_case([$1],
|
|
|
833980 |
[C], [_LT_LANG(C)],
|
|
|
833980 |
[C++], [_LT_LANG(CXX)],
|
|
|
833980 |
+ [Go], [_LT_LANG(GO)],
|
|
|
833980 |
[Java], [_LT_LANG(GCJ)],
|
|
|
833980 |
[Fortran 77], [_LT_LANG(F77)],
|
|
|
833980 |
[Fortran], [_LT_LANG(FC)],
|
|
|
833980 |
@@ -822,6 +825,31 @@
|
|
|
833980 |
])# _LT_LANG
|
|
|
833980 |
|
|
|
833980 |
|
|
|
833980 |
+m4_ifndef([AC_PROG_GO], [
|
|
|
833980 |
+############################################################
|
|
|
833980 |
+# NOTE: This macro has been submitted for inclusion into #
|
|
|
833980 |
+# GNU Autoconf as AC_PROG_GO. When it is available in #
|
|
|
833980 |
+# a released version of Autoconf we should remove this #
|
|
|
833980 |
+# macro and use it instead. #
|
|
|
833980 |
+############################################################
|
|
|
833980 |
+m4_defun([AC_PROG_GO],
|
|
|
833980 |
+[AC_LANG_PUSH(Go)dnl
|
|
|
833980 |
+AC_ARG_VAR([GOC], [Go compiler command])dnl
|
|
|
833980 |
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
|
|
|
833980 |
+_AC_ARG_VAR_LDFLAGS()dnl
|
|
|
833980 |
+AC_CHECK_TOOL(GOC, gccgo)
|
|
|
833980 |
+if test -z "$GOC"; then
|
|
|
833980 |
+ if test -n "$ac_tool_prefix"; then
|
|
|
833980 |
+ AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
|
|
|
833980 |
+ fi
|
|
|
833980 |
+fi
|
|
|
833980 |
+if test -z "$GOC"; then
|
|
|
833980 |
+ AC_CHECK_PROG(GOC, gccgo, gccgo, false)
|
|
|
833980 |
+fi
|
|
|
833980 |
+])#m4_defun
|
|
|
833980 |
+])#m4_ifndef
|
|
|
833980 |
+
|
|
|
833980 |
+
|
|
|
833980 |
# _LT_LANG_DEFAULT_CONFIG
|
|
|
833980 |
# -----------------------
|
|
|
833980 |
m4_defun([_LT_LANG_DEFAULT_CONFIG],
|
|
|
833980 |
@@ -852,6 +880,10 @@
|
|
|
833980 |
m4_ifdef([LT_PROG_GCJ],
|
|
|
833980 |
[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
|
|
|
833980 |
|
|
|
833980 |
+AC_PROVIDE_IFELSE([AC_PROG_GO],
|
|
|
833980 |
+ [LT_LANG(GO)],
|
|
|
833980 |
+ [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
|
|
|
833980 |
+
|
|
|
833980 |
AC_PROVIDE_IFELSE([LT_PROG_RC],
|
|
|
833980 |
[LT_LANG(RC)],
|
|
|
833980 |
[m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
|
|
|
833980 |
@@ -954,7 +986,13 @@
|
|
|
833980 |
$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
|
|
|
833980 |
-dynamiclib -Wl,-single_module conftest.c 2>conftest.err
|
|
|
833980 |
_lt_result=$?
|
|
|
833980 |
- if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
|
|
|
833980 |
+ # If there is a non-empty error log, and "single_module"
|
|
|
833980 |
+ # appears in it, assume the flag caused a linker warning
|
|
|
833980 |
+ if test -s conftest.err && $GREP single_module conftest.err; then
|
|
|
833980 |
+ cat conftest.err >&AS_MESSAGE_LOG_FD
|
|
|
833980 |
+ # Otherwise, if the output was created with a 0 exit code from
|
|
|
833980 |
+ # the compiler, it worked.
|
|
|
833980 |
+ elif test -f libconftest.dylib && test $_lt_result -eq 0; then
|
|
|
833980 |
lt_cv_apple_cc_single_mod=yes
|
|
|
833980 |
else
|
|
|
833980 |
cat conftest.err >&AS_MESSAGE_LOG_FD
|
|
|
833980 |
@@ -962,6 +1000,7 @@
|
|
|
833980 |
rm -rf libconftest.dylib*
|
|
|
833980 |
rm -f conftest.*
|
|
|
833980 |
fi])
|
|
|
833980 |
+
|
|
|
833980 |
AC_CACHE_CHECK([for -exported_symbols_list linker flag],
|
|
|
833980 |
[lt_cv_ld_exported_symbols_list],
|
|
|
833980 |
[lt_cv_ld_exported_symbols_list=no
|
|
|
833980 |
@@ -973,6 +1012,7 @@
|
|
|
833980 |
[lt_cv_ld_exported_symbols_list=no])
|
|
|
833980 |
LDFLAGS="$save_LDFLAGS"
|
|
|
833980 |
])
|
|
|
833980 |
+
|
|
|
833980 |
AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
|
|
|
833980 |
[lt_cv_ld_force_load=no
|
|
|
833980 |
cat > conftest.c << _LT_EOF
|
|
|
833980 |
@@ -990,7 +1030,9 @@
|
|
|
833980 |
echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
|
|
|
833980 |
$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
|
|
|
833980 |
_lt_result=$?
|
|
|
833980 |
- if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
|
|
|
833980 |
+ if test -s conftest.err && $GREP force_load conftest.err; then
|
|
|
833980 |
+ cat conftest.err >&AS_MESSAGE_LOG_FD
|
|
|
833980 |
+ elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
|
|
|
833980 |
lt_cv_ld_force_load=yes
|
|
|
833980 |
else
|
|
|
833980 |
cat conftest.err >&AS_MESSAGE_LOG_FD
|
|
|
833980 |
@@ -1035,8 +1077,8 @@
|
|
|
833980 |
])
|
|
|
833980 |
|
|
|
833980 |
|
|
|
833980 |
-# _LT_DARWIN_LINKER_FEATURES
|
|
|
833980 |
-# --------------------------
|
|
|
833980 |
+# _LT_DARWIN_LINKER_FEATURES([TAG])
|
|
|
833980 |
+# ---------------------------------
|
|
|
833980 |
# Checks for linker and compiler features on darwin
|
|
|
833980 |
m4_defun([_LT_DARWIN_LINKER_FEATURES],
|
|
|
833980 |
[
|
|
|
833980 |
@@ -1047,6 +1089,8 @@
|
|
|
833980 |
_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
|
|
|
833980 |
if test "$lt_cv_ld_force_load" = "yes"; then
|
|
|
833980 |
_LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
|
|
|
833980 |
+ m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
|
|
|
833980 |
+ [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes])
|
|
|
833980 |
else
|
|
|
833980 |
_LT_TAGVAR(whole_archive_flag_spec, $1)=''
|
|
|
833980 |
fi
|
|
|
833980 |
@@ -1330,14 +1374,27 @@
|
|
|
833980 |
CFLAGS="$SAVE_CFLAGS"
|
|
|
833980 |
fi
|
|
|
833980 |
;;
|
|
|
833980 |
-sparc*-*solaris*)
|
|
|
833980 |
+*-*solaris*)
|
|
|
833980 |
# Find out which ABI we are using.
|
|
|
833980 |
echo 'int i;' > conftest.$ac_ext
|
|
|
833980 |
if AC_TRY_EVAL(ac_compile); then
|
|
|
833980 |
case `/usr/bin/file conftest.o` in
|
|
|
833980 |
*64-bit*)
|
|
|
833980 |
case $lt_cv_prog_gnu_ld in
|
|
|
833980 |
- yes*) LD="${LD-ld} -m elf64_sparc" ;;
|
|
|
833980 |
+ yes*)
|
|
|
833980 |
+ case $host in
|
|
|
833980 |
+ i?86-*-solaris*)
|
|
|
833980 |
+ LD="${LD-ld} -m elf_x86_64"
|
|
|
833980 |
+ ;;
|
|
|
833980 |
+ sparc*-*-solaris*)
|
|
|
833980 |
+ LD="${LD-ld} -m elf64_sparc"
|
|
|
833980 |
+ ;;
|
|
|
833980 |
+ esac
|
|
|
833980 |
+ # GNU ld 2.21 introduced _sol2 emulations. Use them if available.
|
|
|
833980 |
+ if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
|
|
|
833980 |
+ LD="${LD-ld}_sol2"
|
|
|
833980 |
+ fi
|
|
|
833980 |
+ ;;
|
|
|
833980 |
*)
|
|
|
833980 |
if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
|
|
|
833980 |
LD="${LD-ld} -64"
|
|
|
833980 |
@@ -1414,13 +1471,13 @@
|
|
|
833980 |
if test -n "$RANLIB"; then
|
|
|
833980 |
case $host_os in
|
|
|
833980 |
openbsd*)
|
|
|
833980 |
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
|
|
|
833980 |
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
|
|
|
833980 |
;;
|
|
|
833980 |
*)
|
|
|
833980 |
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
|
|
|
833980 |
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
|
|
|
833980 |
;;
|
|
|
833980 |
esac
|
|
|
833980 |
- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
|
|
|
833980 |
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
|
|
|
833980 |
fi
|
|
|
833980 |
|
|
|
833980 |
case $host_os in
|
|
|
833980 |
@@ -1600,6 +1657,11 @@
|
|
|
833980 |
lt_cv_sys_max_cmd_len=196608
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
+ os2*)
|
|
|
833980 |
+ # The test takes a long time on OS/2.
|
|
|
833980 |
+ lt_cv_sys_max_cmd_len=8192
|
|
|
833980 |
+ ;;
|
|
|
833980 |
+
|
|
|
833980 |
osf*)
|
|
|
833980 |
# Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
|
|
|
833980 |
# due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
|
|
|
833980 |
@@ -1639,7 +1701,7 @@
|
|
|
833980 |
# If test is not a shell built-in, we'll probably end up computing a
|
|
|
833980 |
# maximum length that is only half of the actual maximum length, but
|
|
|
833980 |
# we can't tell.
|
|
|
833980 |
- while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
|
|
|
833980 |
+ while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
|
|
|
833980 |
= "X$teststring$teststring"; } >/dev/null 2>&1 &&
|
|
|
833980 |
test $i != 17 # 1/2 MB should be enough
|
|
|
833980 |
do
|
|
|
833980 |
@@ -2185,7 +2247,7 @@
|
|
|
833980 |
|
|
|
833980 |
case $host_os in
|
|
|
833980 |
aix3*)
|
|
|
833980 |
- version_type=linux
|
|
|
833980 |
+ version_type=linux # correct to gnu/linux during the next big refactor
|
|
|
833980 |
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
|
|
|
833980 |
shlibpath_var=LIBPATH
|
|
|
833980 |
|
|
|
833980 |
@@ -2194,7 +2256,7 @@
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
aix[[4-9]]*)
|
|
|
833980 |
- version_type=linux
|
|
|
833980 |
+ version_type=linux # correct to gnu/linux during the next big refactor
|
|
|
833980 |
need_lib_prefix=no
|
|
|
833980 |
need_version=no
|
|
|
833980 |
hardcode_into_libs=yes
|
|
|
833980 |
@@ -2259,7 +2321,7 @@
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
bsdi[[45]]*)
|
|
|
833980 |
- version_type=linux
|
|
|
833980 |
+ version_type=linux # correct to gnu/linux during the next big refactor
|
|
|
833980 |
need_version=no
|
|
|
833980 |
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
|
|
833980 |
soname_spec='${libname}${release}${shared_ext}$major'
|
|
|
833980 |
@@ -2398,7 +2460,7 @@
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
dgux*)
|
|
|
833980 |
- version_type=linux
|
|
|
833980 |
+ version_type=linux # correct to gnu/linux during the next big refactor
|
|
|
833980 |
need_lib_prefix=no
|
|
|
833980 |
need_version=no
|
|
|
833980 |
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
|
|
|
833980 |
@@ -2406,10 +2468,6 @@
|
|
|
833980 |
shlibpath_var=LD_LIBRARY_PATH
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
-freebsd1*)
|
|
|
833980 |
- dynamic_linker=no
|
|
|
833980 |
- ;;
|
|
|
833980 |
-
|
|
|
833980 |
freebsd* | dragonfly*)
|
|
|
833980 |
# DragonFly does not have aout. When/if they implement a new
|
|
|
833980 |
# versioning mechanism, adjust this.
|
|
|
833980 |
@@ -2417,7 +2475,7 @@
|
|
|
833980 |
objformat=`/usr/bin/objformat`
|
|
|
833980 |
else
|
|
|
833980 |
case $host_os in
|
|
|
833980 |
- freebsd[[123]]*) objformat=aout ;;
|
|
|
833980 |
+ freebsd[[23]].*) objformat=aout ;;
|
|
|
833980 |
*) objformat=elf ;;
|
|
|
833980 |
esac
|
|
|
833980 |
fi
|
|
|
833980 |
@@ -2435,7 +2493,7 @@
|
|
|
833980 |
esac
|
|
|
833980 |
shlibpath_var=LD_LIBRARY_PATH
|
|
|
833980 |
case $host_os in
|
|
|
833980 |
- freebsd2*)
|
|
|
833980 |
+ freebsd2.*)
|
|
|
833980 |
shlibpath_overrides_runpath=yes
|
|
|
833980 |
;;
|
|
|
833980 |
freebsd3.[[01]]* | freebsdelf3.[[01]]*)
|
|
|
833980 |
@@ -2455,7 +2513,7 @@
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
gnu*)
|
|
|
833980 |
- version_type=linux
|
|
|
833980 |
+ version_type=linux # correct to gnu/linux during the next big refactor
|
|
|
833980 |
need_lib_prefix=no
|
|
|
833980 |
need_version=no
|
|
|
833980 |
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
|
|
|
833980 |
@@ -2466,7 +2524,7 @@
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
haiku*)
|
|
|
833980 |
- version_type=linux
|
|
|
833980 |
+ version_type=linux # correct to gnu/linux during the next big refactor
|
|
|
833980 |
need_lib_prefix=no
|
|
|
833980 |
need_version=no
|
|
|
833980 |
dynamic_linker="$host_os runtime_loader"
|
|
|
833980 |
@@ -2527,7 +2585,7 @@
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
interix[[3-9]]*)
|
|
|
833980 |
- version_type=linux
|
|
|
833980 |
+ version_type=linux # correct to gnu/linux during the next big refactor
|
|
|
833980 |
need_lib_prefix=no
|
|
|
833980 |
need_version=no
|
|
|
833980 |
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
|
|
|
833980 |
@@ -2543,7 +2601,7 @@
|
|
|
833980 |
nonstopux*) version_type=nonstopux ;;
|
|
|
833980 |
*)
|
|
|
833980 |
if test "$lt_cv_prog_gnu_ld" = yes; then
|
|
|
833980 |
- version_type=linux
|
|
|
833980 |
+ version_type=linux # correct to gnu/linux during the next big refactor
|
|
|
833980 |
else
|
|
|
833980 |
version_type=irix
|
|
|
833980 |
fi ;;
|
|
|
833980 |
@@ -2580,9 +2638,9 @@
|
|
|
833980 |
dynamic_linker=no
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
-# This must be Linux ELF.
|
|
|
833980 |
+# This must be glibc/ELF.
|
|
|
833980 |
linux* | k*bsd*-gnu | kopensolaris*-gnu)
|
|
|
833980 |
- version_type=linux
|
|
|
833980 |
+ version_type=linux # correct to gnu/linux during the next big refactor
|
|
|
833980 |
need_lib_prefix=no
|
|
|
833980 |
need_version=no
|
|
|
833980 |
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
|
|
833980 |
@@ -2657,7 +2715,7 @@
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
newsos6)
|
|
|
833980 |
- version_type=linux
|
|
|
833980 |
+ version_type=linux # correct to gnu/linux during the next big refactor
|
|
|
833980 |
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
|
|
833980 |
shlibpath_var=LD_LIBRARY_PATH
|
|
|
833980 |
shlibpath_overrides_runpath=yes
|
|
|
833980 |
@@ -2726,7 +2784,7 @@
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
solaris*)
|
|
|
833980 |
- version_type=linux
|
|
|
833980 |
+ version_type=linux # correct to gnu/linux during the next big refactor
|
|
|
833980 |
need_lib_prefix=no
|
|
|
833980 |
need_version=no
|
|
|
833980 |
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
|
|
833980 |
@@ -2751,7 +2809,7 @@
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
sysv4 | sysv4.3*)
|
|
|
833980 |
- version_type=linux
|
|
|
833980 |
+ version_type=linux # correct to gnu/linux during the next big refactor
|
|
|
833980 |
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
|
|
833980 |
soname_spec='${libname}${release}${shared_ext}$major'
|
|
|
833980 |
shlibpath_var=LD_LIBRARY_PATH
|
|
|
833980 |
@@ -2775,7 +2833,7 @@
|
|
|
833980 |
|
|
|
833980 |
sysv4*MP*)
|
|
|
833980 |
if test -d /usr/nec ;then
|
|
|
833980 |
- version_type=linux
|
|
|
833980 |
+ version_type=linux # correct to gnu/linux during the next big refactor
|
|
|
833980 |
library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
|
|
|
833980 |
soname_spec='$libname${shared_ext}.$major'
|
|
|
833980 |
shlibpath_var=LD_LIBRARY_PATH
|
|
|
833980 |
@@ -2806,7 +2864,7 @@
|
|
|
833980 |
|
|
|
833980 |
tpf*)
|
|
|
833980 |
# TPF is a cross-target only. Preferred cross-host = GNU/Linux.
|
|
|
833980 |
- version_type=linux
|
|
|
833980 |
+ version_type=linux # correct to gnu/linux during the next big refactor
|
|
|
833980 |
need_lib_prefix=no
|
|
|
833980 |
need_version=no
|
|
|
833980 |
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
|
|
833980 |
@@ -2816,7 +2874,7 @@
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
uts4*)
|
|
|
833980 |
- version_type=linux
|
|
|
833980 |
+ version_type=linux # correct to gnu/linux during the next big refactor
|
|
|
833980 |
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
|
|
|
833980 |
soname_spec='${libname}${release}${shared_ext}$major'
|
|
|
833980 |
shlibpath_var=LD_LIBRARY_PATH
|
|
|
833980 |
@@ -3238,7 +3296,7 @@
|
|
|
833980 |
lt_cv_deplibs_check_method=pass_all
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
-# This must be Linux ELF.
|
|
|
833980 |
+# This must be glibc/ELF.
|
|
|
833980 |
linux* | k*bsd*-gnu | kopensolaris*-gnu)
|
|
|
833980 |
lt_cv_deplibs_check_method=pass_all
|
|
|
833980 |
;;
|
|
|
833980 |
@@ -3658,6 +3716,7 @@
|
|
|
833980 |
# which start with @ or ?.
|
|
|
833980 |
lt_cv_sys_global_symbol_pipe="$AWK ['"\
|
|
|
833980 |
" {last_section=section; section=\$ 3};"\
|
|
|
833980 |
+" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
|
|
|
833980 |
" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
|
|
|
833980 |
" \$ 0!~/External *\|/{next};"\
|
|
|
833980 |
" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
|
|
|
833980 |
@@ -4242,7 +4301,9 @@
|
|
|
833980 |
case $cc_basename in
|
|
|
833980 |
nvcc*) # Cuda Compiler Driver 2.2
|
|
|
833980 |
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
|
|
|
833980 |
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
|
|
|
833980 |
+ if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
|
|
|
833980 |
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
|
|
|
833980 |
+ fi
|
|
|
833980 |
;;
|
|
|
833980 |
esac
|
|
|
833980 |
else
|
|
|
833980 |
@@ -4334,18 +4395,33 @@
|
|
|
833980 |
;;
|
|
|
833980 |
*)
|
|
|
833980 |
case `$CC -V 2>&1 | sed 5q` in
|
|
|
833980 |
- *Sun\ F* | *Sun*Fortran*)
|
|
|
833980 |
+ *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
|
|
|
833980 |
# Sun Fortran 8.3 passes all unrecognized flags to the linker
|
|
|
833980 |
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
|
|
|
833980 |
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
|
|
|
833980 |
_LT_TAGVAR(lt_prog_compiler_wl, $1)=''
|
|
|
833980 |
;;
|
|
|
833980 |
+ *Sun\ F* | *Sun*Fortran*)
|
|
|
833980 |
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
|
|
|
833980 |
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
|
|
|
833980 |
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
|
|
|
833980 |
+ ;;
|
|
|
833980 |
*Sun\ C*)
|
|
|
833980 |
# Sun C 5.9
|
|
|
833980 |
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
|
|
|
833980 |
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
|
|
|
833980 |
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
|
|
|
833980 |
;;
|
|
|
833980 |
+ *Intel*\ [[CF]]*Compiler*)
|
|
|
833980 |
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
|
|
|
833980 |
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
|
|
|
833980 |
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
|
|
|
833980 |
+ ;;
|
|
|
833980 |
+ *Portland\ Group*)
|
|
|
833980 |
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
|
|
|
833980 |
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
|
|
|
833980 |
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
|
|
|
833980 |
+ ;;
|
|
|
833980 |
esac
|
|
|
833980 |
;;
|
|
|
833980 |
esac
|
|
|
833980 |
@@ -4505,7 +4581,9 @@
|
|
|
833980 |
;;
|
|
|
833980 |
cygwin* | mingw* | cegcc*)
|
|
|
833980 |
case $cc_basename in
|
|
|
833980 |
- cl*) ;;
|
|
|
833980 |
+ cl*)
|
|
|
833980 |
+ _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
|
|
|
833980 |
+ ;;
|
|
|
833980 |
*)
|
|
|
833980 |
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
|
|
|
833980 |
_LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
|
|
|
833980 |
@@ -4533,7 +4611,6 @@
|
|
|
833980 |
_LT_TAGVAR(hardcode_direct, $1)=no
|
|
|
833980 |
_LT_TAGVAR(hardcode_direct_absolute, $1)=no
|
|
|
833980 |
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
|
|
|
833980 |
- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
|
|
|
833980 |
_LT_TAGVAR(hardcode_libdir_separator, $1)=
|
|
|
833980 |
_LT_TAGVAR(hardcode_minus_L, $1)=no
|
|
|
833980 |
_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
|
|
|
833980 |
@@ -4787,8 +4864,7 @@
|
|
|
833980 |
xlf* | bgf* | bgxlf* | mpixlf*)
|
|
|
833980 |
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
|
|
|
833980 |
_LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
|
|
|
833980 |
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
|
|
|
833980 |
- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
|
|
|
833980 |
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
|
|
|
833980 |
_LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
|
|
|
833980 |
if test "x$supports_anon_versioning" = xyes; then
|
|
|
833980 |
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
|
|
|
833980 |
@@ -5084,6 +5160,7 @@
|
|
|
833980 |
# The linker will not automatically build a static lib if we build a DLL.
|
|
|
833980 |
# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
|
|
|
833980 |
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
|
|
|
833980 |
+ _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
|
|
|
833980 |
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
|
|
|
833980 |
# Don't use ranlib
|
|
|
833980 |
_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
|
|
|
833980 |
@@ -5130,10 +5207,6 @@
|
|
|
833980 |
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
- freebsd1*)
|
|
|
833980 |
- _LT_TAGVAR(ld_shlibs, $1)=no
|
|
|
833980 |
- ;;
|
|
|
833980 |
-
|
|
|
833980 |
# FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
|
|
|
833980 |
# support. Future versions do this automatically, but an explicit c++rt0.o
|
|
|
833980 |
# does not break anything, and helps significantly (at the cost of a little
|
|
|
833980 |
@@ -5146,7 +5219,7 @@
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
# Unfortunately, older versions of FreeBSD 2 do not have this feature.
|
|
|
833980 |
- freebsd2*)
|
|
|
833980 |
+ freebsd2.*)
|
|
|
833980 |
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
|
|
|
833980 |
_LT_TAGVAR(hardcode_direct, $1)=yes
|
|
|
833980 |
_LT_TAGVAR(hardcode_minus_L, $1)=yes
|
|
|
833980 |
@@ -5185,7 +5258,6 @@
|
|
|
833980 |
fi
|
|
|
833980 |
if test "$with_gnu_ld" = no; then
|
|
|
833980 |
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
|
|
|
833980 |
- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
|
|
|
833980 |
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
|
|
|
833980 |
_LT_TAGVAR(hardcode_direct, $1)=yes
|
|
|
833980 |
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
|
|
|
833980 |
@@ -5627,9 +5699,6 @@
|
|
|
833980 |
_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
|
|
|
833980 |
[Flag to hardcode $libdir into a binary during linking.
|
|
|
833980 |
This must work even if $libdir does not exist])
|
|
|
833980 |
-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
|
|
|
833980 |
- [[If ld is used when linking, flag to hardcode $libdir into a binary
|
|
|
833980 |
- during linking. This must work even if $libdir does not exist]])
|
|
|
833980 |
_LT_TAGDECL([], [hardcode_libdir_separator], [1],
|
|
|
833980 |
[Whether we need a single "-rpath" flag with a separated argument])
|
|
|
833980 |
_LT_TAGDECL([], [hardcode_direct], [0],
|
|
|
833980 |
@@ -5787,7 +5856,6 @@
|
|
|
833980 |
_LT_TAGVAR(hardcode_direct, $1)=no
|
|
|
833980 |
_LT_TAGVAR(hardcode_direct_absolute, $1)=no
|
|
|
833980 |
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
|
|
|
833980 |
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
|
|
|
833980 |
_LT_TAGVAR(hardcode_libdir_separator, $1)=
|
|
|
833980 |
_LT_TAGVAR(hardcode_minus_L, $1)=no
|
|
|
833980 |
_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
|
|
|
833980 |
@@ -6157,7 +6225,7 @@
|
|
|
833980 |
esac
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
- freebsd[[12]]*)
|
|
|
833980 |
+ freebsd2.*)
|
|
|
833980 |
# C++ shared libraries reported to be fairly broken before
|
|
|
833980 |
# switch to ELF
|
|
|
833980 |
_LT_TAGVAR(ld_shlibs, $1)=no
|
|
|
833980 |
@@ -6918,12 +6986,18 @@
|
|
|
833980 |
}
|
|
|
833980 |
};
|
|
|
833980 |
_LT_EOF
|
|
|
833980 |
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
|
|
|
833980 |
+package foo
|
|
|
833980 |
+func foo() {
|
|
|
833980 |
+}
|
|
|
833980 |
+_LT_EOF
|
|
|
833980 |
])
|
|
|
833980 |
|
|
|
833980 |
_lt_libdeps_save_CFLAGS=$CFLAGS
|
|
|
833980 |
case "$CC $CFLAGS " in #(
|
|
|
833980 |
*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
|
|
|
833980 |
*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
|
|
|
833980 |
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
|
|
|
833980 |
esac
|
|
|
833980 |
|
|
|
833980 |
dnl Parse the compiler output and extract the necessary
|
|
|
833980 |
@@ -7120,7 +7194,6 @@
|
|
|
833980 |
_LT_TAGVAR(hardcode_direct, $1)=no
|
|
|
833980 |
_LT_TAGVAR(hardcode_direct_absolute, $1)=no
|
|
|
833980 |
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
|
|
|
833980 |
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
|
|
|
833980 |
_LT_TAGVAR(hardcode_libdir_separator, $1)=
|
|
|
833980 |
_LT_TAGVAR(hardcode_minus_L, $1)=no
|
|
|
833980 |
_LT_TAGVAR(hardcode_automatic, $1)=no
|
|
|
833980 |
@@ -7253,7 +7326,6 @@
|
|
|
833980 |
_LT_TAGVAR(hardcode_direct, $1)=no
|
|
|
833980 |
_LT_TAGVAR(hardcode_direct_absolute, $1)=no
|
|
|
833980 |
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
|
|
|
833980 |
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
|
|
|
833980 |
_LT_TAGVAR(hardcode_libdir_separator, $1)=
|
|
|
833980 |
_LT_TAGVAR(hardcode_minus_L, $1)=no
|
|
|
833980 |
_LT_TAGVAR(hardcode_automatic, $1)=no
|
|
|
833980 |
@@ -7440,6 +7512,77 @@
|
|
|
833980 |
])# _LT_LANG_GCJ_CONFIG
|
|
|
833980 |
|
|
|
833980 |
|
|
|
833980 |
+# _LT_LANG_GO_CONFIG([TAG])
|
|
|
833980 |
+# --------------------------
|
|
|
833980 |
+# Ensure that the configuration variables for the GNU Go compiler
|
|
|
833980 |
+# are suitably defined. These variables are subsequently used by _LT_CONFIG
|
|
|
833980 |
+# to write the compiler configuration to `libtool'.
|
|
|
833980 |
+m4_defun([_LT_LANG_GO_CONFIG],
|
|
|
833980 |
+[AC_REQUIRE([LT_PROG_GO])dnl
|
|
|
833980 |
+AC_LANG_SAVE
|
|
|
833980 |
+
|
|
|
833980 |
+# Source file extension for Go test sources.
|
|
|
833980 |
+ac_ext=go
|
|
|
833980 |
+
|
|
|
833980 |
+# Object file extension for compiled Go test sources.
|
|
|
833980 |
+objext=o
|
|
|
833980 |
+_LT_TAGVAR(objext, $1)=$objext
|
|
|
833980 |
+
|
|
|
833980 |
+# Code to be used in simple compile tests
|
|
|
833980 |
+lt_simple_compile_test_code="package main; func main() { }"
|
|
|
833980 |
+
|
|
|
833980 |
+# Code to be used in simple link tests
|
|
|
833980 |
+lt_simple_link_test_code='package main; func main() { }'
|
|
|
833980 |
+
|
|
|
833980 |
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
|
|
|
833980 |
+_LT_TAG_COMPILER
|
|
|
833980 |
+
|
|
|
833980 |
+# save warnings/boilerplate of simple test code
|
|
|
833980 |
+_LT_COMPILER_BOILERPLATE
|
|
|
833980 |
+_LT_LINKER_BOILERPLATE
|
|
|
833980 |
+
|
|
|
833980 |
+# Allow CC to be a program name with arguments.
|
|
|
833980 |
+lt_save_CC=$CC
|
|
|
833980 |
+lt_save_CFLAGS=$CFLAGS
|
|
|
833980 |
+lt_save_GCC=$GCC
|
|
|
833980 |
+GCC=yes
|
|
|
833980 |
+CC=${GOC-"gccgo"}
|
|
|
833980 |
+CFLAGS=$GOFLAGS
|
|
|
833980 |
+compiler=$CC
|
|
|
833980 |
+_LT_TAGVAR(compiler, $1)=$CC
|
|
|
833980 |
+_LT_TAGVAR(LD, $1)="$LD"
|
|
|
833980 |
+_LT_CC_BASENAME([$compiler])
|
|
|
833980 |
+
|
|
|
833980 |
+# Go did not exist at the time GCC didn't implicitly link libc in.
|
|
|
833980 |
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
|
|
|
833980 |
+
|
|
|
833980 |
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
|
|
|
833980 |
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
|
|
|
833980 |
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
|
|
|
833980 |
+
|
|
|
833980 |
+## CAVEAT EMPTOR:
|
|
|
833980 |
+## There is no encapsulation within the following macros, do not change
|
|
|
833980 |
+## the running order or otherwise move them around unless you know exactly
|
|
|
833980 |
+## what you are doing...
|
|
|
833980 |
+if test -n "$compiler"; then
|
|
|
833980 |
+ _LT_COMPILER_NO_RTTI($1)
|
|
|
833980 |
+ _LT_COMPILER_PIC($1)
|
|
|
833980 |
+ _LT_COMPILER_C_O($1)
|
|
|
833980 |
+ _LT_COMPILER_FILE_LOCKS($1)
|
|
|
833980 |
+ _LT_LINKER_SHLIBS($1)
|
|
|
833980 |
+ _LT_LINKER_HARDCODE_LIBPATH($1)
|
|
|
833980 |
+
|
|
|
833980 |
+ _LT_CONFIG($1)
|
|
|
833980 |
+fi
|
|
|
833980 |
+
|
|
|
833980 |
+AC_LANG_RESTORE
|
|
|
833980 |
+
|
|
|
833980 |
+GCC=$lt_save_GCC
|
|
|
833980 |
+CC=$lt_save_CC
|
|
|
833980 |
+CFLAGS=$lt_save_CFLAGS
|
|
|
833980 |
+])# _LT_LANG_GO_CONFIG
|
|
|
833980 |
+
|
|
|
833980 |
+
|
|
|
833980 |
# _LT_LANG_RC_CONFIG([TAG])
|
|
|
833980 |
# -------------------------
|
|
|
833980 |
# Ensure that the configuration variables for the Windows resource compiler
|
|
|
833980 |
@@ -7509,6 +7652,13 @@
|
|
|
833980 |
dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
|
|
|
833980 |
|
|
|
833980 |
|
|
|
833980 |
+# LT_PROG_GO
|
|
|
833980 |
+# ----------
|
|
|
833980 |
+AC_DEFUN([LT_PROG_GO],
|
|
|
833980 |
+[AC_CHECK_TOOL(GOC, gccgo,)
|
|
|
833980 |
+])
|
|
|
833980 |
+
|
|
|
833980 |
+
|
|
|
833980 |
# LT_PROG_RC
|
|
|
833980 |
# ----------
|
|
|
833980 |
AC_DEFUN([LT_PROG_RC],
|
|
|
833980 |
diff -u -Naur potrace-1.11/m4/ltoptions.m4 potrace-1.11-patched/m4/ltoptions.m4
|
|
|
833980 |
--- potrace-1.11/m4/ltoptions.m4 2012-02-23 20:32:33.000000000 -0400
|
|
|
833980 |
+++ potrace-1.11-patched/m4/ltoptions.m4 2013-05-14 17:54:45.087791644 -0300
|
|
|
833980 |
@@ -326,9 +326,24 @@
|
|
|
833980 |
# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
|
|
|
833980 |
m4_define([_LT_WITH_PIC],
|
|
|
833980 |
[AC_ARG_WITH([pic],
|
|
|
833980 |
- [AS_HELP_STRING([--with-pic],
|
|
|
833980 |
+ [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
|
|
|
833980 |
[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
|
|
|
833980 |
- [pic_mode="$withval"],
|
|
|
833980 |
+ [lt_p=${PACKAGE-default}
|
|
|
833980 |
+ case $withval in
|
|
|
833980 |
+ yes|no) pic_mode=$withval ;;
|
|
|
833980 |
+ *)
|
|
|
833980 |
+ pic_mode=default
|
|
|
833980 |
+ # Look at the argument we got. We use all the common list separators.
|
|
|
833980 |
+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
|
|
|
833980 |
+ for lt_pkg in $withval; do
|
|
|
833980 |
+ IFS="$lt_save_ifs"
|
|
|
833980 |
+ if test "X$lt_pkg" = "X$lt_p"; then
|
|
|
833980 |
+ pic_mode=yes
|
|
|
833980 |
+ fi
|
|
|
833980 |
+ done
|
|
|
833980 |
+ IFS="$lt_save_ifs"
|
|
|
833980 |
+ ;;
|
|
|
833980 |
+ esac],
|
|
|
833980 |
[pic_mode=default])
|
|
|
833980 |
|
|
|
833980 |
test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
|
|
|
833980 |
diff -u -Naur potrace-1.11/missing potrace-1.11-patched/missing
|
|
|
833980 |
--- potrace-1.11/missing 2010-11-04 23:08:34.000000000 -0300
|
|
|
833980 |
+++ potrace-1.11-patched/missing 2013-05-14 17:54:51.367873631 -0300
|
|
|
833980 |
@@ -1,10 +1,10 @@
|
|
|
833980 |
#! /bin/sh
|
|
|
833980 |
# Common stub for a few missing GNU programs while installing.
|
|
|
833980 |
|
|
|
833980 |
-scriptversion=2009-04-28.21; # UTC
|
|
|
833980 |
+scriptversion=2012-01-06.13; # UTC
|
|
|
833980 |
|
|
|
833980 |
# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
|
|
|
833980 |
-# 2008, 2009 Free Software Foundation, Inc.
|
|
|
833980 |
+# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
|
|
|
833980 |
# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
|
|
|
833980 |
|
|
|
833980 |
# This program is free software; you can redistribute it and/or modify
|
|
|
833980 |
@@ -84,7 +84,6 @@
|
|
|
833980 |
help2man touch the output file
|
|
|
833980 |
lex create \`lex.yy.c', if possible, from existing .c
|
|
|
833980 |
makeinfo touch the output file
|
|
|
833980 |
- tar try tar, gnutar, gtar, then tar without non-portable flags
|
|
|
833980 |
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
|
|
|
833980 |
|
|
|
833980 |
Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
|
|
|
833980 |
@@ -122,15 +121,6 @@
|
|
|
833980 |
# Not GNU programs, they don't have --version.
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
- tar*)
|
|
|
833980 |
- if test -n "$run"; then
|
|
|
833980 |
- echo 1>&2 "ERROR: \`tar' requires --run"
|
|
|
833980 |
- exit 1
|
|
|
833980 |
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
|
|
|
833980 |
- exit 1
|
|
|
833980 |
- fi
|
|
|
833980 |
- ;;
|
|
|
833980 |
-
|
|
|
833980 |
*)
|
|
|
833980 |
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
|
|
|
833980 |
# We have it, but it failed.
|
|
|
833980 |
@@ -226,7 +216,7 @@
|
|
|
833980 |
\`Bison' from any GNU archive site."
|
|
|
833980 |
rm -f y.tab.c y.tab.h
|
|
|
833980 |
if test $# -ne 1; then
|
|
|
833980 |
- eval LASTARG="\${$#}"
|
|
|
833980 |
+ eval LASTARG=\${$#}
|
|
|
833980 |
case $LASTARG in
|
|
|
833980 |
*.y)
|
|
|
833980 |
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
|
|
|
833980 |
@@ -256,7 +246,7 @@
|
|
|
833980 |
\`Flex' from any GNU archive site."
|
|
|
833980 |
rm -f lex.yy.c
|
|
|
833980 |
if test $# -ne 1; then
|
|
|
833980 |
- eval LASTARG="\${$#}"
|
|
|
833980 |
+ eval LASTARG=\${$#}
|
|
|
833980 |
case $LASTARG in
|
|
|
833980 |
*.l)
|
|
|
833980 |
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
|
|
|
833980 |
@@ -318,41 +308,6 @@
|
|
|
833980 |
touch $file
|
|
|
833980 |
;;
|
|
|
833980 |
|
|
|
833980 |
- tar*)
|
|
|
833980 |
- shift
|
|
|
833980 |
-
|
|
|
833980 |
- # We have already tried tar in the generic part.
|
|
|
833980 |
- # Look for gnutar/gtar before invocation to avoid ugly error
|
|
|
833980 |
- # messages.
|
|
|
833980 |
- if (gnutar --version > /dev/null 2>&1;; then
|
|
|
833980 |
- gnutar "$@" && exit 0
|
|
|
833980 |
- fi
|
|
|
833980 |
- if (gtar --version > /dev/null 2>&1;; then
|
|
|
833980 |
- gtar "$@" && exit 0
|
|
|
833980 |
- fi
|
|
|
833980 |
- firstarg="$1"
|
|
|
833980 |
- if shift; then
|
|
|
833980 |
- case $firstarg in
|
|
|
833980 |
- *o*)
|
|
|
833980 |
- firstarg=`echo "$firstarg" | sed s/o//`
|
|
|
833980 |
- tar "$firstarg" "$@" && exit 0
|
|
|
833980 |
- ;;
|
|
|
833980 |
- esac
|
|
|
833980 |
- case $firstarg in
|
|
|
833980 |
- *h*)
|
|
|
833980 |
- firstarg=`echo "$firstarg" | sed s/h//`
|
|
|
833980 |
- tar "$firstarg" "$@" && exit 0
|
|
|
833980 |
- ;;
|
|
|
833980 |
- esac
|
|
|
833980 |
- fi
|
|
|
833980 |
-
|
|
|
833980 |
- echo 1>&2 "\
|
|
|
833980 |
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
|
|
|
833980 |
- You may want to install GNU tar or Free paxutils, or check the
|
|
|
833980 |
- command line arguments."
|
|
|
833980 |
- exit 1
|
|
|
833980 |
- ;;
|
|
|
833980 |
-
|
|
|
833980 |
*)
|
|
|
833980 |
echo 1>&2 "\
|
|
|
833980 |
WARNING: \`$1' is needed, and is $msg.
|