summaryrefslogtreecommitdiff
path: root/rpmrc.in
diff options
context:
space:
mode:
authorjbj <devnull@localhost>2002-10-09 19:07:43 +0000
committerjbj <devnull@localhost>2002-10-09 19:07:43 +0000
commitd0ccee051fd915b5ae34a9d8b31642255577bb2c (patch)
tree6c51a33843210424387625e0ea98f17df09580d8 /rpmrc.in
parente7c99cdec359357c3694bd12b9df6170a742be70 (diff)
downloadrpm-d0ccee051fd915b5ae34a9d8b31642255577bb2c.tar.gz
rpm-d0ccee051fd915b5ae34a9d8b31642255577bb2c.tar.bz2
rpm-d0ccee051fd915b5ae34a9d8b31642255577bb2c.zip
- fix: use size_t consistently, avoid segfault on ia64.
CVS patchset: 5760 CVS date: 2002/10/09 19:07:43
Diffstat (limited to 'rpmrc.in')
-rw-r--r--rpmrc.in18
1 files changed, 13 insertions, 5 deletions
diff --git a/rpmrc.in b/rpmrc.in
index c252dfbdf..2b20ba02b 100644
--- a/rpmrc.in
+++ b/rpmrc.in
@@ -1,7 +1,7 @@
#/*! \page config_rpmrc Default configuration: /usr/lib/rpm/rpmrc
# \verbatim
#
-# $Id: rpmrc.in,v 2.51 2002/07/18 21:42:20 jbj Exp $
+# $Id: rpmrc.in,v 2.52 2002/10/09 19:07:44 jbj Exp $
#
# This is a global RPM configuration file. All changes made here will
# be lost when the rpm package is upgraded. Any per-system configuration
@@ -19,6 +19,7 @@ optflags: i586 -O2 -march=i586
optflags: i686 -O2 -march=i686
optflags: athlon -O2 -march=athlon
optflags: ia64 -O2
+optflags: x86_64 -O2
# XXX Please note that -mieee has been added in rpm-3.0.5.
optflags: alpha -O2 -mieee
@@ -71,6 +72,7 @@ arch_canon: i686: i686 1
arch_canon: i586: i586 1
arch_canon: i486: i486 1
arch_canon: i386: i386 1
+arch_canon: x86_64: x86_64 1
arch_canon: alpha: alpha 2
arch_canon: alphaev5: alphaev5 2
@@ -158,8 +160,6 @@ buildarchtranslate: osfmach3_i586: i386
buildarchtranslate: osfmach3_i486: i386
buildarchtranslate: osfmach3_i386: i386
-buildarchtranslate: ia64: ia64
-
buildarchtranslate: athlon: i386
buildarchtranslate: i686: i386
buildarchtranslate: i586: i386
@@ -195,6 +195,10 @@ buildarchtranslate: hades: m68kmint
buildarchtranslate: s390: s390
buildarchtranslate: s390x: s390x
+buildarchtranslate: ia64: ia64
+
+buildarchtranslate: x86_64: x86_64
+
#############################################################
# Architecture compatibility
@@ -260,6 +264,8 @@ arch_compat: s390x: s390 noarch
arch_compat: ia64: i686 noarch
+arch_compat: x86_64: noarch
+
os_compat: IRIX64: IRIX
os_compat: solaris2.7: solaris2.3 solaris2.4 solaris2.5 solaris2.6
os_compat: solaris2.6: solaris2.3 solaris2.4 solaris2.5
@@ -338,11 +344,13 @@ buildarch_compat: atariclone: m68kmint noarch
buildarch_compat: milan: m68kmint noarch
buildarch_compat: hades: m68kmint noarch
-buildarch_compat: ia64: noarch
-
buildarch_compat: s390: noarch
buildarch_compat: s390x: noarch
+buildarch_compat: ia64: noarch
+
+buildarch_compat: x86_64: noarch
+
macrofiles: @RPMCONFIGDIR@/macros:@RPMCONFIGDIR@/%{_target}/macros:@SYSCONFIGDIR@/macros.specspo:@SYSCONFIGDIR@/macros.prelink:@SYSCONFIGDIR@/macros.solve:@SYSCONFIGDIR@/macros.up2date:@SYSCONFIGDIR@/macros:@SYSCONFIGDIR@/%{_target}/macros:~/.rpmmacros
# \endverbatim