[gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-lib/files/, sys-freebsd/freebsd-lib/

[Michał Górny]

commit:     ce1aab756c2d45e2b4d297cb98f45595c3dfcc54
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 23 07:18:11 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Feb 23 20:36:11 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce1aab75

sys-freebsd/freebsd-lib: Backport Elf_Nhdr support needed for mesa

 sys-freebsd/freebsd-lib/files/freebsd-lib-11.1-elf-nhdr.patch  | 10 ++++++++++
 .../{freebsd-lib-11.1.ebuild => freebsd-lib-11.1-r1.ebuild}    |  1 +
 2 files changed, 11 insertions(+)

diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-11.1-elf-nhdr.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-11.1-elf-nhdr.patch
new file mode 100644
index 00000000000..a00df5f66f1
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-11.1-elf-nhdr.patch
@@ -0,0 +1,10 @@
+--- a/sys/sys/elf_common.h	2018/01/18 20:45:41	328136
++++ b/sys/sys/elf_common.h	2018/01/18 21:19:57	328137
+@@ -51,6 +51,7 @@
+ 	u_int32_t	n_descsz;	/* Length of descriptor. */
+ 	u_int32_t	n_type;		/* Type of this note. */
+ } Elf_Note;
++typedef Elf_Note Elf_Nhdr;
+ 
+ /*
+  * Option kinds.

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-11.1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-11.1-r1.ebuild
similarity index 99%
rename from sys-freebsd/freebsd-lib/freebsd-lib-11.1.ebuild
rename to sys-freebsd/freebsd-lib/freebsd-lib-11.1-r1.ebuild
index 61bfeb3924f..e28f2420c1f 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-11.1.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-11.1-r1.ebuild
@@ -174,6 +174,7 @@ src_prepare() {
 	# patches "${WORKDIR}/include"
 	cd "${WORKDIR}"
 	epatch "${FILESDIR}/${PN}-includes.patch"
+	epatch "${FILESDIR}/${PN}-11.1-elf-nhdr.patch"
 
 	# Don't install the hesiod man page or header
 	rm "${WORKDIR}"/include/hesiod.h || die