From patchwork Sun Oct 20 20:31:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hilliard X-Patchwork-Id: 1180071 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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="VoPYeSZf"; 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 46xBJ42Cj7z9sP6 for ; Mon, 21 Oct 2019 07:31:31 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id B43C3878A8; Sun, 20 Oct 2019 20:31:28 +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 uMyil2MMuiya; Sun, 20 Oct 2019 20:31:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 160708797A; Sun, 20 Oct 2019 20:31:28 +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 3BE841BF42E for ; Sun, 20 Oct 2019 20:31:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 379A38797A for ; Sun, 20 Oct 2019 20:31:26 +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 BVM-nT6Gb-yo for ; Sun, 20 Oct 2019 20:31:25 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io1-f66.google.com (mail-io1-f66.google.com [209.85.166.66]) by hemlock.osuosl.org (Postfix) with ESMTPS id 93E38878A8 for ; Sun, 20 Oct 2019 20:31:25 +0000 (UTC) Received: by mail-io1-f66.google.com with SMTP id r144so1597578iod.8 for ; Sun, 20 Oct 2019 13:31:25 -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=VQwqtoUst4SOSASrtDOHCuntQlMEsQRiTJx3PyHwJns=; b=VoPYeSZfxoAuzhk9ZEnxbI6OC5L/9n3nznBAob5taM35Zy9gHPbMrtJiZ8rD8F/V2p Nc1rPqIxAyH6V7UCHPtas0dLzGtlALwyc83dCJRsgbC9Qg5NRf1TouPtHQc6kxZeVBsX QL649UjW7trBEbtDj3Y/9j45Mqa8J9dGlX28+HmfAFrTV9QDkrcVXpQV9nByRIaOFBQp koGbM6k30CHrh1rilt+C1P5P5bG0G3oSEUpwadR7fDwBXYFuvaQs4y3FmsBTJrpeKGhw yGevWQ89G/TCB4i6BgL6ArWyisBlg7gb6nd5mkjf0HthiM4Z8oopD2TSOhZ7/jTUD29x 9cVQ== 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=VQwqtoUst4SOSASrtDOHCuntQlMEsQRiTJx3PyHwJns=; b=iv+wfN4q+Wi6XNE+Lu6pLwboy480GaRXUk9IFsuJZ/MRdfpnD0Vm6U5Ra4VgHWmt3g 1LALrILRjsQA4Q7cYgRJW2XNrd36BzVh0KR6+J/AgPTOBo2Lct/oxWw40oCFbdStXPvQ jM6j2GZbc2w7ijbsaTfkCQNId6665eaQaEQnQrHJmHbYLJLieQtJmLwi+VYacbjZspRB APTH26xfDPN654dVWnaFasJZc0Knr+M6iqi06Tjoo8IZUPjVLpy6omphseQsSjARKUhm Bx6HdtpU5UR+mm8ibtjvPu3nvTnvTivg5IHcwdKAyhJZ6MGcYkvbMeLt7bxGRni+4My9 mfyg== X-Gm-Message-State: APjAAAWbQLRFI84DAqbQJB8lTDIqveEgMWOzuAPL/n5Kh+KAIUD+09Tu +itDcdvdrTzpTbKJ6k+zTBJN5HwDovk= X-Google-Smtp-Source: APXvYqwXNgwh6R/Xoo51bPMXIhd+qF2jATgNl7PGCwr3emPXwfKKboQREMw+zcFvpQShdU2J9A0LDg== X-Received: by 2002:a6b:7a04:: with SMTP id h4mr4077120iom.210.1571603484330; Sun, 20 Oct 2019 13:31:24 -0700 (PDT) Received: from james-x399.localdomain (71-218-230-115.hlrn.qwest.net. [71.218.230.115]) by smtp.gmail.com with ESMTPSA id x12sm3960817ior.9.2019.10.20.13.31.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Oct 2019 13:31:23 -0700 (PDT) From: James Hilliard To: buildroot@buildroot.org Date: Sun, 20 Oct 2019 14:31:19 -0600 Message-Id: <20191020203119.99538-1-james.hilliard1@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/libselinux: fix build with python 3.8 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: James Hilliard , Marcus Folkesson , Adam Duskett Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes: - http://autobuild.buildroot.net/results/839e81c5b968c47842b4d0c25b902397af8ea5a5 Details: - https://bugs.python.org/issue36721 - https://github.com/python/cpython/commit/7efc526e5cfb929a79c192ac2dcf7eb78d3a4401 Signed-off-by: James Hilliard --- package/libselinux/libselinux.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk index c707c8a25e..75f01a84b7 100644 --- a/package/libselinux/libselinux.mk +++ b/package/libselinux/libselinux.mk @@ -33,7 +33,7 @@ endif ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) ifeq ($(BR2_PACKAGE_PYTHON3),y) LIBSELINUX_DEPENDENCIES += python3 host-swig -LIBSELINUX_PYINC = -I$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR)m +LIBSELINUX_PYINC = -I$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) LIBSELINUX_PYLIBVER = python$(PYTHON3_VERSION_MAJOR) else ifeq ($(BR2_PACKAGE_PYTHON),y) LIBSELINUX_DEPENDENCIES += python host-swig @@ -47,6 +47,11 @@ LIBSELINUX_MAKE_OPTS += \ PYSITEDIR=$(TARGET_DIR)/usr/lib/$(LIBSELINUX_PYLIBVER)/site-packages \ SWIG_LIB="$(HOST_DIR)/share/swig/$(SWIG_VERSION)/" +ifeq ($(BR2_PACKAGE_PYTHON3),y) +LIBSELINUX_MAKE_OPTS += \ + PYLIBS="`$(STAGING_DIR)/usr/bin/python3-config --libs --embed`" +endif + LIBSELINUX_MAKE_INSTALL_TARGETS += install-pywrap # dependencies are broken and result in file truncation errors at link @@ -84,7 +89,7 @@ HOST_LIBSELINUX_DEPENDENCIES = \ ifeq ($(BR2_PACKAGE_PYTHON3),y) HOST_LIBSELINUX_DEPENDENCIES += host-python3 -HOST_LIBSELINUX_PYINC = -I$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR)m/ +HOST_LIBSELINUX_PYINC = -I$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR)/ HOST_LIBSELINUX_PYLIBVER = python$(PYTHON3_VERSION_MAJOR) else HOST_LIBSELINUX_DEPENDENCIES += host-python