diff options
| author | tsutsui <tsutsui> | 2001-01-24 12:55:34 +0000 |
|---|---|---|
| committer | tsutsui <tsutsui> | 2001-01-24 12:55:34 +0000 |
| commit | e8ddd1f1238ee4f946b789fbbbcfac86c8daff5a (patch) | |
| tree | aca0ae5010ce0afa4a375e86bab3a44438440e82 /devel | |
| parent | a3ec4cb383fb36e77490339888bf8f723a6b8e1d (diff) | |
| download | pkgsrc-e8ddd1f1238ee4f946b789fbbbcfac86c8daff5a.tar.gz | |
Use "uname -p" or "sysctl -n hw.machine_arch" to check system types
in config.guess. (From gnusrc/gnu/dist/toolchain/config.guess 1.3)
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/libtool/files/patch-sum | 4 | ||||
| -rw-r--r-- | devel/libtool/patches/patch-ac | 74 |
2 files changed, 54 insertions, 24 deletions
diff --git a/devel/libtool/files/patch-sum b/devel/libtool/files/patch-sum index cf6f3979664..5d22f7573a7 100644 --- a/devel/libtool/files/patch-sum +++ b/devel/libtool/files/patch-sum @@ -1,5 +1,5 @@ -$NetBSD: patch-sum,v 1.20 2001/01/15 15:18:23 jlam Exp $ +$NetBSD: patch-sum,v 1.21 2001/01/24 12:55:35 tsutsui Exp $ MD5 (patch-aa) = 9d0fe34136ac2f00b71e535049e7ef17 MD5 (patch-ab) = 3e33219c207d69034c7828fc007dcf55 -MD5 (patch-ac) = 29c374adc4f676de414518c28d7413a3 +MD5 (patch-ac) = f1a5d70c114da3ea8227f03e0f0f3395 diff --git a/devel/libtool/patches/patch-ac b/devel/libtool/patches/patch-ac index 14e131b0c1c..32b3c1fae47 100644 --- a/devel/libtool/patches/patch-ac +++ b/devel/libtool/patches/patch-ac @@ -1,22 +1,52 @@ -*** config.guess.orig Fri May 26 18:30:02 2000 ---- config.guess Sun Jan 14 20:14:15 2001 -*************** -*** 78,89 **** ---- 78,94 ---- - # Determine the machine/vendor (is the vendor relevant). - case "${UNAME_MACHINE}" in - amiga) machine=m68k-cbm ;; -+ arc) machine=mipsel-unknown ;; - arm32) machine=arm-unknown ;; - atari*) machine=m68k-atari ;; -+ cobalt) machine=mipsel-unknown ;; - sun3*) machine=m68k-sun ;; - mac68k) machine=m68k-apple ;; - macppc) machine=powerpc-apple ;; -+ mvme68k) machine=m68k-motorola ;; - hp3[0-9][05]) machine=m68k-hp ;; -+ hpcmips) machine=mipsel-unknown ;; -+ pmax) machine=mipsel-unknown ;; - ibmrt|romp-ibm) machine=romp-ibm ;; - *) machine=${UNAME_MACHINE}-unknown ;; - esac +$NetBSD: patch-ac,v 1.4 2001/01/24 12:55:34 tsutsui Exp $ + +--- config.guess.orig Sat May 27 02:30:02 2000 ++++ config.guess Wed Jan 24 21:27:59 2001 +@@ -76,33 +76,24 @@ + # compatibility and a consistent mechanism for selecting the + # object file format. + # Determine the machine/vendor (is the vendor relevant). +- case "${UNAME_MACHINE}" in +- amiga) machine=m68k-cbm ;; +- arm32) machine=arm-unknown ;; +- atari*) machine=m68k-atari ;; +- sun3*) machine=m68k-sun ;; +- mac68k) machine=m68k-apple ;; +- macppc) machine=powerpc-apple ;; +- hp3[0-9][05]) machine=m68k-hp ;; +- ibmrt|romp-ibm) machine=romp-ibm ;; +- *) machine=${UNAME_MACHINE}-unknown ;; ++ PATH=$PATH:/sbin/usr/sbin ++ UNAME_MACHINE_ARCH=`(uname -p || sysctl -n hw.machine_arch || echo unknown) 2>/dev/null` ++ case "${UNAME_MACHINE_ARCH}:${UNAME_RELEASE}" in ++ arm26:*) UNAME_MACHINE_ARCH=armv2;; ++ arm32:*) UNAME_MACHINE_ARCH=arm;; ++ mips:*) UNAME_MACHINE_ARCH=mipsel;; ++ i386:*|m68k:*|ns32k:*|sparc:*|vax:*) ++ # The Operating System including object format. ++ if echo __ELF__ | cc -E - | grep -q __ELF__; then ++ UNAME_OBJFORMAT= ++ else ++ UNAME_OBJFORMAT=elf ++ fi;; + esac +- # The Operating System including object format. +- if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ +- | grep __ELF__ >/dev/null +- then +- # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). +- # Return netbsd for either. FIX? +- os=netbsd +- else +- os=netbsdelf +- fi +- # The OS release +- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. +- echo "${machine}-${os}${release}" ++ echo ${UNAME_MACHINE_ARCH}-netbsd${UNAME_OBJFORMAT}`echo ${UNAME_RELEASE} | sed -e 's/[-_].*/\./'` + exit 0 ;; + alpha:OSF1:*:*) + if test $UNAME_RELEASE = "V4.0"; then |