From patchwork Sat Apr 6 18:42:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 161908 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp1896490jan; Sat, 6 Apr 2019 11:42:41 -0700 (PDT) X-Google-Smtp-Source: APXvYqwiZdDQSvHbaDxFY769r46YTZ5sr9OZk8vpQyWtEKfT9clpCFT3juLHIme6y2jRQHecOkGp X-Received: by 2002:a17:902:778a:: with SMTP id o10mr8841598pll.135.1554576160987; Sat, 06 Apr 2019 11:42:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554576160; cv=none; d=google.com; s=arc-20160816; b=GbqyEPi200eHKWh2wHj+FsMaot6E+khaddL7QQceETkWNESnhnYUFyVpP0hm5LhZs0 wBSFvs+Ngn8IQRyqFk3Fp4rhWgctBTZ0xOeEP17eGiE5CUtooDlC8EG+BXal2irx+dHv yUtsuUXNJvnS+ghe4Ot6lQh1ftIiDWXX0WUT9q4AnhDkFj+kPYQ0Fm+o+3dKXINjakHe d+mk8Dmuiair+l/tOzLlSb+uQlEk79OZDqZPUAzR81qeCoQoP1749DkqRAURYxcJLU7u hqwGj9UYHpKR3kQrSldCxYBvSIcQNEysPIii2aOf64uYnaUNvhxpYxE8u6CA7p0XL/j7 3CCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:delivered-to; bh=KBND9PfL4elU5ilwEMZk3adeNLKoQsVCRPlt1SpGn7I=; b=FXvXyZetozG+m59LKOFFnRPglZP3UtwsyawgZ2ctTTG2dsqo9GxIOxsZQbMZjZR/7i ZLVn/5ux/QMZqyyfiEO/PhSH4uM2s0KJ29N5D8PLzDV90MKc5ObXEtYYPt4gowceYB9L M/HGgDJegOBcWIhj0ONPdfYOyY57umwU/3CHA6ExdI4tNRRNRdCgUnK8kb3DmMiXnou6 a9PDt0R2Fa8V48Cr5VLLSIppcHB4foS7bvBVPHewtmETq3FiAv30CQilwgBSB+am3gGx +TUz3/gyI+/OotsRhzudw7rJ91lcsJqxu3hnZmccJbleTaQpMRnPrJniuy2TCbKU9RzX fIVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=S9q4AzYj; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id x4si21632767plr.406.2019.04.06.11.42.39; Sat, 06 Apr 2019 11:42:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=S9q4AzYj; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 6D28D7D5F7; Sat, 6 Apr 2019 18:42:33 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by mail.openembedded.org (Postfix) with ESMTP id CD4397D5C0 for ; Sat, 6 Apr 2019 18:42:31 +0000 (UTC) Received: by mail-pl1-f194.google.com with SMTP id b3so4832811plr.7 for ; Sat, 06 Apr 2019 11:42:33 -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:mime-version :content-transfer-encoding; bh=vIF77ifR2FVfqMNW1ZAUK0TaD2dEu/G50O2mxzmMEi0=; b=S9q4AzYjkiNEHesXDMeuMYS2jhRgdaR4uKvM1Ec+QSsbHIZDQpsrGsFJgRHVGdr3dL Hpcv++51o4RFrNBv9dXCB3yCSAtQumx/XMA08kpSZS2qOfr7KhWBMs4OWB6yYtKpnV9b cxyMy08nxOcFIubAX9tEEPbjkkseiSp0Gi1YT8KfcYAGaJRfNSJ9WbtFXGlv8nKzmmLn 04RZ70UTzSbVhbFHcTucnjaPW1F1ETHCPmYIGqfGkv2AA5KA02q5fnQaNrMjsfJA39YC JYj5Hj6TLyGo21dCBxuaqotkMrs42SGVB2PDys//MaiPfNbj3kp6NZWmzVwS32RhD2R5 rE9Q== 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:mime-version :content-transfer-encoding; bh=vIF77ifR2FVfqMNW1ZAUK0TaD2dEu/G50O2mxzmMEi0=; b=P/yFoeTZ2IJmXM3J4C34qjsrkw+uaj9ReBp5OAAAitJb5cqT//H/6xsdA8TBua2Jwr vya4jaLPMXYYcEG13FRzPSHe4uhfpoLU9WfDUqjRW5pBmohznfPFO++Cxd+lbJNn0oBL D9tKthl92qYKgLiesF7nX2Vi5xUsxnQG2xpkGnfZTPVWebezQYq5KUl6cEpvcLt+6x26 PQMvKT4ZSzI4uFY/V+GplABeyHu1dZYpByxexYLIB9o973ken54/ySEHomufDh6cbgtx txSdaQYeuVKPJGP57PL7WCsooa598V2hhCfXg1ax57j5NcgIfkFSEd0e2gcDbnTihmKe Ey8A== X-Gm-Message-State: APjAAAX+nKy7Kpq8OzhBEZr2lXfaDkHf1lzMgCYsiX79KCRPpDlzl9wu UDsuAvc+JTpSgOhffOSZZiBGb1bqtsc= X-Received: by 2002:a17:902:6b03:: with SMTP id o3mr20555202plk.226.1554576152031; Sat, 06 Apr 2019 11:42:32 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:8500:6bc6::8ec8]) by smtp.gmail.com with ESMTPSA id w18sm40572132pfg.75.2019.04.06.11.42.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 06 Apr 2019 11:42:31 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sat, 6 Apr 2019 11:42:23 -0700 Message-Id: <20190406184223.28699-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [oe] [meta-networking][PATCH] networkmanager: Fix build with clang X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Detecting libdl for dlopen when failed returns "none required", which then gets added to linker commandline and inturn fails to link with errors obviously because "-lnone required" is no such library. This patch is not musl dependent, earlier patches clubbed it into musl patch however this is needed with clang too regardless of the C library the reason is clang automatically brings in libdl in OE and hence this test is failing. This is noop with gcc since the first check will pass thats why it works in first place Signed-off-by: Khem Raj Cc: Andreas Müller --- .../networkmanager/0003-dlopen-failure.patch | 34 +++++++++++++++++++ .../musl/0001-Fix-build-with-musl.patch | 13 ------- .../networkmanager/networkmanager_1.16.0.bb | 1 + 3 files changed, 35 insertions(+), 13 deletions(-) create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-dlopen-failure.patch diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-dlopen-failure.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-dlopen-failure.patch new file mode 100644 index 0000000000..e99c22710c --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-dlopen-failure.patch @@ -0,0 +1,34 @@ +From 57239fda56b68a8f3e413f7b6af5290ba0d86636 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Thu, 22 Mar 2018 18:18:06 +0100 +Subject: [PATCH] musl: dlopen is included so LD_LIBS="" instead of + LD_LIBS="none required" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Stolen from [1] and prettyfied slightly + +[1] https://github.com/voidlinux/void-packages/tree/master/srcpkgs/NetworkManager/patches + +Signed-off-by: Andreas Müller +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index 487a266..96ae4f7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -235,6 +235,7 @@ dnl + dnl Checks for libdl - on certain platforms its part of libc + dnl + AC_SEARCH_LIBS([dlopen], [dl dld], [], [ac_cv_search_dlopen=]) ++AS_IF([test "$ac_cv_search_dlopen" = "none required"],[ac_cv_search_dlopen=""]) + AC_SUBST([DL_LIBS], "$ac_cv_search_dlopen") + + PKG_CHECK_MODULES(GLIB, [gio-unix-2.0 >= 2.37.6 gmodule-2.0], +-- +2.14.3 diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl.patch index 21e9a16d6d..b3f93ff92b 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl.patch +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl.patch @@ -11,7 +11,6 @@ Upstream-Status: Pending Signed-off-by: Andreas Müller --- clients/cli/connections.c | 1 - - configure.ac | 1 + libnm-core/nm-utils.c | 2 +- shared/n-acd/src/n-acd.c | 1 - shared/systemd/src/basic/in-addr-util.c | 1 + @@ -43,18 +42,6 @@ index 6db44f8..36e51cc 100644 #include #include #include -diff --git a/configure.ac b/configure.ac -index 872c292..b1d7a68 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -241,6 +241,7 @@ dnl - dnl Checks for libdl - on certain platforms its part of libc - dnl - AC_SEARCH_LIBS([dlopen], [dl dld], [], [ac_cv_search_dlopen=]) -+AS_IF([test "$ac_cv_search_dlopen" = "none required"],[ac_cv_search_dlopen=""]) - AC_SUBST([DL_LIBS], "$ac_cv_search_dlopen") - - PKG_CHECK_MODULES(GLIB, [gio-unix-2.0 >= 2.37.6 gmodule-2.0], diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c index d276cfe..2aec785 100644 --- a/libnm-core/nm-utils.c diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.16.0.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.16.0.bb index 90792ff4ee..9f57908e96 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.16.0.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.16.0.bb @@ -26,6 +26,7 @@ SRC_URI = " \ ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ file://0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \ file://0002-Do-not-create-settings-settings-property-documentati.patch \ + file://0003-dlopen-failure.patch \ " SRC_URI_append_libc-musl = " file://musl/0001-Fix-build-with-musl.patch"