summaryrefslogtreecommitdiff
path: root/rpmrc.in
diff options
context:
space:
mode:
authorjbj <devnull@localhost>2003-12-11 19:09:58 +0000
committerjbj <devnull@localhost>2003-12-11 19:09:58 +0000
commit752cac72e220dcad4e6fce39508e714e59e3e0a1 (patch)
tree77499adb1929868e33b22199cc9895ff4271d269 /rpmrc.in
parent4c5d56d3bf4cded801abe8830350c5cf973e2bfc (diff)
downloadrpm-752cac72e220dcad4e6fce39508e714e59e3e0a1.tar.gz
rpm-752cac72e220dcad4e6fce39508e714e59e3e0a1.tar.bz2
rpm-752cac72e220dcad4e6fce39508e714e59e3e0a1.zip
- only internal Berkeley db from now on.
- revive "make dist". CVS patchset: 6971 CVS date: 2003/12/11 19:09:58
Diffstat (limited to 'rpmrc.in')
-rw-r--r--rpmrc.in13
1 files changed, 9 insertions, 4 deletions
diff --git a/rpmrc.in b/rpmrc.in
index b49b7bffd..4e6335c83 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.56 2003/07/02 19:26:04 jbj Exp $
+# $Id: rpmrc.in,v 2.57 2003/12/11 19:09:59 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
@@ -18,6 +18,7 @@ optflags: i686 -O2 -g -march=i686
optflags: athlon -O2 -g -march=athlon
optflags: ia64 -O2 -g
optflags: x86_64 -O2 -g
+optflags: amd64 -O2 -g
optflags: alpha -O2 -g -mieee
optflags: alphaev5 -O2 -g -mieee -mcpu=ev5
@@ -70,6 +71,7 @@ arch_canon: i586: i586 1
arch_canon: i486: i486 1
arch_canon: i386: i386 1
arch_canon: x86_64: x86_64 1
+arch_canon: amd64: amd64 1
arch_canon: alpha: alpha 2
arch_canon: alphaev5: alphaev5 2
@@ -118,8 +120,8 @@ arch_canon: i370: i370 14
arch_canon: s390x: s390x 15
arch_canon: ppc64: ppc64 16
-arch_canon: ppc64pseries: ppc64pseries 16
-arch_canon: ppc64iseries: ppc64iseries 16
+arch_canon: ppc64pseries: ppc64pseries 16
+arch_canon: ppc64iseries: ppc64iseries 16
arch_canon: sh: sh 17
arch_canon: xtensa: xtensa 18
@@ -200,6 +202,7 @@ buildarchtranslate: s390x: s390x
buildarchtranslate: ia64: ia64
buildarchtranslate: x86_64: x86_64
+buildarchtranslate: amd64: x86_64
#############################################################
# Architecture compatibility
@@ -268,7 +271,8 @@ arch_compat: s390x: s390 noarch
arch_compat: ia64: noarch
-arch_compat: x86_64: athlon noarch
+arch_compat: x86_64: amd64 athlon noarch
+arch_compat: amd64: x86_64 athlon noarch
os_compat: IRIX64: IRIX
os_compat: solaris2.7: solaris2.3 solaris2.4 solaris2.5 solaris2.6
@@ -356,6 +360,7 @@ buildarch_compat: s390x: noarch
buildarch_compat: ia64: noarch
buildarch_compat: x86_64: noarch
+buildarch_compat: amd64: 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