[gentoo-commits] repo/gentoo:master commit in: dev-lisp/c2ffi/files/, dev-lisp/c2ffi/

["Joonas Niilola" <juippis@gentoo.org>]

commit:     67373951aeb902dbe5a424698c7c024e69ce3832
Author:     Harald Judt <h.judt <AT> gmx <DOT> at>
AuthorDate: Wed Nov 13 20:07:02 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Dec 13 13:48:51 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67373951

dev-lisp/c2ffi: Version bump to c2ffi-9.0.0

Bump to use c2ffi-9.0.0 branch. At the moment, we need to
supply our own patch to get it building, though the issue
has been reported upstream and a pull request has been sent:

https://github.com/rpav/c2ffi/issues/71
https://github.com/rpav/c2ffi/pull/70

This commit additionally provides a snapshot build because live-only
packages are not allowed. Additionally, multi-slot has been removed.

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Harald Judt <h.judt <AT> gmx.at>
Closes: https://github.com/gentoo/gentoo/pull/13620
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-lisp/c2ffi/Manifest                            |  1 +
 dev-lisp/c2ffi/c2ffi-9.0.0.20191017.ebuild         | 26 ++++++++++++
 dev-lisp/c2ffi/c2ffi-9.0.0.9999.ebuild             | 22 ++++++++++
 .../c2ffi-9.0.0.20191017-fix-lib-location.patch    | 49 ++++++++++++++++++++++
 4 files changed, 98 insertions(+)

diff --git a/dev-lisp/c2ffi/Manifest b/dev-lisp/c2ffi/Manifest
new file mode 100644
index 00000000000..03b798a30b3
--- /dev/null
+++ b/dev-lisp/c2ffi/Manifest
@@ -0,0 +1 @@
+DIST c2ffi-9.0.0.20191017.tar.gz 35139 BLAKE2B a080f2cf7743aab630365fd305c106ada0318afb24093508c7667d8d702ec8dfd95a0ea9f54233a3a4b4c9b411e2f4aba5dacf7b2f35f1545b7ca63e765a7e55 SHA512 7a4743d89f431fd9ca42808358bdde03bbd85fc56f3350fddc94532c524ce373989671e706fadeb03eb240a81fb3f418176169acbf3ccd0f0f0c595d0f697832

diff --git a/dev-lisp/c2ffi/c2ffi-9.0.0.20191017.ebuild b/dev-lisp/c2ffi/c2ffi-9.0.0.20191017.ebuild
new file mode 100644
index 00000000000..4f2748bb7f4
--- /dev/null
+++ b/dev-lisp/c2ffi/c2ffi-9.0.0.20191017.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils llvm
+
+MY_COMMIT="15fda06de0bad97bf91f5590f7f24623eab2f580"
+
+DESCRIPTION="Clang-based FFI wrapper generator for Common Lisp"
+HOMEPAGE="https://github.com/rpav/c2ffi"
+SRC_URI="https://github.com/rpav/c2ffi/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="sys-devel/clang:9=
+	sys-devel/llvm:9=
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/c2ffi-${MY_COMMIT}"
+
+PATCHES=( "${FILESDIR}"/${PN}-9.0.0.20191017-fix-lib-location.patch )

diff --git a/dev-lisp/c2ffi/c2ffi-9.0.0.9999.ebuild b/dev-lisp/c2ffi/c2ffi-9.0.0.9999.ebuild
new file mode 100644
index 00000000000..34977fe7f69
--- /dev/null
+++ b/dev-lisp/c2ffi/c2ffi-9.0.0.9999.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils git-r3 llvm
+
+DESCRIPTION="Clang-based FFI wrapper generator for Common Lisp"
+HOMEPAGE="https://github.com/rpav/c2ffi"
+EGIT_REPO_URI="https://github.com/rpav/c2ffi.git"
+EGIT_BRANCH="llvm-9.0.0"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+
+DEPEND="sys-devel/clang:9=
+	sys-devel/llvm:9=
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-9.0.0.20191017-fix-lib-location.patch )

diff --git a/dev-lisp/c2ffi/files/c2ffi-9.0.0.20191017-fix-lib-location.patch b/dev-lisp/c2ffi/files/c2ffi-9.0.0.20191017-fix-lib-location.patch
new file mode 100644
index 00000000000..8b09b25aa73
--- /dev/null
+++ b/dev-lisp/c2ffi/files/c2ffi-9.0.0.20191017-fix-lib-location.patch
@@ -0,0 +1,49 @@
+From 3a496f89064de85af04ce101918c2ec5cebf7846 Mon Sep 17 00:00:00 2001
+From: Harald Judt <h.judt@gmx.at>
+Date: Fri, 8 Nov 2019 10:35:02 +0100
+Subject: Fix CLANG and LLVM libraries not found
+
+This commit gets the build working again here on Gentoo.
+
+Adding LLVM_LIBRARY_DIRS fixes the CLANG libs not found error.
+
+Adding llvm_map_components_to_libnames fixes LLMV not found error.
+---
+ CMakeLists.txt | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 99dbe4b..f93b9b3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -39,6 +39,15 @@ target_include_directories(c2ffi PUBLIC
+   ${LLVM_INCLUDE_DIRS}
+   ${SOURCE_ROOT}/src/include
+   )
++target_link_directories(c2ffi PUBLIC
++  ${LLVM_LIBRARY_DIRS}
++)
++message(STATUS "LLVM_LIBRARY_DIRS=${LLVM_LIBRARY_DIRS}")
++
++llvm_map_components_to_libnames(llvm_libs core support mcparser bitreader profiledata)
++
++message(STATUS "llvm_libs=${llvm_libs}")
++
+ target_link_libraries(c2ffi PUBLIC
+   clangFrontendTool
+   clangFrontend
+@@ -64,10 +73,9 @@ target_link_libraries(c2ffi PUBLIC
+   clangIndex
+   clangToolingCore
+   clangTooling
++  ${llvm_libs}
+   )
+ 
+-llvm_config(c2ffi USE_SHARED core support mcparser bitreader profiledata)
+-
+ set(APP_BIN_DIR "${CMAKE_BINARY_DIR}/bin")
+ set_target_properties(c2ffi PROPERTIES
+   RUNTIME_OUTPUT_DIRECTORY "${APP_BIN_DIR}"
+-- 
+2.23.0
+