From a8b0d35ab742f31538d515dea39716e566d533c0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 6 Jan 2018 23:13:57 +0000 Subject: gentoo resync : 06.01.2018 --- dev-libs/libffi/Manifest | 5 +- .../libffi/files/libffi-3.2.1-complex_alpha.patch | 4 +- .../files/libffi-3.2.1-include-path-autogen.patch | 56 ++++++++++++++++++ .../libffi/files/libffi-3.2.1-include-path.patch | 39 ++++++++++++ dev-libs/libffi/libffi-3.2.1-r1.ebuild | 69 ++++++++++++++++++++++ 5 files changed, 170 insertions(+), 3 deletions(-) create mode 100644 dev-libs/libffi/files/libffi-3.2.1-include-path-autogen.patch create mode 100644 dev-libs/libffi/files/libffi-3.2.1-include-path.patch create mode 100644 dev-libs/libffi/libffi-3.2.1-r1.ebuild (limited to 'dev-libs/libffi') diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest index c2a9f043c867..d9b3a2e62d80 100644 --- a/dev-libs/libffi/Manifest +++ b/dev-libs/libffi/Manifest @@ -1,7 +1,10 @@ AUX libffi-3.1-darwin-x32.patch 606 BLAKE2B d5fb0c46d294241fd054717e3da00fdfa4e37b9d98bd79801843b0562f8ec02943659ce1baac5ed24a8651771ef318626b8f70d054e300572c2888a482a3084d SHA512 909e4c45f124d6a9d4a0b2b97fdcbf0451a15c11c3da581fc8571d4f4f0857306bbfddf682bbe0441f0c5c84a8489e4a79a792883bfe440224cf672567bf0a24 AUX libffi-3.2.1-complex-ia64.patch 1622 BLAKE2B dc51b1cf0d0cd796d168bf4cdb66a8d5fc34a5fd46d96fd0dffd07d5885032775389cfd1465100d9972eb0ce736e8caab14dd49318dcc6630754825806be342e SHA512 136eaaa9e467afba2634fd4f997cfd982fc0162a48aba7efc429e719afea53e40607c973d281f78d5cf2d7886664ddc4b19161d35af113c9a7326c637e10b2e1 -AUX libffi-3.2.1-complex_alpha.patch 601 BLAKE2B f66926263810dd06424cfb8eb0cca20ffdc52e615ca0691af3e473d0a8aa60a2e7efd9a09c7bfd7b496da70f47325a20df53c08efff1be6a1c42686c80c0f399 SHA512 66890bf241236f08e0e726c820e2ff82df6071c1a3b25aa4f3f005b6431b94ec5a5f730db56de82c006e26415d72fe665d6ced37567bcdec6d84357faeb24bec +AUX libffi-3.2.1-complex_alpha.patch 605 BLAKE2B 3b14addb7797ff99a465101487be49c922f0286f49230d13cebdec159e0054defa0f35e5dbbd0c5dad71117ad72d183d0a88af5b175957b3585d2b1639c87a2b SHA512 c5a3c287db9b7a71068c4f73c0dc3c3e2ee602a9c55c57cae393fcdbdc913e77e18481c19f8454b74ed7b66f7dded9e30b11b61d079c8567c585f6cc890cd70b +AUX libffi-3.2.1-include-path-autogen.patch 2901 BLAKE2B 836e61b6f64b9d649e969799e42c5dd808750ba51997d7486eef58e636ef2e1f215f9a26b5e88e61366d57e758688c4e69f578edd81167e1dbb0a8357f049150 SHA512 6c8b2d7dca0cdc6f69b2393777f546b6722b6260cfa6fcb814915975227185cc3b467b6537939f8f8d05df5fd8f245301030aa4ef74a3c2fa073e6200e91d47f +AUX libffi-3.2.1-include-path.patch 1156 BLAKE2B b5842f5dc6462edac0a5f58265246599d0283bb148f954fb79d8037e37ae332a664f57a201589b89022d63932d8a4e56c4b0c6a7a9a2240ae6602e847fff3a55 SHA512 f387590510ee5e3aedc03744fcf1faae35c105a81d4c2f646e495d489bc6467cd88d4a0a63b40a29fe620ad71db1a05c1fe483af63974222f366135f73f36cb3 AUX libffi-3.2.1-o-tmpfile-eacces.patch 660 BLAKE2B 651067a56e0bd0980a696ad12c8fa76d68d914fa370fb93c3f5f5759dd4837895a077510606fa451beafb75e7da19f42a9f88e3d56d6c283f684da695ad69960 SHA512 0887063ce1d812c31a34d662f852cf2944e008f2f60bd07941572f9032861e749968b090686e0d788f7cc3c5c8f1ed2388418ff000c42fd2d592f9837e782f65 DIST libffi-3.2.1.tar.gz 940837 BLAKE2B d202ccaa185acfd2476ed2a9b011891507cd8efbbda60f67c583268d1563853442ed829acecbf81c9b6b9a930345780bb7a4bd80e71e50ef544c7f4eab8cb01f SHA512 980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483 +EBUILD libffi-3.2.1-r1.ebuild 2417 BLAKE2B e36f4348b79be67ee641f275e93e133c54729d3878c66cdde71c0d840f4c7b4984c425adfc3969ab662c0f3964c114cae2a6688ec14bc27a63b2810af1ded4b2 SHA512 6de380334852f5b340918d288fd96f8b0818a08c9d8ebbb6bfc8e521de5184f4d1152c12c6c5f9ca6fce26f1c510afcc085107b0b6559acf7d09ee96459e2e78 EBUILD libffi-3.2.1.ebuild 2119 BLAKE2B 93326ccfd9a400250a4eaf65e4f79e58f79e7cf57c7eef8eb3304ebeec08af1d24f2abd9b1808d1c1ef1f43b1e4d652617ff1da5e9df0a98697560b6f4f82a7b SHA512 65f465f7457d035f723060ffa4c3fbee29149b1ca40be4d5bbcc2395d4778a3c5b376f9670d6612368d7216baedfe793a11a5a28c91b3b9b9791e38384bd9454 MISC metadata.xml 1866 BLAKE2B 4623e414d8d8c2d569b2ae8a6fd6117c38b11e5b3845bba17b32ce442b88afd0ea1aff66cd73181c59b7e66be65df078d68d13f793ab654c3e213ab4c20fce50 SHA512 e1de94bb58c77aa48ee1b7d81777d26b736db3f3ef652099bb3f3a9bd75689258a61168371a30976e0717519bc9300b3812a8405ad1f16683c45a24817960b90 diff --git a/dev-libs/libffi/files/libffi-3.2.1-complex_alpha.patch b/dev-libs/libffi/files/libffi-3.2.1-complex_alpha.patch index 0d6e0bc29007..5e8c943eee38 100644 --- a/dev-libs/libffi/files/libffi-3.2.1-complex_alpha.patch +++ b/dev-libs/libffi/files/libffi-3.2.1-complex_alpha.patch @@ -1,5 +1,5 @@ ---- src/alpha/osf.S.orig 2015-01-16 10:46:15.000000000 +0100 -+++ src/alpha/osf.S 2015-01-16 10:46:24.000000000 +0100 +--- a/src/alpha/osf.S.orig 2015-01-16 10:46:15.000000000 +0100 ++++ b/src/alpha/osf.S 2015-01-16 10:46:24.000000000 +0100 @@ -279,6 +279,7 @@ .gprel32 $load_64 # FFI_TYPE_SINT64 .gprel32 $load_none # FFI_TYPE_STRUCT diff --git a/dev-libs/libffi/files/libffi-3.2.1-include-path-autogen.patch b/dev-libs/libffi/files/libffi-3.2.1-include-path-autogen.patch new file mode 100644 index 000000000000..522e1fa9c486 --- /dev/null +++ b/dev-libs/libffi/files/libffi-3.2.1-include-path-autogen.patch @@ -0,0 +1,56 @@ +Autogenerated part of libffi-3.2.1-include-path.patch + +https://bugs.gentoo.org/643582 +diff --git a/include/Makefile.in b/include/Makefile.in +index 9d747e8..99ecfd7 100644 +--- a/include/Makefile.in ++++ b/include/Makefile.in +@@ -152,2 +152,2 @@ am__uninstall_files_from_dir = { \ +-am__installdirs = "$(DESTDIR)$(includesdir)" +-HEADERS = $(nodist_includes_HEADERS) ++am__installdirs = "$(DESTDIR)$(includedir)" ++HEADERS = $(nodist_include_HEADERS) +@@ -317,2 +317 @@ EXTRA_DIST = ffi.h.in ffi_common.h +-includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include +-nodist_includes_HEADERS = ffi.h ffitarget.h ++nodist_include_HEADERS = ffi.h ffitarget.h +@@ -360 +359 @@ clean-libtool: +-install-nodist_includesHEADERS: $(nodist_includes_HEADERS) ++install-nodist_includeHEADERS: $(nodist_include_HEADERS) +@@ -362 +361 @@ install-nodist_includesHEADERS: $(nodist_includes_HEADERS) +- @list='$(nodist_includes_HEADERS)'; test -n "$(includesdir)" || list=; \ ++ @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ +@@ -364,2 +363,2 @@ install-nodist_includesHEADERS: $(nodist_includes_HEADERS) +- echo " $(MKDIR_P) '$(DESTDIR)$(includesdir)'"; \ +- $(MKDIR_P) "$(DESTDIR)$(includesdir)" || exit 1; \ ++ echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \ ++ $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \ +@@ -372,2 +371,2 @@ install-nodist_includesHEADERS: $(nodist_includes_HEADERS) +- echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includesdir)'"; \ +- $(INSTALL_HEADER) $$files "$(DESTDIR)$(includesdir)" || exit $$?; \ ++ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \ ++ $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \ +@@ -376 +375 @@ install-nodist_includesHEADERS: $(nodist_includes_HEADERS) +-uninstall-nodist_includesHEADERS: ++uninstall-nodist_includeHEADERS: +@@ -378 +377 @@ uninstall-nodist_includesHEADERS: +- @list='$(nodist_includes_HEADERS)'; test -n "$(includesdir)" || list=; \ ++ @list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \ +@@ -380 +379 @@ uninstall-nodist_includesHEADERS: +- dir='$(DESTDIR)$(includesdir)'; $(am__uninstall_files_from_dir) ++ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) +@@ -468 +467 @@ installdirs: +- for dir in "$(DESTDIR)$(includesdir)"; do \ ++ for dir in "$(DESTDIR)$(includedir)"; do \ +@@ -522 +521 @@ info-am: +-install-data-am: install-nodist_includesHEADERS ++install-data-am: install-nodist_includeHEADERS +@@ -566 +565 @@ ps-am: +-uninstall-am: uninstall-nodist_includesHEADERS ++uninstall-am: uninstall-nodist_includeHEADERS +@@ -577 +576 @@ uninstall-am: uninstall-nodist_includesHEADERS +- install-nodist_includesHEADERS install-pdf install-pdf-am \ ++ install-nodist_includeHEADERS install-pdf install-pdf-am \ +@@ -582 +581 @@ uninstall-am: uninstall-nodist_includesHEADERS +- uninstall-am uninstall-nodist_includesHEADERS ++ uninstall-am uninstall-nodist_includeHEADERS diff --git a/dev-libs/libffi/files/libffi-3.2.1-include-path.patch b/dev-libs/libffi/files/libffi-3.2.1-include-path.patch new file mode 100644 index 000000000000..e1269b2398a4 --- /dev/null +++ b/dev-libs/libffi/files/libffi-3.2.1-include-path.patch @@ -0,0 +1,39 @@ +https://bugs.gentoo.org/643582 + +From 982b89c01aca99c7bc229914fc1521f96930919b Mon Sep 17 00:00:00 2001 +From: Yen Chi Hsuan +Date: Sun, 13 Nov 2016 19:17:19 +0800 +Subject: [PATCH] Install public headers in the standard path + +--- + include/Makefile.am | 3 +-- + libffi.pc.in | 2 +- + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/include/Makefile.am b/include/Makefile.am +index bb241e8..c59df9f 100644 +--- a/include/Makefile.am ++++ b/include/Makefile.am +@@ -6,5 +6,4 @@ DISTCLEANFILES=ffitarget.h + noinst_HEADERS=ffi_common.h ffi_cfi.h + EXTRA_DIST=ffi.h.in + +-includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include +-nodist_includes_HEADERS = ffi.h ffitarget.h ++nodist_include_HEADERS = ffi.h ffitarget.h +diff --git a/libffi.pc.in b/libffi.pc.in +index edf6fde..6fad83b 100644 +--- a/libffi.pc.in ++++ b/libffi.pc.in +@@ -2,7 +2,7 @@ prefix=@prefix@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ + toolexeclibdir=@toolexeclibdir@ +-includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include ++includedir=@includedir@ + + Name: @PACKAGE_NAME@ + Description: Library supporting Foreign Function Interfaces +-- +2.15.1 + diff --git a/dev-libs/libffi/libffi-3.2.1-r1.ebuild b/dev-libs/libffi/libffi-3.2.1-r1.ebuild new file mode 100644 index 000000000000..134d518b54b9 --- /dev/null +++ b/dev-libs/libffi/libffi-3.2.1-r1.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit eutils libtool multilib multilib-minimal toolchain-funcs + +DESCRIPTION="a portable, high level programming interface to various calling conventions" +HOMEPAGE="https://sourceware.org/libffi/" +SRC_URI="ftp://sourceware.org/pub/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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" + +RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" +DEPEND="test? ( dev-util/dejagnu )" + +DOCS="ChangeLog* README" + +PATCHES=( + "${FILESDIR}"/${PN}-3.2.1-o-tmpfile-eacces.patch #529044 + "${FILESDIR}"/${PN}-3.2.1-complex_alpha.patch + "${FILESDIR}"/${PN}-3.1-darwin-x32.patch + "${FILESDIR}"/${PN}-3.2.1-complex-ia64.patch + "${FILESDIR}"/${PN}-3.2.1-include-path.patch + "${FILESDIR}"/${PN}-3.2.1-include-path-autogen.patch +) + +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 + + sed -i -e 's:@toolexeclibdir@:$(libdir):g' Makefile.in || die #462814 + elibtoolize +} + +multilib_src_configure() { + use userland_BSD && export HOST="${CHOST}" + # python does not like miltilib-wrapped headers: bug #643582 + # thus we install includes into ABI-specific paths + local includes="${EPREFIX}"/usr/$(get_libdir)/${P}/include/ + econf \ + $(use_enable static-libs static) \ + $(use_enable pax_kernel pax_emutramp) \ + $(use_enable debug) \ + --includedir="${includes}" +} + +multilib_src_install_all() { + prune_libtool_files + einstalldocs +} -- cgit v1.2.3