commit: 2c225ccf4290ca7ff62969fe624bbf623f509638 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Mon May 28 17:39:40 2018 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Mon May 28 17:55:22 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c225ccf
dev-libs/dietlibc: Fix compilation (#644116 by Mike Hiretsky) Package-Manager: Portage-2.3.38, Repoman-2.3.9 .../dietlibc/dietlibc-0.34_pre20140729-r1.ebuild | 13 +++++++++---- .../files/dietlibc-0.34_pre20140729-dyn-lib.patch | 22 ++++++++++++++++++++++ 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dev-libs/dietlibc/dietlibc-0.34_pre20140729-r1.ebuild b/dev-libs/dietlibc/dietlibc-0.34_pre20140729-r1.ebuild index ab312bfd873..ac5939a008d 100644 --- a/dev-libs/dietlibc/dietlibc-0.34_pre20140729-r1.ebuild +++ b/dev-libs/dietlibc/dietlibc-0.34_pre20140729-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils flag-o-matic toolchain-funcs +EAPI=6 +inherit flag-o-matic toolchain-funcs DESCRIPTION="A libc optimized for small size" HOMEPAGE="http://www.fefe.de/dietlibc/"; @@ -16,11 +16,16 @@ IUSE="" DEPEND="" RDEPEND="" -DIETHOME=/usr/diet +DIETHOME="/usr/diet" -S=${WORKDIR}/dietlibc +S="${WORKDIR}/dietlibc" src_prepare() { + default + + # use __DYN_LIB instead of __PIC__ in i386 socketcalls, bug #644116 + eapply "${FILESDIR}"/${P}-dyn-lib.patch + # Replace sparc64 related C[XX]FLAGS (see bug #45716) use sparc && replace-sparc64-flags diff --git a/dev-libs/dietlibc/files/dietlibc-0.34_pre20140729-dyn-lib.patch b/dev-libs/dietlibc/files/dietlibc-0.34_pre20140729-dyn-lib.patch new file mode 100644 index 00000000000..fe3fcb072f6 --- /dev/null +++ b/dev-libs/dietlibc/files/dietlibc-0.34_pre20140729-dyn-lib.patch @@ -0,0 +1,22 @@ +From 843c667c1b516c0764840c6e4d41188f9c96a415 Mon Sep 17 00:00:00 2001 +From: leitner <leitner> +Date: Mon, 4 Sep 2017 21:59:50 +0000 +Subject: [PATCH] use __DYN_LIB instead of __PIC__ in i386 socketcalls + +--- + i386/syscalls.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/i386/syscalls.h b/i386/syscalls.h +index 11d6f1d5..14ac517b 100644 +--- a/i386/syscalls.h ++++ b/i386/syscalls.h +@@ -416,7 +416,7 @@ sym: \ + .Lend##sym: ; \ + .size sym,.Lend##sym-sym + +-#ifndef __PIC__ ++#ifndef __DYN_LIB + #define __socketcall(name,NAME) \ + .text; \ + .type name,@function; \
