From patchwork Wed Jun 29 02:19:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frode Nordahl X-Patchwork-Id: 1649734 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=p8OkATLW; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.133; helo=smtp2.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LXlXK6dgpz9sG2 for ; Wed, 29 Jun 2022 12:19:29 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id A996A40C24; Wed, 29 Jun 2022 02:19:26 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org A996A40C24 Authentication-Results: smtp2.osuosl.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=p8OkATLW X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nzLDp4bagNvQ; Wed, 29 Jun 2022 02:19:25 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp2.osuosl.org (Postfix) with ESMTPS id 83F8E4056A; Wed, 29 Jun 2022 02:19:24 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 83F8E4056A Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 2DB08C0087; Wed, 29 Jun 2022 02:19:22 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 89B14C002D for ; Wed, 29 Jun 2022 02:19:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 56C71414C1 for ; Wed, 29 Jun 2022 02:19:19 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 56C71414C1 Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=p8OkATLW X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Xmh8Up5J-vEw for ; Wed, 29 Jun 2022 02:19:18 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 6745C410D4 Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) by smtp4.osuosl.org (Postfix) with ESMTPS id 6745C410D4 for ; Wed, 29 Jun 2022 02:19:18 +0000 (UTC) Received: from frode-threadripper.. (ti0189a330-0179.bb.online.no [88.91.31.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPSA id 1335F41CFA; Wed, 29 Jun 2022 02:19:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1656469152; bh=ek5kPKpYhfhfyRiO3DwoL8R/A0wOZ4ddActxnrYdd0w=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=p8OkATLWcaBRp2praSLQ8uavPuE9qkE8Tj/hQfe9Z5uuCK9rOeMGZuN4Hm5Q8Zxe+ 1GUSf85wF/dWlSMwEz3qCI3IqQ2nWZh0YJK+D4L/RKYmHLzdN07/Z34TtKhEuuLVG1 XrqaMA4+kO4v6qBYs1l2LSBZQsaPNveYW/ghCs6/Bml/nHeuNdD0fWPsYVRYhUDSqT SHqylVwJt6tMKWF7Fip+nQgy3udFbucTDm1YKGHdXxKCSZuDlD8k+OrobVcCg4P8y4 XO1+vBv4X9PElo8rwSom9yKC9nS+xythO4K9xfbpFX3BHjFqaSV9pQefX3shizVHcW ocx6pLyKkebLA== From: Frode Nordahl To: dev@openvswitch.org Date: Wed, 29 Jun 2022 04:19:02 +0200 Message-Id: <20220629021902.547981-6-frode.nordahl@canonical.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220629021902.547981-1-frode.nordahl@canonical.com> References: <20220629021902.547981-1-frode.nordahl@canonical.com> MIME-Version: 1.0 Cc: Ilya Maximets , Luca Boccassi , Corey Bryant Subject: [ovs-dev] [PATCH 6/6] debian: Fix build of python json C extension. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Signed-off-by: Frode Nordahl --- debian/rules | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/debian/rules b/debian/rules index b9454fa79..62c4fff28 100755 --- a/debian/rules +++ b/debian/rules @@ -95,16 +95,26 @@ override_dh_install: mv $(CURDIR)/debian/openvswitch-switch/usr/sbin/ovs-vswitchd \ $(CURDIR)/debian/openvswitch-switch/usr/lib/openvswitch-switch/ovs-vswitchd set -e && for pyvers in $(PYTHONS); do \ - cd python && python$$pyvers setup.py install --install-layout=deb \ - --root $(CURDIR)/debian/python-openvswitch; cd ..; \ + cd python && \ + enable_shared=no \ + CFLAGS=-I$(CURDIR)/debian/tmp/usr/include \ + LDFLAGS=$(CURDIR)/debian/tmp/usr/lib/libopenvswitch.a \ + python$$pyvers setup.py install --install-layout=deb \ + --root $(CURDIR)/debian/python-openvswitch; \ + cd ..; \ done set -e && for pyvers in $(PYTHON3S); do \ - cd python && python$$pyvers setup.py install --install-layout=deb \ - --root $(CURDIR)/debian/python3-openvswitch; cd ..; \ - mkdir -p $(CURDIR)/debian/openvswitch-test/usr/lib/python$$pyvers/dist-packages/ovstest; \ - install -v -D python/ovstest/*.py \ - $(CURDIR)/debian/openvswitch-test/usr/lib/python$$pyvers/dist-packages/ovstest; \ - done + cd python && \ + enable_shared=no \ + CFLAGS=-I$(CURDIR)/debian/tmp/usr/include \ + LDFLAGS=$(CURDIR)/debian/tmp/usr/lib/libopenvswitch.a \ + python$$pyvers setup.py install --install-layout=deb \ + --root $(CURDIR)/debian/python3-openvswitch; \ + cd ..; \ + mkdir -p $(CURDIR)/debian/openvswitch-test/usr/lib/python$$pyvers/dist-packages/ovstest; \ + install -v -D python/ovstest/*.py \ + $(CURDIR)/debian/openvswitch-test/usr/lib/python$$pyvers/dist-packages/ovstest; \ + done ifneq (,$(filter i386 amd64 ppc64el arm64, $(DEB_HOST_ARCH))) install -v -D _dpdk/vswitchd/ovs-vswitchd \ $(CURDIR)/debian/openvswitch-switch-dpdk/usr/lib/openvswitch-switch-dpdk/ovs-vswitchd-dpdk