Date: Thu, 12 May 2005 12:32:02 +0900 (JST) From: KOMATSU Shinichiro <koma2@lovepeers.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/80922: archivers/rpm: add amd64 related entries to rpmrc Message-ID: <20050512033202.58BF656508@ksta.ms.u-tokyo.ac.jp> Resent-Message-ID: <200505120340.j4C3eC5V092397@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 80922 >Category: ports >Synopsis: archivers/rpm: add amd64 related entries to rpmrc >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu May 12 03:40:11 GMT 2005 >Closed-Date: >Last-Modified: >Originator: KOMATSU Shinichiro >Release: FreeBSD 5.4-RELEASE amd64 >Organization: >Environment: FreeBSD 5.4-RELEASE amd64 >Description: Take amd64 related rpmrc entries from FC3 (rpm-4.3.2-21). This patch makes i386 and amd64 to be "compatible", and i386 rpm can be installed on amd64 without "--ignorearch" rpm option. >How-To-Repeat: >Fix: diff --exclude=CVS --exclude=*.log* -urN rpm.orig/Makefile rpm/Makefile --- rpm.orig/Makefile Mon Jul 26 21:13:46 2004 +++ rpm/Makefile Sat May 7 00:32:39 2005 @@ -7,7 +7,7 @@ PORTNAME= rpm PORTVERSION= 3.0.6 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= archivers MASTER_SITES= ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/ diff --exclude=CVS --exclude=*.log* -urN rpm.orig/files/patch-rpmrc.in rpm/files/patch-rpmrc.in --- rpm.orig/files/patch-rpmrc.in Thu Jan 1 09:00:00 1970 +++ rpm/files/patch-rpmrc.in Sat May 7 01:22:17 2005 @@ -0,0 +1,45 @@ +--- rpmrc.in.orig Thu Sep 14 02:55:15 2000 ++++ rpmrc.in Sat May 7 01:21:44 2005 +@@ -53,6 +53,10 @@ + 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: ia32e: ia32e 1 ++ + arch_canon: alpha: alpha 2 + arch_canon: alphaev5: alphaev5 2 + arch_canon: alphaev56: alphaev56 2 +@@ -161,6 +165,10 @@ + buildarchtranslate: milan: m68kmint + buildarchtranslate: hades: m68kmint + ++buildarchtranslate: x86_64: x86_64 ++buildarchtranslate: amd64: x86_64 ++buildarchtranslate: ia32e: x86_64 ++ + ############################################################# + # Architecture compatibility + +@@ -223,6 +231,10 @@ + + arch_compat: ia64: noarch + ++arch_compat: x86_64: amd64 athlon noarch ++arch_compat: amd64: x86_64 athlon noarch ++arch_compat: ia32e: x86_64 athlon 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 +@@ -288,6 +300,9 @@ + + buildarch_compat: ia64: noarch + buildarch_compat: s390: noarch ++buildarch_compat: x86_64: noarch ++buildarch_compat: amd64: x86_64 ++buildarch_compat: ia32e: x86_64 + + macrofiles: @RPMCONFIGDIR@/macros:@RPMCONFIGDIR@/%{_target}/macros:@SYSCONFIGDIR@/macros.specspo:@SYSCONFIGDIR@/macros:@SYSCONFIGDIR@/%{_target}/macros:~/.rpmmacros + >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050512033202.58BF656508>