summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Ross <aross@gentoo.org>2006-09-30 07:21:46 +0000
committerAndrew Ross <aross@gentoo.org>2006-09-30 07:21:46 +0000
commit9484006a79111d2aef22951a8abe30b1185fce54 (patch)
treedfbf69493db47994d262f9f230ad6ebf275a49bd /app-emulation
parentBackport upstream fix to allow building with python-2.5 (Gentoo bug #149138). (diff)
downloadaross-9484006a79111d2aef22951a8abe30b1185fce54.tar.gz
aross-9484006a79111d2aef22951a8abe30b1185fce54.tar.bz2
aross-9484006a79111d2aef22951a8abe30b1185fce54.zip
Set XEN_TARGET_ARCH to fix an amd64 compile error (Gentoo bug #143999).
svn path=/; revision=12
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/xen-tools/Manifest12
-rw-r--r--app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild10
2 files changed, 18 insertions, 4 deletions
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index ec8c72d..4f2e78c 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -10,6 +10,10 @@ AUX xen-tools-3.0.2-bxclobber.patch 734 RMD160 a23e93b14048ac091b044673a6bc12fff
MD5 fc279066e82ced30850c046be2642ee1 files/xen-tools-3.0.2-bxclobber.patch 734
RMD160 a23e93b14048ac091b044673a6bc12fffdfaca19 files/xen-tools-3.0.2-bxclobber.patch 734
SHA256 8e72dfeb69b1ac6409177d2943966d89aeca5a5a96f5fc142b3f2bd1af936191 files/xen-tools-3.0.2-bxclobber.patch 734
+AUX xen-tools-3.0.2-execstacks.patch 2719 RMD160 acac7e0a9af0b27e502c61bb589c9b5f58f42640 SHA1 7cc8fc3afe2983bff3f2ceccd59cd9e4b5e5e8aa SHA256 8bdb2ec4a7f5f02022786d05ca48f8f51d84b9f4e9708c42a3977a2cfbff83c2
+MD5 93c7844baea70894be9d94d1691b4c11 files/xen-tools-3.0.2-execstacks.patch 2719
+RMD160 acac7e0a9af0b27e502c61bb589c9b5f58f42640 files/xen-tools-3.0.2-execstacks.patch 2719
+SHA256 8bdb2ec4a7f5f02022786d05ca48f8f51d84b9f4e9708c42a3977a2cfbff83c2 files/xen-tools-3.0.2-execstacks.patch 2719
AUX xen-tools-3.0.2-pushpop.patch 796 RMD160 d15cb8ed948f4706912da53d9406852103438895 SHA1 1fc228381bfcbfa5c0203cd37352d912e66f7b37 SHA256 b09d5ff8afc0bf5878b97e1a59a9bfe8ec028a99f62b824c68fc9d42eb576b96
MD5 d77478e538be4f38ca70f3b3ead939f4 files/xen-tools-3.0.2-pushpop.patch 796
RMD160 d15cb8ed948f4706912da53d9406852103438895 files/xen-tools-3.0.2-pushpop.patch 796
@@ -43,10 +47,10 @@ EBUILD xen-tools-3.0.2-r3.ebuild 5530 RMD160 fe932ebe8722970f5a433a0619552c6ec2f
MD5 11588a83ffd3177430efeca5cc668ba3 xen-tools-3.0.2-r3.ebuild 5530
RMD160 fe932ebe8722970f5a433a0619552c6ec2f93eaf xen-tools-3.0.2-r3.ebuild 5530
SHA256 cff3399ef7a791cafcf2053c00124ab56772b730ac8aa32a088ced857b011c1e xen-tools-3.0.2-r3.ebuild 5530
-EBUILD xen-tools-3.0.2-r4.ebuild 5012 RMD160 91906194176d72ce5a35882e75fc8c909e350c06 SHA1 25917b0153e4ef9ea1a9a491a1c15ccbac734c69 SHA256 425ad4588561233b78aa7b06fb9135f7da5432b41dcd18b761d892aea6e056ce
-MD5 90e8cf66bf8e9d678ad1cd133527b5a9 xen-tools-3.0.2-r4.ebuild 5012
-RMD160 91906194176d72ce5a35882e75fc8c909e350c06 xen-tools-3.0.2-r4.ebuild 5012
-SHA256 425ad4588561233b78aa7b06fb9135f7da5432b41dcd18b761d892aea6e056ce xen-tools-3.0.2-r4.ebuild 5012
+EBUILD xen-tools-3.0.2-r4.ebuild 5217 RMD160 f76508277a3dff048063175d75dec7e05b062c3d SHA1 2d1dc4e13b8c9500136227d9e4c96b6777fc66cd SHA256 ccfb5d91670d020d66d956cae36a644800980f22ac9b030d59b86bcfe42363db
+MD5 6003c5e2f42466468dcdd4bbac5fde2d xen-tools-3.0.2-r4.ebuild 5217
+RMD160 f76508277a3dff048063175d75dec7e05b062c3d xen-tools-3.0.2-r4.ebuild 5217
+SHA256 ccfb5d91670d020d66d956cae36a644800980f22ac9b030d59b86bcfe42363db xen-tools-3.0.2-r4.ebuild 5217
MD5 6618adc624bc8ab64af0f4555c33529a files/digest-xen-tools-3.0.2-r3 235
RMD160 ad3a1d2a82c40b0bca653431c2d7964809580e5e files/digest-xen-tools-3.0.2-r3 235
SHA256 274536fc8a3cb10fda114e533062b0dbddcda4ae15f52033a39b85785b221794 files/digest-xen-tools-3.0.2-r3 235
diff --git a/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild b/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild
index a27fbba..f6fbde1 100644
--- a/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild
+++ b/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild
@@ -52,6 +52,16 @@ pkg_setup() {
ewarn "xend may not work when python is built with stack smashing protection (ssp)."
ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866"
fi
+
+ if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+ if use x86 ; then
+ export XEN_TARGET_ARCH="x86_32"
+ elif use amd64 ; then
+ export XEN_TARGET_ARCH="x86_64"
+ else
+ die "Unsupported architecture!"
+ fi
+ fi
}
src_unpack() {