| 1 |
commit: 3a9c391e65d1ddf5f92632c43379e722391e2db3 |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Nov 26 00:31:47 2016 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 26 00:32:00 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a9c391e |
| 7 |
|
| 8 |
sys-apps/memtest86+: add links to patches sent upstream |
| 9 |
|
| 10 |
sys-apps/memtest86+/files/memtest86+-5.01-gcc-473.patch | 12 ++++++------ |
| 11 |
.../memtest86+/files/memtest86+-5.01-io-extern-inline.patch | 2 ++ |
| 12 |
sys-apps/memtest86+/files/memtest86+-5.01-no-C-headers.patch | 2 ++ |
| 13 |
sys-apps/memtest86+/files/memtest86+-5.01-no-clean.patch | 3 +++ |
| 14 |
sys-apps/memtest86+/files/memtest86+-5.01-no-scp.patch | 2 ++ |
| 15 |
sys-apps/memtest86+/files/memtest86+-5.01-reboot-def.patch | 2 ++ |
| 16 |
6 files changed, 17 insertions(+), 6 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-apps/memtest86+/files/memtest86+-5.01-gcc-473.patch b/sys-apps/memtest86+/files/memtest86+-5.01-gcc-473.patch |
| 19 |
index b793c32..af011d6 100644 |
| 20 |
--- a/sys-apps/memtest86+/files/memtest86+-5.01-gcc-473.patch |
| 21 |
+++ b/sys-apps/memtest86+/files/memtest86+-5.01-gcc-473.patch |
| 22 |
@@ -1,6 +1,7 @@ |
| 23 |
-diff -Narup memtest86+-5.01-orig/controller.c memtest86+-5.01/controller.c |
| 24 |
---- memtest86+-5.01-orig/controller.c 2013-08-09 22:01:58.000000000 -0400 |
| 25 |
-+++ memtest86+-5.01/controller.c 2014-06-22 11:01:17.347923472 -0400 |
| 26 |
+http://forum.canardpc.com/threads/110950-fix-controller-loop-error |
| 27 |
+ |
| 28 |
+--- memtest86+-5.01/controller.c |
| 29 |
++++ memtest86+-5.01/controller.c |
| 30 |
@@ -292,7 +292,7 @@ static void setup_nhm(void) |
| 31 |
|
| 32 |
/* First, locate the PCI bus where the MCH is located */ |
| 33 |
@@ -19,9 +20,8 @@ diff -Narup memtest86+-5.01-orig/controller.c memtest86+-5.01/controller.c |
| 34 |
pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid); |
| 35 |
pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did); |
| 36 |
vid &= 0xFFFF; |
| 37 |
-diff -Narup memtest86+-5.01-orig/Makefile memtest86+-5.01/Makefile |
| 38 |
---- memtest86+-5.01-orig/Makefile 2013-08-09 22:01:58.000000000 -0400 |
| 39 |
-+++ memtest86+-5.01/Makefile 2014-06-22 10:59:27.463573842 -0400 |
| 40 |
+--- memtest86+-5.01/Makefile |
| 41 |
++++ memtest86+-5.01/Makefile |
| 42 |
@@ -12,7 +12,7 @@ FDISK=/dev/fd0 |
| 43 |
AS=as -32 |
| 44 |
CC=gcc |
| 45 |
|
| 46 |
diff --git a/sys-apps/memtest86+/files/memtest86+-5.01-io-extern-inline.patch b/sys-apps/memtest86+/files/memtest86+-5.01-io-extern-inline.patch |
| 47 |
index 8dc13b1..682dd5d 100644 |
| 48 |
--- a/sys-apps/memtest86+/files/memtest86+-5.01-io-extern-inline.patch |
| 49 |
+++ b/sys-apps/memtest86+/files/memtest86+-5.01-io-extern-inline.patch |
| 50 |
@@ -1,3 +1,5 @@ |
| 51 |
+http://forum.canardpc.com/threads/110951-fix-build-with-newer-gcc-versions |
| 52 |
+ |
| 53 |
the meaning of extern inline changed between standards. use static inline |
| 54 |
for these tiny I/O functions everywhere to keep things simple. |
| 55 |
|
| 56 |
|
| 57 |
diff --git a/sys-apps/memtest86+/files/memtest86+-5.01-no-C-headers.patch b/sys-apps/memtest86+/files/memtest86+-5.01-no-C-headers.patch |
| 58 |
index bbb2228..ce7f906 100644 |
| 59 |
--- a/sys-apps/memtest86+/files/memtest86+-5.01-no-C-headers.patch |
| 60 |
+++ b/sys-apps/memtest86+/files/memtest86+-5.01-no-C-headers.patch |
| 61 |
@@ -1,3 +1,5 @@ |
| 62 |
+http://forum.canardpc.com/threads/110955-PATCH-don-t-pull-in-system-headers |
| 63 |
+ |
| 64 |
avoid using C library headers as it'd mean we'd need 32-bit glibc files available |
| 65 |
|
| 66 |
https://bugs.gentoo.org/592638 |
| 67 |
|
| 68 |
diff --git a/sys-apps/memtest86+/files/memtest86+-5.01-no-clean.patch b/sys-apps/memtest86+/files/memtest86+-5.01-no-clean.patch |
| 69 |
index 876edcf..e9cbf10 100644 |
| 70 |
--- a/sys-apps/memtest86+/files/memtest86+-5.01-no-clean.patch |
| 71 |
+++ b/sys-apps/memtest86+/files/memtest86+-5.01-no-clean.patch |
| 72 |
@@ -1,3 +1,6 @@ |
| 73 |
+http://forum.canardpc.com/threads/110954-PATCH-fix-parallel-build-issues |
| 74 |
+ |
| 75 |
+ |
| 76 |
don't run the clean target when building all as we run into parallel races: |
| 77 |
- memtest kicks off building of a bunch of .o files |
| 78 |
- clean runs in parallel which runs `rm` and deletes some of the new .o |
| 79 |
|
| 80 |
diff --git a/sys-apps/memtest86+/files/memtest86+-5.01-no-scp.patch b/sys-apps/memtest86+/files/memtest86+-5.01-no-scp.patch |
| 81 |
index 8303ccf..8d830e2 100644 |
| 82 |
--- a/sys-apps/memtest86+/files/memtest86+-5.01-no-scp.patch |
| 83 |
+++ b/sys-apps/memtest86+/files/memtest86+-5.01-no-scp.patch |
| 84 |
@@ -1,3 +1,5 @@ |
| 85 |
+http://forum.canardpc.com/threads/110953-PATCH-don-t-try-to-scp-after-building |
| 86 |
+ |
| 87 |
this makes no sense in a sane build world |
| 88 |
|
| 89 |
--- a/Makefile |
| 90 |
|
| 91 |
diff --git a/sys-apps/memtest86+/files/memtest86+-5.01-reboot-def.patch b/sys-apps/memtest86+/files/memtest86+-5.01-reboot-def.patch |
| 92 |
index a121fde..f4b42fe 100644 |
| 93 |
--- a/sys-apps/memtest86+/files/memtest86+-5.01-reboot-def.patch |
| 94 |
+++ b/sys-apps/memtest86+/files/memtest86+-5.01-reboot-def.patch |
| 95 |
@@ -1,3 +1,5 @@ |
| 96 |
+http://forum.canardpc.com/threads/110952-fix-build-due-to-missing-reboot-symbol |
| 97 |
+ |
| 98 |
the reboot func is used elsewhere, so don't mark it inline |
| 99 |
|
| 100 |
--- a/lib.c |
Archives