Currently build fails with: Hunk #1 FAILED at 204. 1 out of 1 hunk FAILED -- rejects in file CMakeLists.txt Patch 0001-cmake-always-install-SDL2_net.pc.patch does not apply (enforce with -f)
Remove the patch Signed-off-by: Markus Volk <[email protected]> --- ...001-cmake-always-install-SDL2_net.pc.patch | 93 ------------------- .../libsdl/libsdl2-net_2.4.0.bb | 4 +- 2 files changed, 1 insertion(+), 96 deletions(-) delete mode 100644 meta-oe/recipes-graphics/libsdl/libsdl2-net/0001-cmake-always-install-SDL2_net.pc.patch diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-net/0001-cmake-always-install-SDL2_net.pc.patch b/meta-oe/recipes-graphics/libsdl/libsdl2-net/0001-cmake-always-install-SDL2_net.pc.patch deleted file mode 100644 index 0a717a60ae..0000000000 --- a/meta-oe/recipes-graphics/libsdl/libsdl2-net/0001-cmake-always-install-SDL2_net.pc.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 6aceea847131f8ee208d8b8adec336fafcf30d48 Mon Sep 17 00:00:00 2001 -From: Anonymous Maarten <[email protected]> -Date: Wed, 31 Aug 2022 15:15:43 +0200 -Subject: [PATCH] cmake: always install SDL2_net.pc - -Upstream-Status: Backport [https://github.com/libsdl-org/SDL_net/commit/fb8031364ad852d51faf5b64040440857f5e8f26] - -Signed-off-by: Mark Jonas <[email protected]> ---- - CMakeLists.txt | 67 ++++++++++++++++++++++++++++---------------------- - 1 file changed, 37 insertions(+), 30 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bf30a70..c34e3f0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -204,39 +204,46 @@ if(SDL2NET_INSTALL) - COMPONENT devel - ) - -- if(SDL2NET_BUILD_SHARED_LIBS) -- # Only create a .pc file for a shared SDL2_net -- set(prefix "${CMAKE_INSTALL_PREFIX}") -- set(exec_prefix "\${prefix}") -- set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") -- set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") -- set(PACKAGE "${PROJECT_NAME}") -- set(VERSION "${FULL_VERSION}") -- set(SDL_VERSION "${SDL_REQUIRED_VERSION}") -- string(JOIN " " PC_REQUIRES ${PC_REQUIRES}) -- string(JOIN " " PC_LIBS ${PC_LIBS}) -- configure_file("${PROJECT_SOURCE_DIR}/SDL2_net.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/SDL2_net.pc.intermediate" @ONLY) -- file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/SDL2_net-$<CONFIG>.pc" INPUT "${CMAKE_CURRENT_BINARY_DIR}/SDL2_net.pc.intermediate") -- -- set(PC_DESTDIR) -- if(CMAKE_SYSTEM_NAME MATCHES FreeBSD) -- # FreeBSD uses ${PREFIX}/libdata/pkgconfig -- set(PC_DESTDIR "libdata/pkgconfig") -+ if(SDL2NET_BUILD_SHARED_LIBS) -+ set(ENABLE_SHARED_TRUE "") -+ set(ENABLE_SHARED_FALSE "#") -+ set(ENABLE_STATIC_TRUE "#") -+ set(ENABLE_STATIC_FALSE "") - else() -- set(PC_DESTDIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig") -+ set(ENABLE_SHARED_TRUE "#") -+ set(ENABLE_SHARED_FALSE "") -+ set(ENABLE_STATIC_TRUE "") -+ set(ENABLE_STATIC_FALSE "#") - endif() -- # Only install a SDL2_net.pc file in Release mode -- install(CODE " -- if(CMAKE_INSTALL_CONFIG_NAME MATCHES \"Release\") -- # FIXME: use file(COPY_FILE) if minimum CMake version >= 3.21 -- execute_process(COMMAND \"\${CMAKE_COMMAND}\" -E copy_if_different -- \"${CMAKE_CURRENT_BINARY_DIR}/SDL2_net-$<CONFIG>.pc\" -- \"${CMAKE_CURRENT_BINARY_DIR}/SDL2_net.pc\") -- file(INSTALL DESTINATION \"\${CMAKE_INSTALL_PREFIX}/${PC_DESTDIR}\" -- TYPE FILE -- FILES \"${CMAKE_CURRENT_BINARY_DIR}/SDL2_net.pc\") -- endif()" COMPONENT devel) -+ -+ set(prefix "${CMAKE_INSTALL_PREFIX}") -+ set(exec_prefix "\${prefix}") -+ set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") -+ set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") -+ set(PACKAGE "${PROJECT_NAME}") -+ set(VERSION "${FULL_VERSION}") -+ set(SDL_VERSION "${SDL_REQUIRED_VERSION}") -+ string(JOIN " " PC_REQUIRES ${PC_REQUIRES}) -+ string(JOIN " " PC_LIBS ${PC_LIBS}) -+ configure_file("${PROJECT_SOURCE_DIR}/SDL2_net.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/SDL2_net.pc.intermediate" @ONLY) -+ file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/SDL2_net-$<CONFIG>.pc" INPUT "${CMAKE_CURRENT_BINARY_DIR}/SDL2_net.pc.intermediate") -+ -+ set(PC_DESTDIR) -+ if(CMAKE_SYSTEM_NAME MATCHES FreeBSD) -+ # FreeBSD uses ${PREFIX}/libdata/pkgconfig -+ set(PC_DESTDIR "libdata/pkgconfig") -+ else() -+ set(PC_DESTDIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig") - endif() -+ # Always install SDL2_net.pc: libraries might be different between config modes -+ install(CODE " -+ # FIXME: use file(COPY_FILE) if minimum CMake version >= 3.21 -+ execute_process(COMMAND \"\${CMAKE_COMMAND}\" -E copy_if_different -+ \"${CMAKE_CURRENT_BINARY_DIR}/SDL2_net-$<CONFIG>.pc\" -+ \"${CMAKE_CURRENT_BINARY_DIR}/SDL2_net.pc\") -+ file(INSTALL DESTINATION \"\${CMAKE_INSTALL_PREFIX}/${PC_DESTDIR}\" -+ TYPE FILE -+ FILES \"${CMAKE_CURRENT_BINARY_DIR}/SDL2_net.pc\")" COMPONENT devel) - - if(SDL2NET_BUILD_SHARED_LIBS AND (APPLE OR (UNIX AND NOT ANDROID))) - install( diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-net_2.4.0.bb b/meta-oe/recipes-graphics/libsdl/libsdl2-net_2.4.0.bb index dbaf35ff38..abdfd94122 100644 --- a/meta-oe/recipes-graphics/libsdl/libsdl2-net_2.4.0.bb +++ b/meta-oe/recipes-graphics/libsdl/libsdl2-net_2.4.0.bb @@ -4,9 +4,7 @@ LICENSE = "Zlib" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=036a54229112040a743509a86b30c80c" SRC_URI = " \ - https://www.libsdl.org/projects/SDL_net/release/SDL2_net-${PV}.tar.gz \ - file://0001-cmake-always-install-SDL2_net.pc.patch \ -" + https://www.libsdl.org/projects/SDL_net/release/SDL2_net-${PV}.tar.gz"; S = "${UNPACKDIR}/SDL2_net-${PV}" inherit cmake pkgconfig -- 2.54.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#127389): https://lists.openembedded.org/g/openembedded-devel/message/127389 Mute This Topic: https://lists.openembedded.org/mt/119637068/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
