commit: 04d927b23ab3f6ee5c1a71e5d44a2dce481b4731 Author: Andrew Savchenko <bircoph <AT> gmail <DOT> com> AuthorDate: Sat Jan 31 22:31:58 2015 +0000 Commit: Andrew Savchenko <bircoph <AT> gmail <DOT> com> CommitDate: Sat Jan 31 22:34:20 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=dev/bircoph.git;a=commit;h=04d927b2
memtost86+: testing changes before tree - disable hardcoded CC/AS; - add QA exception for ignored flags. --- sys-apps/memtest86+/Manifest | 3 ++- .../memtest86+/files/memtest86+-5.01-hardcoded_cc.patch | 16 ++++++++++++++++ sys-apps/memtest86+/memtest86+-5.01.ebuild | 8 +++++--- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest index 7b537ed..1b551d0 100644 --- a/sys-apps/memtest86+/Manifest +++ b/sys-apps/memtest86+/Manifest @@ -2,7 +2,8 @@ AUX 39_memtest86+ 711 SHA256 39a84fb813bc5fbfe857b1ed6b40b3bc7cd11df3f86f6cea95d AUX make-memtest86+-boot-floppy 2499 SHA256 88d8768592abdd224b9cd041152c78ef50eedeef3620f0d00f51c0eaeef8158a SHA512 28649d630c4624573a5cf4279f6207cf44707978d8a18f2c614997f641038f2da731bb5c3b26066812a5c02d926c40020e74820b1a4eb2b4732a76686c52c260 WHIRLPOOL c2600dd87a20aa8ab595e1af74a353bd2c4e8ae8b2e4738967503007ad242ff53d23525d6e3692e5990909aafc2456a5f4f8d7e4c23063bebbcf9331c4031438 AUX make-memtest86+-boot-floppy.1 1165 SHA256 240c921fe2cbb4d70b5e06fc06d798c6018ece8a238fdeebf3ad02a6043ed5d7 SHA512 8b5b6397e50cf4d48aeda31de4c1f72493e97db52ff45966716df8f9b0fbbd8d4ed71e289c0113ef53fa52a7ea6df4c107c63ca70f90c951dd085c05b64db147 WHIRLPOOL bd7d87c7cd4b16c0bcec083d9c73a8ef8dc627699058318407a20b103014cb03fe34389f2e85f3e16e88521971983e50d9f3e1dd45b7471356e0797544e8a4d5 AUX memtest86+-5.01-gcc-473.patch 2382 SHA256 7877416a1103dbf0cbaafae744ee699d8fa9ea28391fe786e041e2288724016c SHA512 b6744a05db00fbc9762eb880dfc1f97143eaff90a97600c6257fc84a1c0e8eb31b0879fc5af01ecc1b03881350f7b2a9527b5715d569c4215ed8459db3ba5a7c WHIRLPOOL 071fda6401f2b60122f17071f7130dc561c600dd82401d3ba36fc89a009dc3920a2892eb07559530faf06b9249bb4a7f13523b7dc5aba969f451c2d81c10e586 +AUX memtest86+-5.01-hardcoded_cc.patch 484 SHA256 883354dabd02201b95ce2c1948b2d1e4ce65bdefb81ff21e5c2ba673c0e3c245 SHA512 a7008dcc1136283cdfc0dd5e17b0c4c5816d2799d50fa7c63e14b258f0ce34031ec782e199b826a0cc909464ab1f5aaf651ede6681ddac7d5ca416b8412106be WHIRLPOOL d9d28af1793d946e842cb4f8bfe4923c0f4e3e6b432a1bcfec8d5de4e9cd280542486abe2615f069eb41bb9d2f331c1c26ddf4ab991c51684239346fe5bd58e8 DIST memtest86+-5.01.tar.gz 214877 SHA256 142127b7953fbd829b1057fb64a78d3340c2b771484230a7347e94530a0d9039 SHA512 d872db35ef733ec8f49094251f2bf6b98cc80eb06d04044be3aecf28d534f24ba293a08b9979b112dbd07cf27368148939a33a32c7010fc9581a3a5b150c94d7 WHIRLPOOL c8e240c8420990c93156fcd407a4b00d350392bbf8e974398b4d51fa219d33012b4e0d60f58cb2dff59c06e36e322467031bc0231d77d4e773d97e30939d3c8f -EBUILD memtest86+-5.01.ebuild 2137 SHA256 20c918eea8da3c3949fc1628295360778e38e1103bba596b839a62ce10bb600a SHA512 95079b0d7a875503886209ef2033e6948899c7f292614172c786c617d8ba0df803fc772a22c70919e16e2158e177b2309519d627a4afcbd7ebd4d95a5c5a5d11 WHIRLPOOL a2b534d2da86892e1fb073dee69e2582ef9bbc789b91dc220a51f6c8b96496311fd92724c64b6c93fa21caa8baa1662d8b90c432cc57e853c295fbb26e292dd2 +EBUILD memtest86+-5.01.ebuild 2229 SHA256 e1599a4af6c7aa5aa0a90b9d5583b292df670b3f19dc05ca26b5bacbbbc2be1d SHA512 b6648103000187c9dcc8e1962b86097c84a4573c1ee97c21645605a87d47f3385a8f281307ebb177afb33c66de31341e581ba2871ffa10292330365c7f5ba561 WHIRLPOOL 1c5b64ec07b0b171ff3dc81b3c91fd069153645655671589d195a48309520aef043a76b6bf49d11c05543cee8e9eadc80185f3acd9a0f74d8343ae52bc505152 MISC ChangeLog 11575 SHA256 d452e8f57078000d0cbb4f8462b172effe0d820b993ba77cffbc4c911e10d120 SHA512 b34de2bb3f056f5072d2236a102af997f1e3aa62b7decc11da55afcf2e4609a2ef28af74aa6a97feda39adf60c107192a6fd20ff32bc2dc0630d97875690cc20 WHIRLPOOL 456a0ac2b6521d33355f982bb514ec51879104ff74b82f07ca445241f92999df574863618cc719b64be70306fbee4d87d7c735cfd40587bbffd5c307d1557d18 MISC metadata.xml 341 SHA256 613d88008ccba44bb3dd2cb9662e9b3b58e74aecea38b84586ed54f50a672cfe SHA512 5c90ba46614c6ee818309688ed1364a81620f6672864b141525ba83413782dbe1ba5596f783152b9813083730d9acd16369ee9d08e4c3993247a69ea40556093 WHIRLPOOL 49a004c6a5f5eaa03c804074b98ec1eff49a66e1016837431f29f81faed1a3ee256ae25b5fb6e264477220f0c03c0dd439cf1e6f400d3dd7ebbe5003eb346363 diff --git a/sys-apps/memtest86+/files/memtest86+-5.01-hardcoded_cc.patch b/sys-apps/memtest86+/files/memtest86+-5.01-hardcoded_cc.patch new file mode 100644 index 0000000..f140a7f --- /dev/null +++ b/sys-apps/memtest86+/files/memtest86+-5.01-hardcoded_cc.patch @@ -0,0 +1,16 @@ +--- Makefile.orig 2015-02-01 01:08:33.000000000 +0300 ++++ Makefile 2015-02-01 01:10:17.624757244 +0300 +@@ -9,11 +9,10 @@ + # + FDISK=/dev/fd0 + +-AS=as -32 +-CC=gcc +- + CFLAGS= -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \ + -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector ++CPPFLAGS= -m32 ++ASFLAGS= -32 + + OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \ + config.o cpuid.o linuxbios.o pci.o memsize.o spd.o error.o dmi.o controller.o \ diff --git a/sys-apps/memtest86+/memtest86+-5.01.ebuild b/sys-apps/memtest86+/memtest86+-5.01.ebuild index 5af79ec..42f218d 100644 --- a/sys-apps/memtest86+/memtest86+-5.01.ebuild +++ b/sys-apps/memtest86+/memtest86+-5.01.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-4.20-r1.ebuild,v 1.3 2012/09/12 12:53:54 johu Exp $ @@ -12,11 +12,12 @@ SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"; LICENSE="GPL-2" SLOT="0" -KEYWORDS="-* amd64 x86" +KEYWORDS="-* ~amd64 ~x86" IUSE="floppy serial" BOOTDIR=/boot/memtest86plus QA_PRESTRIPPED="${BOOTDIR}/memtest.netbsd" +QA_FLAGS_IGNORED="${BOOTDIR}/memtest.netbsd" RDEPEND="floppy? ( >=sys-boot/grub-0.95:0 sys-fs/mtools )" DEPEND="" @@ -24,7 +25,8 @@ DEPEND="" src_prepare() { sed -i -e 's,0x10000,0x100000,' memtest.lds || die sed -e "s/scp memtest.bin [email protected]:\/srv\/tftp\/mt86plus//g" -i Makefile - epatch "${FILESDIR}/${P}-gcc-473.patch" + epatch "${FILESDIR}/${P}-gcc-473.patch" \ + "${FILESDIR}/${P}-hardcoded_cc.patch" if use serial ; then sed -i \
