From patchwork Thu Oct 11 21:27:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 982743 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="Dzd/tenw"; 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 42WPF86sV0z9s1x for ; Fri, 12 Oct 2018 08:27:24 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 03FCF88552; Thu, 11 Oct 2018 21:27:23 +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 Bt+byo81T6Sj; Thu, 11 Oct 2018 21:27:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 82FD18858D; Thu, 11 Oct 2018 21:27:22 +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 C653E1C158B for ; Thu, 11 Oct 2018 21:27:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id C432C8858D for ; Thu, 11 Oct 2018 21:27:21 +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 MwcBFmMYbLIo for ; Thu, 11 Oct 2018 21:27:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by hemlock.osuosl.org (Postfix) with ESMTPS id 785EC88552 for ; Thu, 11 Oct 2018 21:27:20 +0000 (UTC) Received: by mail-wr1-f44.google.com with SMTP id a13-v6so11242091wrt.5 for ; Thu, 11 Oct 2018 14:27:20 -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=U/ggLTa6LYaGEeyY98TOEB/G+FqhoUbPzCLfZ1iWWKE=; b=Dzd/tenwmtZNHO32tMTfp4Y+B1JhbkuUEws1+IIW4YTM7bCdVQShbYd8DEL0jcAWqr uQCacJr9MvoG2oVqRCDMkcv5zWjNb3qiSzxD9339YEZg41sAxgUAvSAiRam0ABYsUyjQ oDtIfHSdkYnbzoUMaU/u7czhfwm8KN/OYT0rNko3tJM1fZXof75EcSyLD4C/0WEKd8IM CbNjYKjyPKG1fXClG0AzykizpIg+Y+v0VhWK5cBphdnilum5Ni0Pp+N2IlEfSLOo4gRP whbBsDZ/W0isDK7h8y7tkAeTpOGcTCzl7G0ZpyGdCkFZYDF0e3Ac+NLRKknA2RxtCjuC DiUw== 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=U/ggLTa6LYaGEeyY98TOEB/G+FqhoUbPzCLfZ1iWWKE=; b=VbkRQvMrQbzamlxWqNkNGUAl37syiNEWUYHKvIHq2mxz1TDLKY8Tiw31JlvIWSEuEH JQO69k1H/OgKqONyv+Zk10SFIUjWFRobAyUaCQCHA3b5impRVaOMeF+GOiPk9b9Ywc2q j61Ngx6CZXAT03hpnh8YmeKxaNt8MHh8euumH3NRcishuHWIhfi4W764rNCUkY513e7j 8wxfGNekmtbEqT2IgvdcYESkoZdLK6CtIl+Lekh3Xh+yEkl0bO2q38cLOOWrRRjyssQc 4AdgmwIdWtSnyJs34oCWvRB++XA1JdzvaAQXNPmlZJUbcfGfM1aEaZ/0nGepV4ALAh/k 5DXg== X-Gm-Message-State: ABuFfojG3bt79PjiUzcnUcELN+lxS045uyR+CzKX41X9Q7yDDMirozj7 AeVIcTSuLSw7Hbqti9QiqdAv5HNn X-Google-Smtp-Source: ACcGV60eVQyettVWqJpdcPPhkxUZT+qVK/IzxnHB8vxBhTI70DTLfPwOgFkMfOXMTLzwuBoRhtcR0A== X-Received: by 2002:adf:f50b:: with SMTP id q11-v6mr3057700wro.246.1539293238273; Thu, 11 Oct 2018 14:27:18 -0700 (PDT) Received: from localhost.localdomain (ARennes-656-1-30-142.w86-214.abo.wanadoo.fr. [86.214.94.142]) by smtp.gmail.com with ESMTPSA id a11-v6sm6949371wrp.3.2018.10.11.14.27.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Oct 2018 14:27:17 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Thu, 11 Oct 2018 23:27:11 +0200 Message-Id: <20181011212711.22694-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [Buildroot] [PATCH 1/1] xerces: fix static linking with curl 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: Fabrice Fontaine MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" When curl is statically built with openssl support, xerces needs to link with openssl libraries so use pkg_check_modules to get any needed dependencies Fixes: - http://autobuild.buildroot.org/results/29ca90fff2c8e38f2edf7240eca3aa3fe7397c45 Signed-off-by: Fabrice Fontaine --- .../0002-fix-static-linking-with-curl.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 package/xerces/0002-fix-static-linking-with-curl.patch diff --git a/package/xerces/0002-fix-static-linking-with-curl.patch b/package/xerces/0002-fix-static-linking-with-curl.patch new file mode 100644 index 0000000000..db38de79fc --- /dev/null +++ b/package/xerces/0002-fix-static-linking-with-curl.patch @@ -0,0 +1,39 @@ +From 26e3f1440bbc75c704fc93ff43a2abbfbe4c0203 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 11 Oct 2018 22:56:50 +0200 +Subject: [PATCH] fix static linking with curl + +When curl is statically built with openssl support, xerces needs to +link with openssl libraries so use pkg_check_modules to get any +needed dependencies + +Fixes: + - http://autobuild.buildroot.org/results/29ca90fff2c8e38f2edf7240eca3aa3fe7397c45 + +Signed-off-by: Fabrice Fontaine +--- + cmake/XercesNetAccessorSelection.cmake | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/cmake/XercesNetAccessorSelection.cmake b/cmake/XercesNetAccessorSelection.cmake +index 7a63f1f6b..e90fcf034 100644 +--- a/cmake/XercesNetAccessorSelection.cmake ++++ b/cmake/XercesNetAccessorSelection.cmake +@@ -31,7 +31,13 @@ if(network) + + # Requires select() which is UNIX only + if(UNIX) +- find_package(CURL) ++ find_package(PkgConfig) ++ if (PkgConfig_FOUND) ++ pkg_check_modules(CURL libcurl) ++ if (NOT CURL_FOUND) ++ find_package(CURL) ++ endif() ++ endif() + if(CURL_FOUND) + list(APPEND netaccessors curl) + endif() +-- +2.17.1 +