1 |
commit: a6ef75dadb937aec325a57e51d046d7c2e1eec57 |
2 |
Author: Rolf Eike Beer <eike <AT> sf-mail <DOT> de> |
3 |
AuthorDate: Tue Mar 13 15:44:01 2018 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 21 22:07:43 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6ef75da |
7 |
|
8 |
dev-libs/libbsd: fix ELF machine type for 32 bit sparc |
9 |
|
10 |
Bug: https://bugs.gentoo.org/634550 |
11 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
12 |
RepoMan-Options: --include-arches="sparc" |
13 |
Closes: https://github.com/gentoo/gentoo/pull/7446 |
14 |
|
15 |
dev-libs/libbsd/files/libbsd-0.8.6-sparc.patch | 32 ++++++++++++++++++++++++++ |
16 |
dev-libs/libbsd/libbsd-0.8.6.ebuild | 4 ++++ |
17 |
dev-libs/libbsd/libbsd-0.8.7.ebuild | 4 ++++ |
18 |
3 files changed, 40 insertions(+) |
19 |
|
20 |
diff --git a/dev-libs/libbsd/files/libbsd-0.8.6-sparc.patch b/dev-libs/libbsd/files/libbsd-0.8.6-sparc.patch |
21 |
new file mode 100644 |
22 |
index 00000000000..d2c35d8dc4e |
23 |
--- /dev/null |
24 |
+++ b/dev-libs/libbsd/files/libbsd-0.8.6-sparc.patch |
25 |
@@ -0,0 +1,32 @@ |
26 |
+From 0b65d43963fc1bea195e94e3af922a7893bf6fcd Mon Sep 17 00:00:00 2001 |
27 |
+From: James Clarke <jrtc27@××××××.com> |
28 |
+Date: Sun, 4 Mar 2018 23:44:52 +0100 |
29 |
+Subject: Add support for ELF machine EM_SPARC32PLUS |
30 |
+ |
31 |
+32-bit SPARC on V8+ uses a different ELF machine type. |
32 |
+ |
33 |
+Fixes: https://bugs.gentoo.org/634550 |
34 |
+Signed-off-by: Guillem Jover <guillem@×××××××.org> |
35 |
+--- |
36 |
+ src/local-elf.h | 4 ++++ |
37 |
+ 1 file changed, 4 insertions(+) |
38 |
+ |
39 |
+diff --git a/src/local-elf.h b/src/local-elf.h |
40 |
+index 1faf182..f7cbd83 100644 |
41 |
+--- a/src/local-elf.h |
42 |
++++ b/src/local-elf.h |
43 |
+@@ -186,7 +186,11 @@ |
44 |
+ #define ELF_TARG_MACH EM_SPARCV9 |
45 |
+ #define ELF_TARG_CLASS ELFCLASS64 |
46 |
+ #else |
47 |
++#if defined(__sparc_v9__) |
48 |
++#define ELF_TARG_MACH EM_SPARC32PLUS |
49 |
++#else |
50 |
+ #define ELF_TARG_MACH EM_SPARC |
51 |
++#endif |
52 |
+ #define ELF_TARG_CLASS ELFCLASS32 |
53 |
+ #endif |
54 |
+ #define ELF_TARG_DATA ELFDATA2MSB |
55 |
+-- |
56 |
+cgit v1.1 |
57 |
+ |
58 |
|
59 |
diff --git a/dev-libs/libbsd/libbsd-0.8.6.ebuild b/dev-libs/libbsd/libbsd-0.8.6.ebuild |
60 |
index ab9fdb3b03f..bfc008979c3 100644 |
61 |
--- a/dev-libs/libbsd/libbsd-0.8.6.ebuild |
62 |
+++ b/dev-libs/libbsd/libbsd-0.8.6.ebuild |
63 |
@@ -16,6 +16,10 @@ IUSE="static-libs" |
64 |
DEPEND=">=sys-kernel/linux-headers-3.17" |
65 |
RDEPEND="" |
66 |
|
67 |
+PATCHES=( |
68 |
+ "${FILESDIR}/${PN}-0.8.6-sparc.patch" |
69 |
+) |
70 |
+ |
71 |
pkg_setup() { |
72 |
local f="${EROOT}/usr/$(get_libdir)/${PN}.a" |
73 |
local m="You need to remove ${f} by hand or re-emerge sys-libs/glibc first." |
74 |
|
75 |
diff --git a/dev-libs/libbsd/libbsd-0.8.7.ebuild b/dev-libs/libbsd/libbsd-0.8.7.ebuild |
76 |
index bde7f808bf8..8ce1c8916cb 100644 |
77 |
--- a/dev-libs/libbsd/libbsd-0.8.7.ebuild |
78 |
+++ b/dev-libs/libbsd/libbsd-0.8.7.ebuild |
79 |
@@ -16,6 +16,10 @@ IUSE="static-libs" |
80 |
DEPEND=">=sys-kernel/linux-headers-3.17" |
81 |
RDEPEND="" |
82 |
|
83 |
+PATCHES=( |
84 |
+ "${FILESDIR}/${PN}-0.8.6-sparc.patch" |
85 |
+) |
86 |
+ |
87 |
pkg_setup() { |
88 |
local f="${EROOT}/usr/$(get_libdir)/${PN}.a" |
89 |
local m="You need to remove ${f} by hand or re-emerge sys-libs/glibc first." |