From patchwork Wed May 29 17:29:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1107272 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.133; helo=hemlock.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="fVX69CYS"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45Dd4x4Tl1z9s4V for ; Thu, 30 May 2019 03:29:53 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 7129D87079; Wed, 29 May 2019 17:29:51 +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 1XPwiz4kE8RE; Wed, 29 May 2019 17:29:51 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id DD32087C89; Wed, 29 May 2019 17:29:50 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 515121BF2A0 for ; Wed, 29 May 2019 17:29:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4E2CB86267 for ; Wed, 29 May 2019 17:29:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id v5qZnvWajwnw for ; Wed, 29 May 2019 17:29:48 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 6DBF386265 for ; Wed, 29 May 2019 17:29:48 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id f204so2237944wme.0 for ; Wed, 29 May 2019 10:29:48 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=MVfoWLV0PXnsrtGMmCw1jFTknIBrslAGfJdj4Cqfl+A=; b=fVX69CYSRnCGDRvU0yNf2HAfnOJEmvVsWcz/zqmjjzi7rso55mK7C+KWSYg8ZFMumk f9o2VXVNYktXIPJLU+DyYknqcnnwfC9B5knDk8C1GKT0fyL5j7IIZHLXEVNbVv+yl5t8 3FgsYUrRaMk65/eQidbkQvLRllQz8txRywJhU1ZcBoIbBC2VUtSckG5+EXYTJWZogmXP V6q3S83jl3OtcWGI7YURaGdhXegTYtUTgcnZRPxmnji87Pn/+b35NJ9QxZ1MgJcYAtpg hnnJYPJ4zVrBfnLX8f1Wkuyxbh3UBAxd8a/kI8r/MIWOuCDfppveVXaebwomgVbipRs9 YtmQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=MVfoWLV0PXnsrtGMmCw1jFTknIBrslAGfJdj4Cqfl+A=; b=aQ1BRnCfRyuSJlO+LYN6UeW+zjlGGuCE/1pAAJGN+pynjLHWgvWbg3VJMHNFGljJ4a fSiz9KYXmARRhR2YvCCohsUZMMc9cCtWdyDB+bkNCx782qDxhAdAKK/2GS09M44zyzbS k/XerOo0BPL4asfv2mSbGKP8Y681Ztv5+O0MUwBFyvQTmzSIJN/bcPbt14qkGfjEbvOG fwOczkJDPSeA3PiTBzoR6lZGF5ALSFwzugUK6p3Z/VddllWIkzJrMFotPy+OkaNAgTx2 l4CBYbW2ax98nPBpYZ6x4aFzCsgxZtwWnOUbe7KtLXZ31XIXwJuTOcIvdDZtOzrU5TJW dvXQ== X-Gm-Message-State: APjAAAWMhsehu/vrB+frd5Mw/XUsnwFPFxB8oRBNYmv1bNjH2fydoFFJ Cn1H+/vZd53/5IQBg7VDa1CRsZmfD3s= X-Google-Smtp-Source: APXvYqyWpXLTKMUe/UeqdffaIHe/dDQbvD51B9OzPSDV0ai9WmN2u4iNlOr9brxJcvVb0WYiEN+1ew== X-Received: by 2002:a7b:c549:: with SMTP id j9mr7791782wmk.114.1559150986522; Wed, 29 May 2019 10:29:46 -0700 (PDT) Received: from kali.home (lfbn-ren-1-314-196.w2-10.abo.wanadoo.fr. [2.10.15.196]) by smtp.gmail.com with ESMTPSA id n10sm252914wrr.11.2019.05.29.10.29.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 May 2019 10:29:45 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Wed, 29 May 2019 19:29:32 +0200 Message-Id: <20190529172932.3753-2-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190529172932.3753-1-fontaine.fabrice@gmail.com> References: <20190529172932.3753-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] package/wireshark: fix static build with snappy X-BeenThere: buildroot@busybox.net 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: "Yann E . MORIN" , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes: - http://autobuild.buildroot.org/results/419468f0d7d3c2b64d420513aa9505c6de097ed2 Signed-off-by: Fabrice Fontaine Reviewed-by: Giulio Benetti --- .../0005-FindSNAPPY-fix-static-build.patch | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 package/wireshark/0005-FindSNAPPY-fix-static-build.patch diff --git a/package/wireshark/0005-FindSNAPPY-fix-static-build.patch b/package/wireshark/0005-FindSNAPPY-fix-static-build.patch new file mode 100644 index 0000000000..ba528cf01a --- /dev/null +++ b/package/wireshark/0005-FindSNAPPY-fix-static-build.patch @@ -0,0 +1,46 @@ +From 4abe51deee1ed3daffa9042ab41ed0622856c69c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 28 May 2019 21:18:09 +0200 +Subject: [PATCH] FindSNAPPY: fix static build + +On UNIX, when statically built, snappy can depends on stdc++. This +dependency can be retrieved through pkg-config, see: +https://github.com/google/snappy/pull/51 + +Fixes: + - http://autobuild.buildroot.org/results/faa65da84ace974426e220205f4665fc0a73bdfe + +Signed-off-by: Fabrice Fontaine +--- + cmake/modules/FindSNAPPY.cmake | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/cmake/modules/FindSNAPPY.cmake b/cmake/modules/FindSNAPPY.cmake +index 7964c9d145..93fdb2bc33 100644 +--- a/cmake/modules/FindSNAPPY.cmake ++++ b/cmake/modules/FindSNAPPY.cmake +@@ -13,7 +13,7 @@ FindWSWinLibs( "snappy-.*" "SNAPPY_HINTS" ) + + if( NOT WIN32) + find_package(PkgConfig) +- pkg_search_module(SNAPPY libsnappy) ++ pkg_search_module(SNAPPY libsnappy snappy) + endif() + + find_path(SNAPPY_INCLUDE_DIR +@@ -36,7 +36,11 @@ find_package_handle_standard_args( SNAPPY DEFAULT_MSG SNAPPY_LIBRARY SNAPPY_INCL + + if( SNAPPY_FOUND ) + set( SNAPPY_INCLUDE_DIRS ${SNAPPY_INCLUDE_DIR} ) +- set( SNAPPY_LIBRARIES ${SNAPPY_LIBRARY} ) ++ # If pkg-config is available on the system and snappy .pc files are installed, ++ # SNAPPY_LIBRARIES will already contain transitive dependencies such as ++ # -lstdc++ for static linking ++ list( APPEND SNAPPY_LIBRARIES ${SNAPPY_LIBRARY} ) ++ + if (WIN32) + set ( SNAPPY_DLL_DIR "${SNAPPY_HINTS}/bin" + CACHE PATH "Path to Snappy DLL" +-- +2.20.1 +