From patchwork Sun Nov 30 11:44:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 416047 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 0D569140160 for ; Sun, 30 Nov 2014 22:44:29 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 2FB3632E14; Sun, 30 Nov 2014 11:44:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qNjlVN0cMBmx; Sun, 30 Nov 2014 11:44:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 148B3335CB; Sun, 30 Nov 2014 11:44:24 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id DB6391C1117 for ; Sun, 30 Nov 2014 11:44:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D79019175D for ; Sun, 30 Nov 2014 11:44:22 +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 lAnfUuITqXCK for ; Sun, 30 Nov 2014 11:44:21 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by whitealder.osuosl.org (Postfix) with ESMTPS id 7EB5E916C0 for ; Sun, 30 Nov 2014 11:44:21 +0000 (UTC) Received: by mail-wg0-f50.google.com with SMTP id k14so11963504wgh.9 for ; Sun, 30 Nov 2014 03:44:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=1EyfYuEe3VllN/lzWwMIQI0oPO0dDxadV7J9veE6SRU=; b=fmArVJTnplrdApRNpnYYrwaPW1f5HdKiMQ0uE+oNygHgcCn+QoLMBUbY+COvy13kR8 e5MpMd7Dr+0mAHoGkyl940+bqmxtfCxSoxuNo1Mjr1FTYPrNGD4dK3BkSX+BeOavv/W3 psPx6OKmWQB4bQSR2RTnMnVpIBdPNEhOi6zQAaXrmF0s4FkVeQ3Q0uqb/P/HZKQqWmHt XX926kj2Sv8nheUKXIEfdglazpNC3pOWgLd2sBzD96Xo3SSNiL1xdYIyByuD35cySXQ3 4+8IW6oRm0i+D/DzDUWITawEJL8QLH2dMp+vBFB8s0WO8C6A8PXUDS2URmCF5QB4p+Bq bRSQ== X-Received: by 10.181.13.179 with SMTP id ez19mr24816321wid.65.1417347860242; Sun, 30 Nov 2014 03:44:20 -0800 (PST) Received: from gourin.bzh.lan (ks3095497.kimsufi.com. [94.23.60.27]) by mx.google.com with ESMTPSA id wb9sm9586597wic.20.2014.11.30.03.44.18 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 30 Nov 2014 03:44:19 -0800 (PST) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sun, 30 Nov 2014 12:44:14 +0100 Message-Id: <1417347854-27983-1-git-send-email-yann.morin.1998@free.fr> X-Mailer: git-send-email 1.9.1 Cc: "Yann E. MORIN" , Sagaert Johan Subject: [Buildroot] [PATCH] package/libwebsockets: fix static build X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" When the version was bumped, the existing patch to fix static linking was not proprerly tested, and was missing three new locations to be fixed. Signed-off-by: "Yann E. MORIN" Cc: Sagaert Johan Cc: Samuel Martin Cc: Baruch Siach --- Changes v1 -> v2: - remove spurious hunk - fix typoes (Baruch, Samuel) --- ...le-shared-library-build-when-BUILD_SHARED.patch | 32 ++++++++++++++++++++-- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/package/libwebsockets/libwebsockets-0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch b/package/libwebsockets/libwebsockets-0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch index 50e9a4e..95d1ad8 100644 --- a/package/libwebsockets/libwebsockets-0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch +++ b/package/libwebsockets/libwebsockets-0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch @@ -9,6 +9,8 @@ updating libwebsockets. Signed-off-by: Samuel Martin Signed-off-by: Sagaert Johan +[yann.morin.1998@free.fr: further fix after the version bumped] +Signed-off-by: "Yann E. MORIN" --- CMakeLists.txt | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) @@ -76,6 +78,30 @@ index 7978845..89853ce 100644 target_link_libraries(${lib} ${LIB_LIST}) endforeach() --- -2.1.2 - +@@ -793,7 +800,7 @@ + set(LWS_INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files") + + # Export targets (This is used for other CMake projects to easily find the libraries and include files). +-export(TARGETS websockets websockets_shared ++export(TARGETS ${_libs_websockets} + FILE "${PROJECT_BINARY_DIR}/LibwebsocketsTargets.cmake") + export(PACKAGE libwebsockets) + +@@ -829,7 +835,7 @@ + ${PROJECT_BINARY_DIR}/LibwebsocketsConfigVersion.cmake + @ONLY) + +-set_target_properties(websockets websockets_shared ++set_target_properties(${_libs_websockets} + PROPERTIES PUBLIC_HEADER "${HDR_PUBLIC}") + + # +@@ -837,7 +843,7 @@ + # + + # Install libs and headers. +-install(TARGETS websockets websockets_shared ++install(TARGETS ${_libs_websockets} + EXPORT LibwebsocketsTargets + LIBRARY DESTINATION "${LWS_INSTALL_LIB_DIR}${LIB_SUFFIX}" COMPONENT libraries + ARCHIVE DESTINATION "${LWS_INSTALL_LIB_DIR}${LIB_SUFFIX}" COMPONENT libraries