* [gentoo-commits] repo/gentoo:master commit in: net-libs/libad9361-iio/, net-libs/libad9361-iio/files/
@ 2018-09-04 20:54 Richard Farina
0 siblings, 0 replies; 3+ messages in thread
From: Richard Farina @ 2018-09-04 20:54 UTC (permalink / raw
To: gentoo-commits
commit: 25a6def0fb2acebe908412892dd8be516c68de0f
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 4 20:53:34 2018 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Sep 4 20:54:29 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25a6def0
net-libs/libad9361-iio: import from pentoo
Package-Manager: Portage-2.3.48, Repoman-2.3.10
net-libs/libad9361-iio/Manifest | 1 +
.../7206bb2a9b655be3bdb66c6cf03aa504817ed240.patch | 36 ++++++++++++++++++++++
net-libs/libad9361-iio/libad9361-iio-0.1-r2.ebuild | 29 +++++++++++++++++
net-libs/libad9361-iio/libad9361-iio-9999.ebuild | 29 +++++++++++++++++
net-libs/libad9361-iio/metadata.xml | 15 +++++++++
5 files changed, 110 insertions(+)
diff --git a/net-libs/libad9361-iio/Manifest b/net-libs/libad9361-iio/Manifest
new file mode 100644
index 00000000000..ade8b02deb7
--- /dev/null
+++ b/net-libs/libad9361-iio/Manifest
@@ -0,0 +1 @@
+DIST libad9361-iio-0.1.tar.gz 27495 BLAKE2B d46873d69c494835e028ba1de7d17d48e5ed6bf1a73e96cf958dcfe44142cd39a9df3b00d61d3d3b8934bcb59fff3bd33c82f5c11de65f332185fe0e8c296f54 SHA512 64df3d4ce5e1c10fb44b6e39c11bac119ef77f2cc5b9785023b22670ca4905a1afd13c6923b3056f957789a911a3cae3cb7208770e1a112d849e7e3d2feb2fdc
diff --git a/net-libs/libad9361-iio/files/7206bb2a9b655be3bdb66c6cf03aa504817ed240.patch b/net-libs/libad9361-iio/files/7206bb2a9b655be3bdb66c6cf03aa504817ed240.patch
new file mode 100644
index 00000000000..6b1668f0a0e
--- /dev/null
+++ b/net-libs/libad9361-iio/files/7206bb2a9b655be3bdb66c6cf03aa504817ed240.patch
@@ -0,0 +1,36 @@
+From 7206bb2a9b655be3bdb66c6cf03aa504817ed240 Mon Sep 17 00:00:00 2001
+From: Lars-Peter Clausen <lars@metafoo.de>
+Date: Tue, 14 Aug 2018 09:48:59 +0200
+Subject: [PATCH] Fix building outside git repository
+
+Currently when building the project on a machine that has git installed,
+but the source is not inside a git repository cmake fails with the
+following error.
+
+ CMake Error at CMakeLists.txt:35 (if):
+ if given arguments:
+
+ "STREQUAL" "/home/lars/libad9361-iio"
+
+This is due to LIBAD9361_GIT_REPO variable being empty. In order to handle
+empty variables in CMake in a string comparison they need to be
+encapsulated in quotes.
+
+Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7af5444..8d04ba0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -32,7 +32,7 @@ if (GIT_FOUND)
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+
+-if (${LIBAD9361_GIT_REPO} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
++if ("${LIBAD9361_GIT_REPO}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ execute_process(
+ COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/net-libs/libad9361-iio/libad9361-iio-0.1-r2.ebuild b/net-libs/libad9361-iio/libad9361-iio-0.1-r2.ebuild
new file mode 100644
index 00000000000..429ddc4b83f
--- /dev/null
+++ b/net-libs/libad9361-iio/libad9361-iio-0.1-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="IIO AD9361 library for filter design and handling, multi-chip sync, etc."
+HOMEPAGE="https://github.com/analogdevicesinc/libad9361-iio"
+if [ "${PV}" = "9999" ]; then
+ EGIT_REPO_URI="https://github.com/analogdevicesinc/libad9361-iio"
+ inherit git-r3
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+
+RDEPEND="net-libs/libiio:="
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}/7206bb2a9b655be3bdb66c6cf03aa504817ed240.patch"
+ cmake-utils_src_prepare
+ eapply_user
+}
diff --git a/net-libs/libad9361-iio/libad9361-iio-9999.ebuild b/net-libs/libad9361-iio/libad9361-iio-9999.ebuild
new file mode 100644
index 00000000000..429ddc4b83f
--- /dev/null
+++ b/net-libs/libad9361-iio/libad9361-iio-9999.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="IIO AD9361 library for filter design and handling, multi-chip sync, etc."
+HOMEPAGE="https://github.com/analogdevicesinc/libad9361-iio"
+if [ "${PV}" = "9999" ]; then
+ EGIT_REPO_URI="https://github.com/analogdevicesinc/libad9361-iio"
+ inherit git-r3
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+
+RDEPEND="net-libs/libiio:="
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}/7206bb2a9b655be3bdb66c6cf03aa504817ed240.patch"
+ cmake-utils_src_prepare
+ eapply_user
+}
diff --git a/net-libs/libad9361-iio/metadata.xml b/net-libs/libad9361-iio/metadata.xml
new file mode 100644
index 00000000000..36c978cfbdb
--- /dev/null
+++ b/net-libs/libad9361-iio/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>zerochaos@gentoo.org</email>
+ <name>Rick Farina</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>radio@gentoo.org</email>
+ <name>Radio</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">analogdevicesinc/libad9361-iio</remote-id>
+ </upstream>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libad9361-iio/, net-libs/libad9361-iio/files/
@ 2022-06-14 19:21 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-06-14 19:21 UTC (permalink / raw
To: gentoo-commits
commit: e92180dd9914751b757db65136aa6ea97d1e8ee7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 18:43:42 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 18:44:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e92180dd
net-libs/libad9361-iio: EAPI 8; fix lld build; GNUInstallDirs
... and fix libdir in installed .pc file.
Closes: https://bugs.gentoo.org/831322
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../libad9361-iio-0.2-cmake-gnuinstalldirs.patch | 50 ++++++++++++++++++++++
.../files/libad9361-iio-0.2-fix-lld-tests.patch | 49 +++++++++++++++++++++
.../files/libad9361-iio-0.2-libdir-pkgconfig.patch | 14 ++++++
...iio-9999.ebuild => libad9361-iio-0.2-r1.ebuild} | 22 +++++-----
net-libs/libad9361-iio/libad9361-iio-9999.ebuild | 22 +++++-----
5 files changed, 135 insertions(+), 22 deletions(-)
diff --git a/net-libs/libad9361-iio/files/libad9361-iio-0.2-cmake-gnuinstalldirs.patch b/net-libs/libad9361-iio/files/libad9361-iio-0.2-cmake-gnuinstalldirs.patch
new file mode 100644
index 000000000000..5a69010eb184
--- /dev/null
+++ b/net-libs/libad9361-iio/files/libad9361-iio-0.2-cmake-gnuinstalldirs.patch
@@ -0,0 +1,50 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -13,6 +13,8 @@
+ cmake_minimum_required(VERSION 2.8.7)
+ project(ad9361 C)
+
++include(GNUInstallDirs)
++
+ set(LIBAD9361_VERSION_MAJOR 0)
+ set(LIBAD9361_VERSION_MINOR 2)
+ set(VERSION ${LIBAD9361_VERSION_MAJOR}.${LIBAD9361_VERSION_MINOR})
+@@ -59,10 +61,6 @@ endif()
+
+ add_definitions(-D_POSIX_C_SOURCE=199309L -DLIBAD9361_EXPORTS=1)
+
+-set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib"
+- CACHE PATH "Installation directory for libraries")
+-mark_as_advanced(INSTALL_LIB_DIR)
+-
+ find_library(LIBIIO_LIBRARIES iio)
+ find_path(LIBIIO_INCLUDEDIR iio.h)
+
+@@ -98,21 +96,17 @@ configure_file(libad9361-iio.iss.cmakein ${CMAKE_CURRENT_BINARY_DIR}/libad9361-i
+
+ set(LIBAD9361_PC ${CMAKE_CURRENT_BINARY_DIR}/libad9361.pc)
+ configure_file(libad9361.pc.cmakein ${LIBAD9361_PC} @ONLY)
+-install(FILES ${LIBAD9361_PC} DESTINATION ${INSTALL_LIB_DIR}/pkgconfig)
++install(FILES ${LIBAD9361_PC} DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+
+ if(NOT SKIP_INSTALL_ALL)
+ install(TARGETS ad9361
+- ARCHIVE DESTINATION lib
+- LIBRARY DESTINATION "${INSTALL_LIB_DIR}"
+- RUNTIME DESTINATION bin
+- FRAMEWORK DESTINATION lib
+- PUBLIC_HEADER DESTINATION include)
++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++ FRAMEWORK DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+ endif()
+
+-set(CMAKE_INSTALL_DOCDIR "" CACHE PATH "documentation root (DATAROOTDIR/doc/${PROJECT_NAME}${LIBAD9361_VERSION_MAJOR}-doc)")
+-include(GNUInstallDirs)
+-set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}${LIBAD9361_VERSION_MAJOR}-doc")
+-
+ find_package(Doxygen)
+ if(DOXYGEN_FOUND)
+ option(WITH_DOC "Generate documentation with Doxygen" ON)
diff --git a/net-libs/libad9361-iio/files/libad9361-iio-0.2-fix-lld-tests.patch b/net-libs/libad9361-iio/files/libad9361-iio-0.2-fix-lld-tests.patch
new file mode 100644
index 000000000000..00ef9e0a6869
--- /dev/null
+++ b/net-libs/libad9361-iio/files/libad9361-iio-0.2-fix-lld-tests.patch
@@ -0,0 +1,49 @@
+https://bugs.gentoo.org/831322
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -1,17 +1,29 @@
+ add_executable(FilterDesignerTest filter_designer_test.c)
+-target_link_libraries(FilterDesignerTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361)
++if(WIN32)
++ target_link_libraries(FilterDesignerTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361)
++else()
++ target_link_libraries(FilterDesignerTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361 m)
++endif()
+ add_test(NAME FilterDesignerTest
+ COMMAND FilterDesignerTest
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+
+ add_executable(GenerateRatesTest gen_rates_test.c)
+-target_link_libraries(GenerateRatesTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361)
++if(WIN32)
++ target_link_libraries(GenerateRatesTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361)
++else()
++ target_link_libraries(GenerateRatesTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361 m)
++endif()
+ add_test(NAME GenerateRatesTest
+ COMMAND GenerateRatesTest
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+
+ add_executable(FilterDesignerHardwareTest filter_designer_hw.c)
+-target_link_libraries(FilterDesignerHardwareTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361)
++if(WIN32)
++ target_link_libraries(FilterDesignerHardwareTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361)
++else()
++ target_link_libraries(FilterDesignerHardwareTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361 m)
++endif()
+ add_test(NAME FilterDesignerHardwareTest
+ COMMAND FilterDesignerHardwareTest
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+@@ -27,7 +39,11 @@ add_test(NAME FMComms5SyncTest
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+
+ add_executable(AutoRateTest auto_rate_test_hw.c)
+-target_link_libraries(AutoRateTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361)
++if(WIN32)
++ target_link_libraries(AutoRateTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361)
++else()
++ target_link_libraries(AutoRateTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361 m)
++endif()
+ add_test(NAME AutoRateTest
+ COMMAND AutoRateTest
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/net-libs/libad9361-iio/files/libad9361-iio-0.2-libdir-pkgconfig.patch b/net-libs/libad9361-iio/files/libad9361-iio-0.2-libdir-pkgconfig.patch
new file mode 100644
index 000000000000..a23205e44da9
--- /dev/null
+++ b/net-libs/libad9361-iio/files/libad9361-iio-0.2-libdir-pkgconfig.patch
@@ -0,0 +1,14 @@
+--- a/libad9361.pc.cmakein
++++ b/libad9361.pc.cmakein
+@@ -1,8 +1,8 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@CMAKE_INSTALL_PREFIX@/lib
+-sharedlibdir=@CMAKE_INSTALL_PREFIX@/lib
+-includedir=@CMAKE_INSTALL_PREFIX@/include
++libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
++sharedlibdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
++includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@
+
+ Name: libad9361
+ Description: Device specific library for AD936X transceivers
diff --git a/net-libs/libad9361-iio/libad9361-iio-9999.ebuild b/net-libs/libad9361-iio/libad9361-iio-0.2-r1.ebuild
similarity index 57%
copy from net-libs/libad9361-iio/libad9361-iio-9999.ebuild
copy to net-libs/libad9361-iio/libad9361-iio-0.2-r1.ebuild
index 630cb27fb6e9..596e74764626 100644
--- a/net-libs/libad9361-iio/libad9361-iio-9999.ebuild
+++ b/net-libs/libad9361-iio/libad9361-iio-0.2-r1.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
+
inherit cmake
-DESCRIPTION="IIO AD9361 library for filter design and handling, multi-chip sync, etc."
+DESCRIPTION="IIO AD9361 library for filter design and handling, multi-chip sync, etc"
HOMEPAGE="https://github.com/analogdevicesinc/libad9361-iio"
-if [ "${PV}" = "9999" ]; then
+if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/analogdevicesinc/libad9361-iio"
inherit git-r3
else
SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~riscv ~x86"
fi
LICENSE="LGPL-2.1"
@@ -20,9 +21,8 @@ SLOT="0/${PV}"
RDEPEND="net-libs/libiio:="
DEPEND="${RDEPEND}"
-src_prepare() {
- sed -i -e "s:"${CMAKE_INSTALL_PREFIX}/lib":"${CMAKE_INSTALL_PREFIX}/$(get_libdir)":g" \
- -e "s:\${PROJECT_NAME}\${LIBAD9361_VERSION_MAJOR}-doc:${P}:" CMakeLists.txt || die
- cmake_src_prepare
- eapply_user
-}
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.2-fix-lld-tests.patch
+ "${FILESDIR}"/${PN}-0.2-libdir-pkgconfig.patch
+ "${FILESDIR}"/${PN}-0.2-cmake-gnuinstalldirs.patch
+)
diff --git a/net-libs/libad9361-iio/libad9361-iio-9999.ebuild b/net-libs/libad9361-iio/libad9361-iio-9999.ebuild
index 630cb27fb6e9..596e74764626 100644
--- a/net-libs/libad9361-iio/libad9361-iio-9999.ebuild
+++ b/net-libs/libad9361-iio/libad9361-iio-9999.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
+
inherit cmake
-DESCRIPTION="IIO AD9361 library for filter design and handling, multi-chip sync, etc."
+DESCRIPTION="IIO AD9361 library for filter design and handling, multi-chip sync, etc"
HOMEPAGE="https://github.com/analogdevicesinc/libad9361-iio"
-if [ "${PV}" = "9999" ]; then
+if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/analogdevicesinc/libad9361-iio"
inherit git-r3
else
SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~riscv ~x86"
fi
LICENSE="LGPL-2.1"
@@ -20,9 +21,8 @@ SLOT="0/${PV}"
RDEPEND="net-libs/libiio:="
DEPEND="${RDEPEND}"
-src_prepare() {
- sed -i -e "s:"${CMAKE_INSTALL_PREFIX}/lib":"${CMAKE_INSTALL_PREFIX}/$(get_libdir)":g" \
- -e "s:\${PROJECT_NAME}\${LIBAD9361_VERSION_MAJOR}-doc:${P}:" CMakeLists.txt || die
- cmake_src_prepare
- eapply_user
-}
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.2-fix-lld-tests.patch
+ "${FILESDIR}"/${PN}-0.2-libdir-pkgconfig.patch
+ "${FILESDIR}"/${PN}-0.2-cmake-gnuinstalldirs.patch
+)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/libad9361-iio/, net-libs/libad9361-iio/files/
@ 2023-08-21 2:30 Rick Farina
0 siblings, 0 replies; 3+ messages in thread
From: Rick Farina @ 2023-08-21 2:30 UTC (permalink / raw
To: gentoo-commits
commit: 75894d1abcd0831ce64c829adf39d4788877d044
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 21 02:29:32 2023 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Aug 21 02:30:01 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75894d1a
net-libs/libad9361-iio: add 0.3
add doc use flag
Minor QA
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-libs/libad9361-iio/Manifest | 1 +
.../libad9361-iio-0.3-cmake-gnuinstalldirs.patch | 57 ++++++++++++++++++++++
...61-iio-9999.ebuild => libad9361-iio-0.3.ebuild} | 23 +++++++--
net-libs/libad9361-iio/libad9361-iio-9999.ebuild | 22 +++++++--
4 files changed, 97 insertions(+), 6 deletions(-)
diff --git a/net-libs/libad9361-iio/Manifest b/net-libs/libad9361-iio/Manifest
index 79e531fd068d..2d201a923391 100644
--- a/net-libs/libad9361-iio/Manifest
+++ b/net-libs/libad9361-iio/Manifest
@@ -1 +1,2 @@
DIST libad9361-iio-0.2.tar.gz 167678 BLAKE2B 9880114bc53f3d4975dbe0773f8d112e40b0df47e34985bdc68c5b6740aee2c140ced39353929a793c2b327b5811461436ceb2934c2a71fc7b92b218092d468d SHA512 f95fa955531198ab33c16d41685d23140e875b2eafa1da10cdf60a7bf1ae760e86e2d3d28c9ab36a3a7b7a90e36bb53456dec1d6e537a1574a5505b7595e764c
+DIST libad9361-iio-0.3.tar.gz 188475 BLAKE2B bdd3733ece66f1b34075821316ce054537059297964cc4bd92bc4c768d1253a2b6d1822bf6cce20082395b0f7d72ccc63a5002608f8042494a6a543a3e0369a4 SHA512 904f81fead71a9c93ccdcdb8822247fc8c496920abb9b13ea4b2b0465d50f5c0115ffc8d226496e76f7bb23b466031556129b18a1f35c65c30dcb3b0c1aeeff9
diff --git a/net-libs/libad9361-iio/files/libad9361-iio-0.3-cmake-gnuinstalldirs.patch b/net-libs/libad9361-iio/files/libad9361-iio-0.3-cmake-gnuinstalldirs.patch
new file mode 100644
index 000000000000..9df6ed6dede2
--- /dev/null
+++ b/net-libs/libad9361-iio/files/libad9361-iio-0.3-cmake-gnuinstalldirs.patch
@@ -0,0 +1,57 @@
+From ef3d58506132072834637f887bc47eb4d0c52a73 Mon Sep 17 00:00:00 2001
+From: Julien Malik <julien.malik@unseenlabs.fr>
+Date: Mon, 29 Nov 2021 17:52:13 +0100
+Subject: [PATCH] cmake: Honor GNUInstallDirs for installation
+
+Library installation dir can be lib, lib64 or lib/<multiarch-tuple>.
+Use the installation paths given by GNUInstallDirs by default, as done in libiio
+
+Signed-off-by: Julien Malik <julien.malik@unseenlabs.fr>
+---
+ CMakeLists.txt | 20 +++++++++-----------
+ 1 file changed, 9 insertions(+), 11 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 04d5c45..475a448 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -70,10 +70,6 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|DragonFly|OpenBSD|NetBSD")
+ endif()
+ add_definitions(-D_POSIX_C_SOURCE=200809L -D__XSI_VISIBLE=500 -DLIBAD9361_EXPORTS=1)
+
+-set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib"
+- CACHE PATH "Installation directory for libraries")
+-mark_as_advanced(INSTALL_LIB_DIR)
+-
+ find_library(LIBIIO_LIBRARIES iio)
+ find_path(LIBIIO_INCLUDEDIR iio.h)
+
+@@ -109,19 +105,21 @@ configure_file(libad9361-iio.iss.cmakein ${CMAKE_CURRENT_BINARY_DIR}/libad9361-i
+
+ set(LIBAD9361_PC ${CMAKE_CURRENT_BINARY_DIR}/libad9361.pc)
+ configure_file(libad9361.pc.cmakein ${LIBAD9361_PC} @ONLY)
+-install(FILES ${LIBAD9361_PC} DESTINATION ${INSTALL_LIB_DIR}/pkgconfig)
+
++include(GNUInstallDirs)
+ if(NOT SKIP_INSTALL_ALL)
+ install(TARGETS ad9361
+- ARCHIVE DESTINATION lib
+- LIBRARY DESTINATION "${INSTALL_LIB_DIR}"
+- RUNTIME DESTINATION bin
+- FRAMEWORK DESTINATION lib
+- PUBLIC_HEADER DESTINATION include)
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++ FRAMEWORK DESTINATION ${OSX_INSTALL_FRAMEWORKSDIR}
++ PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
++
++ install(FILES ${LIBAD9361_PC} DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ endif()
+
+ set(CMAKE_INSTALL_DOCDIR "" CACHE PATH "documentation root (DATAROOTDIR/doc/${PROJECT_NAME}${LIBAD9361_VERSION_MAJOR}-doc)")
+-include(GNUInstallDirs)
++
+ set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}${LIBAD9361_VERSION_MAJOR}-doc")
+
+ find_package(Doxygen)
diff --git a/net-libs/libad9361-iio/libad9361-iio-9999.ebuild b/net-libs/libad9361-iio/libad9361-iio-0.3.ebuild
similarity index 58%
copy from net-libs/libad9361-iio/libad9361-iio-9999.ebuild
copy to net-libs/libad9361-iio/libad9361-iio-0.3.ebuild
index 596e74764626..4150b0e0fb58 100644
--- a/net-libs/libad9361-iio/libad9361-iio-9999.ebuild
+++ b/net-libs/libad9361-iio/libad9361-iio-0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,17 +12,34 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~riscv ~x86"
+ KEYWORDS="~amd64 ~arm ~riscv ~x86"
fi
+IUSE="doc"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
RDEPEND="net-libs/libiio:="
DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
PATCHES=(
"${FILESDIR}"/${PN}-0.2-fix-lld-tests.patch
"${FILESDIR}"/${PN}-0.2-libdir-pkgconfig.patch
- "${FILESDIR}"/${PN}-0.2-cmake-gnuinstalldirs.patch
+ "${FILESDIR}"/${PN}-0.3-cmake-gnuinstalldirs.patch
)
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_DOC="$(usex doc)"
+ -DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${P}"
+ )
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ if use doc; then
+ mv "${ED}/usr/share/doc/ad93610-doc" "${ED}/usr/share/doc/${P}" || die
+ fi
+}
diff --git a/net-libs/libad9361-iio/libad9361-iio-9999.ebuild b/net-libs/libad9361-iio/libad9361-iio-9999.ebuild
index 596e74764626..f26413486b48 100644
--- a/net-libs/libad9361-iio/libad9361-iio-9999.ebuild
+++ b/net-libs/libad9361-iio/libad9361-iio-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,17 +12,33 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~riscv ~x86"
+ KEYWORDS="~amd64 ~arm ~riscv ~x86"
fi
+IUSE="doc"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
RDEPEND="net-libs/libiio:="
DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
PATCHES=(
"${FILESDIR}"/${PN}-0.2-fix-lld-tests.patch
"${FILESDIR}"/${PN}-0.2-libdir-pkgconfig.patch
- "${FILESDIR}"/${PN}-0.2-cmake-gnuinstalldirs.patch
)
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_DOC="$(usex doc)"
+ -DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${P}"
+ )
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ if use doc; then
+ mv "${ED}/usr/share/doc/ad93610-doc" "${ED}/usr/share/doc/${P}" || die
+ fi
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-08-21 2:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-04 20:54 [gentoo-commits] repo/gentoo:master commit in: net-libs/libad9361-iio/, net-libs/libad9361-iio/files/ Richard Farina
-- strict thread matches above, loose matches on Subject: below --
2022-06-14 19:21 Sam James
2023-08-21 2:30 Rick Farina
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox