public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sergei Trofimovich" <slyfox@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libffi/
Date: Wed, 27 Nov 2019 22:58:07 +0000 (UTC)	[thread overview]
Message-ID: <1574895479.91330e1d176561bb267945a0142ef40e1a9d8295.slyfox@gentoo> (raw)

commit:     91330e1d176561bb267945a0142ef40e1a9d8295
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 27 22:56:32 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Nov 27 22:57:59 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91330e1d

dev-libs/libffi: drop libffi version from includedir, bug #695788

Posting ebuild source note as-is:

```
 --includedir= path maintains a few properties:
 1. have stable name across libffi versions: some packages like
    dev-lang/ghc or kde-frameworks/networkmanager-qt embed
    ${includedir} at build-time. Don't require those to be
    rebuilt unless SONAME changes. bug #695788

    We use /usr/.../${PN} (instead of former /usr/.../${P}).

 2. have ${ABI}-specific location as ffi.h is target-dependent.

    We use /usr/$(get_libdir)/... to have ABI identifier.
```

Before the change libffi installed headers into:
    /usr/lib/libffi-3.3/include/
    /usr/lib64/libffi-3.3/include/
After the change the patchs are:
    /usr/lib/libffi/include/
    /usr/lib64/libffi/include/

Reported-by: Franz Trischberger
Bug: https://bugs.gentoo.org/695788
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-libs/libffi/libffi-3.3-r1.ebuild | 83 ++++++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)

diff --git a/dev-libs/libffi/libffi-3.3-r1.ebuild b/dev-libs/libffi/libffi-3.3-r1.ebuild
new file mode 100644
index 00000000000..53912670ba1
--- /dev/null
+++ b/dev-libs/libffi/libffi-3.3-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib multilib-minimal toolchain-funcs
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="a portable, high level programming interface to various calling conventions"
+HOMEPAGE="https://sourceware.org/libffi/"
+SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/7" # SONAME=libffi.so.7
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug pax_kernel static-libs test test-bhaible"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND=""
+BDEPEND="test? ( dev-util/dejagnu )"
+
+DOCS="ChangeLog* README.md"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.1-o-tmpfile-eacces.patch #529044
+	"${FILESDIR}"/${PN}-3.3_rc0-ppc-macos-go.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+ECONF_SOURCE=${S}
+
+pkg_setup() {
+	# Check for orphaned libffi, see https://bugs.gentoo.org/354903 for example
+	if [[ ${ROOT} == "/" && ${EPREFIX} == "" ]] && ! has_version ${CATEGORY}/${PN}; then
+		local base="${T}"/conftest
+		echo 'int main() { }' > "${base}".c
+		$(tc-getCC) -o "${base}" "${base}".c -lffi >&/dev/null
+		if [ $? -eq 0 ]; then
+			eerror "The linker reported linking against -lffi to be working while it shouldn't have."
+			eerror "This is wrong and you should find and delete the old copy of libffi before continuing."
+			die "The system is in inconsistent state with unknown libffi installed."
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	if ! use test-bhaible; then
+		# These tests are very heavyweight (hours of runtime)
+		rm -v testsuite/libffi.bhaible/bhaible.exp || die
+	fi
+}
+
+multilib_src_configure() {
+	use userland_BSD && export HOST="${CHOST}"
+	# --includedir= path maintains a few properties:
+	# 1. have stable name across libffi versions: some packages like
+	#    dev-lang/ghc or kde-frameworks/networkmanager-qt embed
+	#    ${includedir} at build-time. Don't require those to be
+	#    rebuilt unless SONAME changes. bug #695788
+	#
+	#    We use /usr/.../${PN} (instead of former /usr/.../${P}).
+	#
+	# 2. have ${ABI}-specific location as ffi.h is target-dependent.
+	#
+	#    We use /usr/$(get_libdir)/... to have ABI identifier.
+	econf \
+		--includedir="${EPREFIX}"/usr/$(get_libdir)/${PN}/include \
+		--disable-multi-os-directory \
+		$(use_enable static-libs static) \
+		$(use_enable pax_kernel pax_emutramp) \
+		$(use_enable debug)
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+	einstalldocs
+}


             reply	other threads:[~2019-11-27 22:58 UTC|newest]

Thread overview: 127+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-27 22:58 Sergei Trofimovich [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-10-16  4:34 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libffi/ Sam James
2024-10-16  3:17 Sam James
2024-10-12 23:06 Sam James
2024-10-12 23:06 Sam James
2024-09-11 23:59 Sam James
2024-09-11 14:15 Sam James
2024-09-06  3:33 Sam James
2024-09-06  3:33 Sam James
2024-09-05 23:10 Jakov Smolić
2024-09-05 23:10 Jakov Smolić
2024-05-18 17:06 Sam James
2024-03-19  3:42 Ionen Wolkens
2024-03-04  8:11 Sam James
2024-03-03  2:27 Sam James
2024-03-03  1:16 Sam James
2024-03-02 23:30 Sam James
2024-02-29 23:17 Sam James
2024-02-29 22:17 Sam James
2024-02-29 22:17 Sam James
2024-02-29 22:17 Sam James
2024-02-19  0:48 Sam James
2024-02-15 14:19 Sam James
2024-02-07 17:37 Jakov Smolić
2024-02-03 13:38 Sam James
2024-02-03 11:02 Sam James
2024-02-03  6:56 Sam James
2024-02-02  5:13 Sam James
2024-02-02  4:44 Sam James
2024-02-02  4:44 Sam James
2024-02-02  3:58 Sam James
2024-01-05  6:42 Sam James
2023-12-26 16:37 Sam James
2023-12-18  9:01 Arthur Zamarin
2023-12-17 11:45 Sam James
2023-12-16 20:56 Sam James
2023-12-16 19:16 Arthur Zamarin
2023-12-16 11:47 Arthur Zamarin
2023-12-16 11:29 Arthur Zamarin
2023-12-16 11:29 Arthur Zamarin
2023-04-25  1:01 Sam James
2023-04-25  0:45 Sam James
2023-04-24 12:38 Jakov Smolić
2023-04-24  8:25 Arthur Zamarin
2023-04-24  8:25 Arthur Zamarin
2023-04-24  8:25 Arthur Zamarin
2023-04-23 22:59 Sam James
2023-04-23 22:24 Sam James
2022-11-23 14:12 Jakov Smolić
2022-11-23 13:56 Jakov Smolić
2022-11-18  8:42 Arthur Zamarin
2022-11-18  6:06 Arthur Zamarin
2022-11-18  6:06 Arthur Zamarin
2022-11-18  6:03 Arthur Zamarin
2022-11-18  5:59 Arthur Zamarin
2022-11-18  5:59 Arthur Zamarin
2022-10-24 11:47 Sam James
2022-10-24 11:47 Sam James
2022-10-19  8:17 WANG Xuerui
2022-09-19 19:01 Sam James
2022-08-24  5:29 Agostino Sarubbo
2022-08-23 20:26 Agostino Sarubbo
2022-06-14 16:36 Arthur Zamarin
2022-06-14 16:36 Arthur Zamarin
2022-06-14 16:36 Arthur Zamarin
2022-06-14 16:34 Sam James
2022-06-14  8:15 Jakov Smolić
2022-06-14  7:15 Agostino Sarubbo
2022-06-14  6:09 Jakov Smolić
2022-06-14  5:54 Jakov Smolić
2022-01-06  9:07 David Seifert
2021-09-12 23:19 Sam James
2021-08-01 10:06 Marek Szuba
2021-07-24 22:53 Sergei Trofimovich
2021-07-07 21:48 Sergei Trofimovich
2021-07-01  9:21 Marek Szuba
2020-12-27 14:21 Fabian Groffen
2020-12-18 13:04 Fabian Groffen
2020-11-10 22:22 Sergei Trofimovich
2020-09-07 20:46 Sergei Trofimovich
2020-08-30  1:57 Sam James
2020-08-11 18:53 Agostino Sarubbo
2020-08-11 14:13 Agostino Sarubbo
2020-08-10 13:52 Agostino Sarubbo
2020-08-09 16:50 Sergei Trofimovich
2020-08-08 10:31 Sergei Trofimovich
2020-08-07 17:44 Sam James
2020-08-07 17:44 Sam James
2020-07-16 20:55 Sergei Trofimovich
2020-05-02 17:51 Sergei Trofimovich
2020-04-12 21:52 Mart Raudsepp
2020-03-30 13:39 Agostino Sarubbo
2020-03-29  8:57 Sergei Trofimovich
2020-03-29  8:57 Sergei Trofimovich
2020-03-23 23:58 Sergei Trofimovich
2020-03-15 12:46 Mikle Kolyada
2020-02-13 20:58 Sergei Trofimovich
2020-02-13 13:03 Agostino Sarubbo
2020-02-13 12:46 Agostino Sarubbo
2020-02-13 12:38 Agostino Sarubbo
2020-02-13 12:27 Agostino Sarubbo
2020-02-13 12:19 Agostino Sarubbo
2020-02-13 12:03 Agostino Sarubbo
2020-02-13  8:57 Agostino Sarubbo
2019-11-24 21:09 Sergei Trofimovich
2019-11-07 17:36 Aaron Bauman
2019-11-06  6:59 Sergei Trofimovich
2019-11-06  0:03 Sergei Trofimovich
2019-10-20 15:49 Sergei Trofimovich
2019-10-20  8:53 Mikle Kolyada
2019-10-03  8:14 Agostino Sarubbo
2019-10-03  8:12 Agostino Sarubbo
2019-10-03  8:09 Agostino Sarubbo
2019-09-29  9:11 Sergei Trofimovich
2019-09-26 19:02 Thomas Deutschmann
2019-09-26 18:35 Mikle Kolyada
2019-09-21 13:50 Sergei Trofimovich
2019-09-21  7:14 Matt Turner
2019-05-04 18:29 Andreas K. Hüttel
2019-01-07 13:28 Fabian Groffen
2018-01-10  4:28 Mike Frysinger
2018-01-06 13:26 Sergei Trofimovich
2017-12-24  9:46 Mart Raudsepp
2017-01-29 16:08 Fabian Groffen
2016-05-25  7:44 Jeroen Roovers
2016-05-25  6:29 Matt Turner
2016-05-01  6:49 Markus Meier

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1574895479.91330e1d176561bb267945a0142ef40e1a9d8295.slyfox@gentoo \
    --to=slyfox@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox