From patchwork Sun Mar 20 11:41:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Ziegler X-Patchwork-Id: 1607419 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KLwp60XkHz9s8s for ; Sun, 20 Mar 2022 22:42:04 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id AD3C2819CC; Sun, 20 Mar 2022 11:42:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zKzkA-FL-0PP; Sun, 20 Mar 2022 11:41:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id ADA188198A; Sun, 20 Mar 2022 11:41:58 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id D4A8F1BF4D7 for ; Sun, 20 Mar 2022 11:41:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id C0CA6408E8 for ; Sun, 20 Mar 2022 11:41:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CSRcZnW0igXm for ; Sun, 20 Mar 2022 11:41:53 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from serv15.avernis.de (serv15.avernis.de [176.9.89.163]) by smtp4.osuosl.org (Postfix) with ESMTPS id EEA74408E2 for ; Sun, 20 Mar 2022 11:41:52 +0000 (UTC) Received: from iago.. (unknown [151.37.69.249]) by serv15.avernis.de (Postfix) with ESMTPSA id DA4E1C701670; Sun, 20 Mar 2022 12:41:48 +0100 (CET) From: Andreas Ziegler To: buildroot@buildroot.org Date: Sun, 20 Mar 2022 12:41:38 +0100 Message-Id: <20220320114138.433796-1-br015@umbiko.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211227074056.13882-1-br015@umbiko.net> References: <20211227074056.13882-1-br015@umbiko.net> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.5 at serv15.avernis.de X-Virus-Status: Clean Subject: [Buildroot] [PATCH v3 1/1] package/zziplib: fix static build failure with mpd X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour , =?utf-8?q?J=C3=B6rg_Krause?= , Andreas Ziegler , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" The current released version of zziplib copies static libraries with appended major version, but omits creating the necessary links to the base file names. This prevents the linker to find the libraries via the search path. The issue (https://github.com/gdraheim/zziplib/issues/117) has been fixed upstream; this patch extracts the necessary part of commit 0e8d35f92efb680c81f6ec1fca9f11d173dce389, to enable creation of symlinks. This resolves the following autobuild issues: http://autobuild.buildroot.net/results/6c56b645a2b723920f07b98474452824fba5e2c1 http://autobuild.buildroot.net/results/032aaff121fb114f388c67dbca3ad2b02f670e38 http://autobuild.buildroot.net/results/ba711034c0abe980f677e26de41739223e2f66e9 Signed-off-by: Andreas Ziegler Signed-off-by: Andreas Ziegler --- Changes v1 -> v2: - extract link creation from commit 0e8d35f Changes v2 -> v3: - update failure list ...-implant-ZZIP_LIBLATEST-for-zzip_lib.patch | 78 +++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch diff --git a/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch b/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch new file mode 100644 index 0000000000..50380861bc --- /dev/null +++ b/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch @@ -0,0 +1,78 @@ +Extract link creation for versioned libraries from commit +0e8d35f92efb680c81f6ec1fca9f11d173dce389. + +Signed-off-by: Andreas Ziegler + +--- +From 0e8d35f92efb680c81f6ec1fca9f11d173dce389 Mon Sep 17 00:00:00 2001 +From: Guido Draheim +Date: Sat, 22 May 2021 15:13:28 +0200 +Subject: [PATCH] #117 implant ZZIP_LIBLATEST for zzip.lib + +--- + zzip/CMakeLists.txt | 57 +++++++++++++++++++++++++++++++++++---------- + 1 file changed, 45 insertions(+), 12 deletions(-) + +diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt +index a966d5f..ccd08b6 100644 +--- a/zzip/CMakeLists.txt ++++ b/zzip/CMakeLists.txt +@@ -28,6 +28,12 @@ option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" OFF) + option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" OFF) + endif() + ++if(ZZIP_LIBTOOL OR ZZIP_PKGCONFIG) ++option(ZZIP_LIBLATEST "Ensure libname.lib links to libname-REL.lib" ON) ++else() ++option(ZZIP_LIBLATEST "Ensure libname.lib links to libname-REL.lib" OFF) ++endif() ++ + # used in zzip/_config.h + set(ZZIP_PACKAGE "${PROJECT_NAME}lib") + set(ZZIP_VERSION "${PROJECT_VERSION}") +@@ -346,6 +340,45 @@ if(ZZIP_LIBTOOL) + endif(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG) + endif(ZZIP_LIBTOOL) + ++if(ZZIP_LIBLATEST) ++ if(BUILD_SHARED_LIBS) ++ set(lib ${CMAKE_SHARED_LIBRARY_PREFIX}) ++ set(dll ${CMAKE_SHARED_LIBRARY_SUFFIX}) ++ else() ++ set(lib ${CMAKE_STATIC_LIBRARY_PREFIX}) ++ set(dll ${CMAKE_STATIC_LIBRARY_SUFFIX}) ++ endif() ++ get_target_property(libname libzzip OUTPUT_NAME) ++ get_target_property(librelease libzzip RELEASE_POSTFIX) ++ add_custom_target(libzzip_latest ALL ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} ++ ) ++ install(FILES ++ ${outdir}/${lib}${libname}${dll} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ if(ZZIPFSEEKO) ++ get_target_property(libname libzzipfseeko OUTPUT_NAME) ++ get_target_property(librelease libzzipfseeko RELEASE_POSTFIX) ++ add_custom_target(libzzipfseeko_latest ALL ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} ++ ) ++ install(FILES ++ ${outdir}/${lib}${libname}${dll} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ endif(ZZIPFSEEKO) ++ if(ZZIPMMAPPED) ++ get_target_property(libname libzzipmmapped OUTPUT_NAME) ++ get_target_property(librelease libzzipmmapped RELEASE_POSTFIX) ++ add_custom_target(libzzipmmaped_latest ALL ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} ++ ) ++ install(FILES ++ ${outdir}/${lib}${libname}${dll} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ endif(ZZIPMMAPPED) ++endif(ZZIP_LIBLATEST) ++ ++ + ## messages ############################################## + + message(STATUS "lib zzipfseeko to be compiled: ${ZZIPFSEEKO}")