mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
dev-embedded/libftdi: Fix build w/ >=cmake-4
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
87
dev-embedded/libftdi/files/libftdi-1.5-cmake4.patch
Normal file
87
dev-embedded/libftdi/files/libftdi-1.5-cmake4.patch
Normal file
@@ -0,0 +1,87 @@
|
||||
From 503c8789db7cb99e4e53cae3c220f80aef07c785 Mon Sep 17 00:00:00 2001
|
||||
From: Yegor Yefremov <yegorslists@googlemail.com>
|
||||
Date: Wed, 2 Apr 2025 10:12:34 +0200
|
||||
Subject: [PATCH] CMakeLists.txt: bump CMake version to 3.15
|
||||
|
||||
Older CMake versions are treated as deprecated.
|
||||
|
||||
merged with cherry-picks of preceding changes:
|
||||
3861e7dc9e83f2f6ff4e1579cf3bbf63a6827105
|
||||
de9f01ece34d2fe6e842e0250a38f4b16eda2429
|
||||
3f314ed78111473b7cbf1b9d1854c9f6322eea7a
|
||||
|
||||
diff -u a/CMakeLists.txt b/CMakeLists.txt
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,3 +1,5 @@
|
||||
+cmake_minimum_required(VERSION 3.15 FATAL_ERROR)
|
||||
+
|
||||
# Project
|
||||
project(libftdi1 C)
|
||||
set(MAJOR_VERSION 1)
|
||||
@@ -12,7 +14,6 @@
|
||||
set(CMAKE_BUILD_TYPE RelWithDebInfo)
|
||||
endif("${CMAKE_BUILD_TYPE}" STREQUAL "")
|
||||
set(CMAKE_COLOR_MAKEFILE ON)
|
||||
-cmake_minimum_required(VERSION 2.6 FATAL_ERROR)
|
||||
|
||||
add_definitions(-Wall)
|
||||
|
||||
@@ -211,30 +212,25 @@
|
||||
|
||||
set ( LIBFTDI_USE_FILE ${CMAKE_INSTALL_PREFIX}/${LIBFTDI_CMAKE_CONFIG_DIR}/UseLibFTDI1.cmake )
|
||||
|
||||
-if(CMAKE_VERSION VERSION_LESS 2.8.8)
|
||||
- configure_file ( cmake/LibFTDI1Config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1Config.cmake @ONLY )
|
||||
- configure_file ( cmake/LibFTDI1ConfigVersion.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1ConfigVersion.cmake @ONLY )
|
||||
-else ()
|
||||
- include(CMakePackageConfigHelpers)
|
||||
-
|
||||
- configure_package_config_file (
|
||||
- cmake/LibFTDI1Config.cmake.in
|
||||
- ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1Config.cmake
|
||||
- INSTALL_DESTINATION ${LIBFTDI_CMAKE_CONFIG_DIR}
|
||||
- PATH_VARS
|
||||
- LIBFTDI_USE_FILE
|
||||
- LIBFTDI_ROOT_DIR
|
||||
- LIBFTDI_INCLUDE_DIR
|
||||
- LIBFTDI_INCLUDE_DIRS
|
||||
- LIBFTDI_LIBRARY_DIRS
|
||||
- NO_CHECK_REQUIRED_COMPONENTS_MACRO
|
||||
- )
|
||||
- write_basic_package_version_file (
|
||||
- LibFTDI1ConfigVersion.cmake
|
||||
- VERSION ${LIBFTDI_VERSION_STRING}
|
||||
- COMPATIBILITY AnyNewerVersion
|
||||
- )
|
||||
-endif ()
|
||||
+include(CMakePackageConfigHelpers)
|
||||
+
|
||||
+configure_package_config_file (
|
||||
+ cmake/LibFTDI1Config.cmake.in
|
||||
+ ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1Config.cmake
|
||||
+ INSTALL_DESTINATION ${LIBFTDI_CMAKE_CONFIG_DIR}
|
||||
+ PATH_VARS
|
||||
+ LIBFTDI_USE_FILE
|
||||
+ LIBFTDI_ROOT_DIR
|
||||
+ LIBFTDI_INCLUDE_DIR
|
||||
+ LIBFTDI_INCLUDE_DIRS
|
||||
+ LIBFTDI_LIBRARY_DIRS
|
||||
+ NO_CHECK_REQUIRED_COMPONENTS_MACRO
|
||||
+)
|
||||
+write_basic_package_version_file (
|
||||
+ LibFTDI1ConfigVersion.cmake
|
||||
+ VERSION ${LIBFTDI_VERSION_STRING}
|
||||
+ COMPATIBILITY AnyNewerVersion
|
||||
+)
|
||||
|
||||
|
||||
install ( FILES
|
||||
--- a/examples/cmake_example/CMakeLists.txt
|
||||
+++ b/examples/cmake_example/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required ( VERSION 2.8 )
|
||||
+cmake_minimum_required(VERSION 3.15 FATAL_ERROR)
|
||||
|
||||
project ( example C )
|
||||
|
||||
@@ -1,19 +1,18 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
MY_P="${PN}1-${PV}"
|
||||
PYTHON_COMPAT=( python3_{10..12} )
|
||||
inherit cmake python-single-r1
|
||||
|
||||
MY_P="${PN}1-${PV}"
|
||||
if [[ ${PV} == 9999* ]] ; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
|
||||
else
|
||||
SRC_URI="https://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2"
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
|
||||
fi
|
||||
|
||||
@@ -23,8 +22,8 @@ HOMEPAGE="https://www.intra2net.com/en/developer/libftdi/"
|
||||
LICENSE="LGPL-2"
|
||||
SLOT="1"
|
||||
IUSE="cxx doc examples python test tools"
|
||||
RESTRICT="!test? ( test )"
|
||||
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
virtual/libusb:1
|
||||
@@ -45,6 +44,7 @@ PATCHES=(
|
||||
"${FILESDIR}"/${P}-tests-no-cxx.patch
|
||||
"${FILESDIR}"/${P}-cmake-cxx.patch
|
||||
"${FILESDIR}"/${P}-py312.patch
|
||||
"${FILESDIR}"/${P}-cmake4.patch
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
|
||||
Reference in New Issue
Block a user