rpms/redhat-rpm-config
6
0
Fork 0
Code Issues Pull Requests Releases Activity

* Mon Jul 7 2003 Jens Petersen <petersen@redhat.com> - 8.0.26-1

Browse Source 
- preserve the vendor field when VENDOR not set
- put VENDOR in the final i386-libc line, not the tentative one
This commit is contained in:
Jens Petersen 2003-07-07 02:32:13 +00:00
parent 7bf42f4c8d
commit 9d388dbd19
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
config.guess vendored
View File

@ -137,9 +137,10 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
## for Red Hat Linux ## for Red Hat Linux
VENDOR=unknown
if test -f /etc/redhat-release ; then if test -f /etc/redhat-release ; then
VENDOR=redhat VENDOR=redhat ;
else
VENDOR= ;
fi fi
# Note: order is significant - the case branches are not exclusive. # Note: order is significant - the case branches are not exclusive.
@ -814,7 +815,7 @@ EOF
echo cris-axis-linux-gnu echo cris-axis-linux-gnu
exit 0 ;; exit 0 ;;
ia64:Linux:*:*) ia64:Linux:*:*)
echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu echo ${UNAME_MACHINE}-${VENDOR:-unknown}-linux-gnu
exit 0 ;; exit 0 ;;
m68*:Linux:*:*) m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu echo ${UNAME_MACHINE}-unknown-linux-gnu
@ -858,10 +859,10 @@ EOF
test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
;; ;;
ppc:Linux:*:*) ppc:Linux:*:*)
echo powerpc-${VENDOR}-linux-gnu echo powerpc-${VENDOR:-unknown}-linux-gnu
exit 0 ;; exit 0 ;;
ppc64:Linux:*:*) ppc64:Linux:*:*)
echo powerpc64-${VENDOR}-linux-gnu echo powerpc64-${VENDOR:-unknown}-linux-gnu
exit 0 ;; exit 0 ;;
alpha:Linux:*:*) alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@ -889,7 +890,7 @@ EOF
echo hppa64-unknown-linux-gnu echo hppa64-unknown-linux-gnu
exit 0 ;; exit 0 ;;
s390:Linux:*:* | s390x:Linux:*:*) s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu echo ${UNAME_MACHINE}-${VENDOR:-ibm}-linux-gnu
exit 0 ;; exit 0 ;;
sh64*:Linux:*:*) sh64*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu echo ${UNAME_MACHINE}-unknown-linux-gnu
@ -901,7 +902,7 @@ EOF
echo ${UNAME_MACHINE}-unknown-linux-gnu echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;; exit 0 ;;
x86_64:Linux:*:*) x86_64:Linux:*:*)
echo x86_64-${VENDOR}-linux-gnu echo x86_64-${VENDOR:-unknown}-linux-gnu
exit 0 ;; exit 0 ;;
i*86:Linux:*:*) i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so # The BFD linker knows what the default object file format is, so
@ -916,7 +917,7 @@ EOF
p'` p'`
case "$ld_supported_targets" in case "$ld_supported_targets" in
elf32-i386) elf32-i386)
TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux-gnu" TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
;; ;;
a.out-i386-linux) a.out-i386-linux)
echo "${UNAME_MACHINE}-pc-linux-gnuaout" echo "${UNAME_MACHINE}-pc-linux-gnuaout"
@ -953,7 +954,7 @@ EOF
#endif #endif
EOF EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR:-pc}-linux-${LIBC}" && exit 0
test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
;; ;;
i*86:DYNIX/ptx:4*:*) i*86:DYNIX/ptx:4*:*)

8
redhat-rpm-config.spec
View File

@ -1,6 +1,6 @@
Summary: Red Hat specific rpm configuration files. Summary: Red Hat specific rpm configuration files.
Name: redhat-rpm-config Name: redhat-rpm-config
Version: 8.0.25 Version: 8.0.26
Release: 1 Release: 1
License: GPL License: GPL
Group: Development/System Group: Development/System
@ -31,7 +31,11 @@ rm -rf ${RPM_BUILD_ROOT}
%{_prefix}/lib/rpm/redhat %{_prefix}/lib/rpm/redhat
%changelog %changelog
* Mon Jul 07 2003 Jens Petersen <petersen@redhat.com> - 8.0.25-1 * Mon Jul 7 2003 Jens Petersen <petersen@redhat.com> - 8.0.26-1
- preserve the vendor field when VENDOR not set
- put VENDOR in the final i386-libc line, not the tentative one
* Mon Jul 7 2003 Jens Petersen <petersen@redhat.com> - 8.0.25-1
- update config.{guess,sub} to 2003-06-17 - update config.{guess,sub} to 2003-06-17
- define VENDOR to be redhat only when /etc/redhat-release present - define VENDOR to be redhat only when /etc/redhat-release present
[suggested by jbj] [suggested by jbj]