From patchwork Sat Nov 29 14:49:31 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: 415996 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 EBFFF1401AD for ; Sun, 30 Nov 2014 01:49:50 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 00CDB2FDBE; Sat, 29 Nov 2014 14:49:47 +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 eW49NcNIUemo; Sat, 29 Nov 2014 14:49:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 0CA792FB6B; Sat, 29 Nov 2014 14:49:45 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 9FF281C24B7 for ; Sat, 29 Nov 2014 14:49:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 9C60B95D1D for ; Sat, 29 Nov 2014 14:49:43 +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 KpcDq250vwzx for ; Sat, 29 Nov 2014 14:49:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f182.google.com (mail-wi0-f182.google.com [209.85.212.182]) by hemlock.osuosl.org (Postfix) with ESMTPS id 8950D95D1C for ; Sat, 29 Nov 2014 14:49:42 +0000 (UTC) Received: by mail-wi0-f182.google.com with SMTP id h11so13439289wiw.9 for ; Sat, 29 Nov 2014 06:49:41 -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=ZiC47arsOi/FGdr7FbwPtholMzYUcY24CkzOZemmpeo=; b=cqqA3Zk1wD7+9bXTzDngeZV5OSB2SPQRjm0wN/fFMv0R0pjyZPlHzrrOnIuDpvYFdn ZBSOYO+pbUokB1b3PAScWkhtwlKmkrHc1pwSozDXMsPEB87ZY0zvvs9WyVKH8/fdRkjH DTL7kg68rfN8BA5CNINdGhKr1uu0w8xzlWmvxfE+dhFsEYXr8ZFsn9CRYGhFhPrwIvcs CSOOmHEqRMLQElN5FailUV4xgsqdawREsdbTs/zwwEENc3DBS5VVQKDW4Q1TNA6UC4oK M8c2vRjHcw2p7F73H8i4sQUVhprot+zl8IKjAxiqREcCPeyVtbGc1oo322FYgmZLZWoY srlA== X-Received: by 10.194.109.6 with SMTP id ho6mr1559379wjb.93.1417272581127; Sat, 29 Nov 2014 06:49:41 -0800 (PST) Received: from gourin.bzh.lan (ks3095497.kimsufi.com. [94.23.60.27]) by mx.google.com with ESMTPSA id gs9sm19297564wjc.47.2014.11.29.06.49.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 29 Nov 2014 06:49:40 -0800 (PST) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 29 Nov 2014 15:49:31 +0100 Message-Id: <1417272571-11129-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: fiux 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 missign three new locations to be fixed. Signed-off-by: "Yann E. MORIN" Cc: Sagaert Johan Cc: Samuel Martin --- ...le-shared-library-build-when-BUILD_SHARED.patch | 34 ++++++++++++++++++++-- 1 file changed, 31 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..f341047 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,32 @@ index 7978845..89853ce 100644 target_link_libraries(${lib} ${LIB_LIST}) endforeach() --- -2.1.2 - +@@ -800,9 +800,8 @@ + 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) + + # Generate the config file for the build-tree. + set(LWS__INCLUDE_DIRS +@@ -836,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}") + + # +@@ -844,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