From patchwork Thu Jul 12 05:55:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcus Folkesson X-Patchwork-Id: 942812 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.137; helo=fraxinus.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="Eo1Wyy62"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41R4sf66dBz9s01 for ; Thu, 12 Jul 2018 15:55:17 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4E844872C7; Thu, 12 Jul 2018 05:55:15 +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 tUp3JYOvrjDn; Thu, 12 Jul 2018 05:55:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id B16A587281; Thu, 12 Jul 2018 05:55:14 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 4A3A11C0E93 for ; Thu, 12 Jul 2018 05:55:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2E5AE87F49 for ; Thu, 12 Jul 2018 05:55:13 +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 CLhONIW2ngQo for ; Thu, 12 Jul 2018 05:55:11 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf0-f66.google.com (mail-lf0-f66.google.com [209.85.215.66]) by whitealder.osuosl.org (Postfix) with ESMTPS id 2C16187F34 for ; Thu, 12 Jul 2018 05:55:11 +0000 (UTC) Received: by mail-lf0-f66.google.com with SMTP id m13-v6so23193201lfb.12 for ; Wed, 11 Jul 2018 22:55:11 -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=PLZTOQoko2MyrhffP1kf3fZ8lKvKAtE9pAB3xBBGpkU=; b=Eo1Wyy62kh77gcZ4oeA26HqH7cZ8clAtv673etMUE8PPTcYFkpieMMyRB9XC2f5Y4y C36xI+j56veAeGML9oiWx/gDwwCZWO5vcFnf/kVAu1o8WREWYAbLU+9E8QrP0DZyBFjF 28WE+pIiZSjbPz2uLflSfa8LeqiEKX4vfut9KC+fdcRN1kqbL/bwRr3iTxViX+iCg5yj Jou7g1WVq3xK9WdTgMJ8C8UnJyE5EsnoG17gMsL+uiTVo0vi9aUkDjX3tPv3vbX5PYol cE4Y0ek4dAevaD+ZfQoCHKVx2ooxOc/x0kSg0wzs01AR9L/aW8DhVn6w/mQSE2wVUA8a RwUQ== 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=PLZTOQoko2MyrhffP1kf3fZ8lKvKAtE9pAB3xBBGpkU=; b=qU0jpwy0JzrW+WrFCJXp22IAgM6Yfl3zwAsLmASGXsBSl8mabSue4UQrkRptr/cuiH MbQj4nS7Vhgxjqvouvl38cebCCy0avFGtUJQHv8mNSkPbcz710LnM4eniWpIRCh+qVBa 5IFxjzk1wydgrpaAchhRPlOW4dVuBq4emXwTK+Jh2hp9Q9YxtSSZycMKa0R5bJljwDPj Wh38LKXXxVfmo1bKB8kc9Gzv0QZiKw7nncmnjG5qgj3hFtLhlHMnOIdDhjteWzmyLmP7 oXWm6DxrdptV1yoHZDBcv+7PBbedaGsMRpo7/oAJkNXg0ufuSdiY0gC7kgOc42+DCQkN shgw== X-Gm-Message-State: AOUpUlGYMfeq+LujW9YREsp6BOeZlFOLp77Jk2j6U54yzk4jMPGOMRs8 HoPZLPwzZmkhvYuusKERNpCECw== X-Google-Smtp-Source: AAOMgpemYW2p4iFMPx4vHHuTkKct+eIjreFgxgBRKASmrZftugRoCl4vnJUmpiJOkGMGaXXTilPEhQ== X-Received: by 2002:a19:5418:: with SMTP id i24-v6mr562891lfb.34.1531374909026; Wed, 11 Jul 2018 22:55:09 -0700 (PDT) Received: from localhost.localdomain ([46.194.214.154]) by smtp.gmail.com with ESMTPSA id k65-v6sm1864962lje.3.2018.07.11.22.55.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Jul 2018 22:55:08 -0700 (PDT) From: Marcus Folkesson To: buildroot@buildroot.org Date: Thu, 12 Jul 2018 07:55:15 +0200 Message-Id: <20180712055515.20222-1-marcus.folkesson@gmail.com> X-Mailer: git-send-email 2.18.0 Subject: [Buildroot] [PATCH] libostree: add upstream patch to fix linking errors X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marcus Folkesson MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Support for Avahi in libostree depends on some support functions from libsoup. Use its own support functions in case of libsoup is not provided. Fixes: http://autobuild.buildroot.net/results/5e5441822e2a94f8de51bfa0470aced84720ce31 Signed-off-by: Marcus Folkesson --- ...-soup-to-build-process-when-configur.patch | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 package/libostree/0002-build-add-ostree-soup-to-build-process-when-configur.patch diff --git a/package/libostree/0002-build-add-ostree-soup-to-build-process-when-configur.patch b/package/libostree/0002-build-add-ostree-soup-to-build-process-when-configur.patch new file mode 100644 index 0000000000..b89bd743a1 --- /dev/null +++ b/package/libostree/0002-build-add-ostree-soup-to-build-process-when-configur.patch @@ -0,0 +1,45 @@ +From 1cd86d4978ad32405b41f864e11ac21a2474c2f3 Mon Sep 17 00:00:00 2001 +From: Marcus Folkesson +Date: Tue, 3 Jul 2018 10:02:46 +0200 +Subject: [PATCH] build: add ostree-soup-* to build process when configured + with avahi + +Avoid getting these link errors: + ./.libs/libostree-1.so: undefined reference to `soup_uri_set_path' + ./.libs/libostree-1.so: undefined reference to `soup_uri_new' + ./.libs/libostree-1.so: undefined reference to `soup_uri_free' + ./.libs/libostree-1.so: undefined reference to `soup_uri_set_scheme' + ./.libs/libostree-1.so: undefined reference to `soup_uri_to_string' + ./.libs/libostree-1.so: undefined reference to `soup_uri_set_host' + ./.libs/libostree-1.so: undefined reference to `soup_uri_set_port' + collect2: error: ld returned 1 exit status + +Reproduce with: + ./configure --with-avahi --without-soup + +Signed-off-by: Marcus Folkesson +--- + Makefile-libostree.am | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/Makefile-libostree.am b/Makefile-libostree.am +index 01a209d1..dbc9ebb8 100644 +--- a/Makefile-libostree.am ++++ b/Makefile-libostree.am +@@ -238,6 +238,13 @@ if USE_LIBSOUP + libostree_1_la_SOURCES += src/libostree/ostree-fetcher-soup.c + libostree_1_la_CFLAGS += $(OT_INTERNAL_SOUP_CFLAGS) + libostree_1_la_LIBADD += $(OT_INTERNAL_SOUP_LIBS) ++else ++if USE_AVAHI ++libostree_1_la_SOURCES += src/libostree/ostree-soup-uri.h \ ++ src/libostree/ostree-soup-uri.c \ ++ src/libostree/ostree-soup-form.c \ ++ $(NULL) ++endif + endif + endif + +-- +2.18.0 +