From patchwork Sat Jun 2 16:07:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 924526 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="l8vl73CW"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40ymM05NPxz9rxs for ; Sun, 3 Jun 2018 02:07:56 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 20EA1890D7; Sat, 2 Jun 2018 16:07:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BWcjHl5VzJX8; Sat, 2 Jun 2018 16:07:50 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id DA613890BD; Sat, 2 Jun 2018 16:07:50 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 377E81C01D9 for ; Sat, 2 Jun 2018 16:07:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 34B0A8A2A3 for ; Sat, 2 Jun 2018 16:07:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yD22b7-Z74UM for ; Sat, 2 Jun 2018 16:07:48 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f180.google.com (mail-wr0-f180.google.com [209.85.128.180]) by hemlock.osuosl.org (Postfix) with ESMTPS id 8CFA38A29A for ; Sat, 2 Jun 2018 16:07:47 +0000 (UTC) Received: by mail-wr0-f180.google.com with SMTP id l41-v6so39040716wre.7 for ; Sat, 02 Jun 2018 09:07:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=lHHjAcD4Vt1VLnuLmDoL429z9lmau9cE2ZZ//zS0t8c=; b=l8vl73CWWSOPOWIL5es6t9FHYVZQuh2MjPX3t3CvUbLYZz63wTyPMcF9QFjO1SfBPz 8jxI3QEQzmN2Dk4W7S4AogLubPqXlyDUvxe6uAOeb2BbDfz99Jv6epjW0tHlzUE1KoRD pAilLe7R2Sj4Q5rk4/0I4I86eLi7yBTmc4N6uwIgJRlhfRkAllB+xMRlE5CYZBciRrnb T2q4gtScbZOQTNelE1kDRCeoQUAjbamwIfA38rHd6qP+IPgEwykD1LU1lPMw+6uHhOTK 4S2bwROTjf508+vdZ5RlUZt6gfzp12Mz6ETo+DyJj2EdD13s/uJ6hADNJuZLuUsbmOu4 h4wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=lHHjAcD4Vt1VLnuLmDoL429z9lmau9cE2ZZ//zS0t8c=; b=r3/UYmXyScIlrftt5EX0sq5yg1oljiTVU+8Sa5VIJ0DcLQAxsPZ9m2Oz7ghn4AjtIK 9HnB7hSvoJBSFGbl1i4NbJF8f7MbrF7A9Hc4S0dIZuEHucUgOBPWQHm8v+NaVQJ6UBoP b7fRHWTZtydtaHWQ6h/DoOUZFUPbUDr0nUU/ATOqrezsr+NQTbSEKaJphi9yodE30He9 lHnresdzIq//cPAacG4dXsm8mFmpPUAX0j/vGNzq9iYlDrv7LsFUQbiMfdSV/+yvij// 7PNai/68E90eneWGeQ9pHodR2o0SLmaGNVzDJ4py//Qpj2GpIc+XRZYibm6YDnUvg+Mz P2Wg== X-Gm-Message-State: ALKqPwd1bqbUNTSEDzXMaSVkE2hBv08wC3BnH4LY+dnvAkCQIyy6zWPO 7hEfMmxDFdwpFU8FDjotKCB58g== X-Google-Smtp-Source: ADUXVKI5F0c71uUHwCbyck2RDL0It9h7ZLXmTfR5GypYrkkhEL9Hoq1AVoIYeh0wfg/uHPCabt5asg== X-Received: by 2002:adf:8701:: with SMTP id a1-v6mr12397696wra.178.1527955665791; Sat, 02 Jun 2018 09:07:45 -0700 (PDT) Received: from fabrice-VirtualBox.home (ARennes-656-1-383-207.w90-32.abo.wanadoo.fr. [90.32.255.207]) by smtp.gmail.com with ESMTPSA id r11-v6sm900662wrn.34.2018.06.02.09.07.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 02 Jun 2018 09:07:45 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sat, 2 Jun 2018 18:07:37 +0200 Message-Id: <20180602160737.11623-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [Buildroot] [PATCH 1/1] librtlsdr: fix static build X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" When bumping to version 0.5.4, first patch was wrongly removed. Put back an enhanced version of this patch (sent upstream) Fixes: - http://autobuild.buildroot.net/results/bea78bf580be6fe109b827b72af9587c5324daad Signed-off-by: Fabrice Fontaine --- ...01-disable_shared_library_target_in_build.patch | 105 +++++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644 package/librtlsdr/0001-disable_shared_library_target_in_build.patch diff --git a/package/librtlsdr/0001-disable_shared_library_target_in_build.patch b/package/librtlsdr/0001-disable_shared_library_target_in_build.patch new file mode 100644 index 0000000000..b9f53d2393 --- /dev/null +++ b/package/librtlsdr/0001-disable_shared_library_target_in_build.patch @@ -0,0 +1,105 @@ +From d47e3aed12414be59bf77177c93853ec4b24d705 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 2 Jun 2018 16:53:36 +0200 +Subject: [PATCH] disable shared library target in build + +Disable shared library target if BUILD_SHARED_LIBS if OFF. + +Patch retrieved from +https://git.buildroot.net/buildroot/tree/package/librtlsdr/0001-disable_shared_library_target_in_build.patch?h=2018.05 + +Patch has been updated to work with 0.5.4 and to be able to keep current +behavior of building shared and static version of library if +BUILD_SHARED_LIBS and BUILD_STATIC_LIBS are both set. +Moreover, if BUILD_STATIC_LIBS is OFF, only shared version of library +will be install. + +[Upstream status: https://github.com/steve-m/librtlsdr/pull/46] + +Signed-off-by: Yuvaraj Patil +Signed-off-by: Fabrice Fontaine +--- + src/CMakeLists.txt | 24 ++++++++++++++++-------- + 1 file changed, 16 insertions(+), 8 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 07d64ab..2b7cbae 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -47,16 +47,22 @@ ENDIF(MSVC) + ######################################################################## + # Setup shared library variant + ######################################################################## ++option(BUILD_SHARED_LIBS "Build shared library" ON) ++if(BUILD_SHARED_LIBS) + add_library(rtlsdr_shared SHARED ${rtlsdr_srcs}) + target_link_libraries(rtlsdr_shared ${LIBUSB_LIBRARIES}) + set_target_properties(rtlsdr_shared PROPERTIES DEFINE_SYMBOL "rtlsdr_EXPORTS") + set_target_properties(rtlsdr_shared PROPERTIES OUTPUT_NAME rtlsdr) + set_target_properties(rtlsdr_shared PROPERTIES SOVERSION ${MAJOR_VERSION}) + set_target_properties(rtlsdr_shared PROPERTIES VERSION ${LIBVER}) ++list(APPEND rtlsdr_lib rtlsdr_shared) ++endif() + + ######################################################################## + # Setup static library variant + ######################################################################## ++option(BUILD_STATIC_LIBS "Build static library" ON) ++if(BUILD_STATIC_LIBS) + add_library(rtlsdr_static STATIC ${rtlsdr_srcs}) + target_link_libraries(rtlsdr_static ${LIBUSB_LIBRARIES}) + set_property(TARGET rtlsdr_static APPEND PROPERTY COMPILE_DEFINITIONS "rtlsdr_STATIC" ) +@@ -64,6 +70,8 @@ if(NOT WIN32) + # Force same library filename for static and shared variants of the library + set_target_properties(rtlsdr_static PROPERTIES OUTPUT_NAME rtlsdr) + endif() ++list(APPEND rtlsdr_lib rtlsdr_static) ++endif() + + ######################################################################## + # Setup libraries used in executables +@@ -91,33 +99,33 @@ add_executable(rtl_fm rtl_fm.c) + add_executable(rtl_eeprom rtl_eeprom.c) + add_executable(rtl_adsb rtl_adsb.c) + add_executable(rtl_power rtl_power.c) +-set(INSTALL_TARGETS rtlsdr_shared rtlsdr_static rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power) ++set(INSTALL_TARGETS ${rtlsdr_lib} rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power) + +-target_link_libraries(rtl_sdr rtlsdr_shared convenience_static ++target_link_libraries(rtl_sdr ${rtlsdr_lib} convenience_static + ${LIBUSB_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} + ) +-target_link_libraries(rtl_tcp rtlsdr_shared convenience_static ++target_link_libraries(rtl_tcp ${rtlsdr_lib} convenience_static + ${LIBUSB_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} + ) +-target_link_libraries(rtl_test rtlsdr_shared convenience_static ++target_link_libraries(rtl_test ${rtlsdr_lib} convenience_static + ${LIBUSB_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} + ) +-target_link_libraries(rtl_fm rtlsdr_shared convenience_static ++target_link_libraries(rtl_fm ${rtlsdr_lib} convenience_static + ${LIBUSB_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} + ) +-target_link_libraries(rtl_eeprom rtlsdr_shared convenience_static ++target_link_libraries(rtl_eeprom ${rtlsdr_lib} convenience_static + ${LIBUSB_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} + ) +-target_link_libraries(rtl_adsb rtlsdr_shared convenience_static ++target_link_libraries(rtl_adsb ${rtlsdr_lib} convenience_static + ${LIBUSB_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} + ) +-target_link_libraries(rtl_power rtlsdr_shared convenience_static ++target_link_libraries(rtl_power ${rtlsdr_lib} convenience_static + ${LIBUSB_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} + ) +-- +2.14.1 +