From patchwork Tue Apr 2 17:18:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1074736 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="hlFGPkrw"; 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 44YbXy3ry7z9sV3 for ; Wed, 3 Apr 2019 04:19:14 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A17A7880C8; Tue, 2 Apr 2019 17:19:10 +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 W74KTeP1r+jw; Tue, 2 Apr 2019 17:19:06 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id C99DF880A6; Tue, 2 Apr 2019 17:19:06 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 241D41BF38D for ; Tue, 2 Apr 2019 17:19:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id DCC3184808 for ; Tue, 2 Apr 2019 17:18:52 +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 JHZVCNOxqr_R for ; Tue, 2 Apr 2019 17:18:50 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by fraxinus.osuosl.org (Postfix) with ESMTPS id BA9A784806 for ; Tue, 2 Apr 2019 17:18:49 +0000 (UTC) Received: by mail-wm1-f53.google.com with SMTP id q16so4263420wmj.3 for ; Tue, 02 Apr 2019 10:18:49 -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=jaKaEvdB6l3eIJKHbHG4TcT0t4viqfyRkDraRnC+1uE=; b=hlFGPkrwX/JnyPn2gXxXiDlSBoWZJN9bn8Prqn8Bz32etLlFZ6Bo7jcdpdkYuGMiMF FlW4wpglpEXUbp6EsNnNC1yNTAp3+lojIKgJOJXUrCH39dFh+lH2eLYmCDERJKyBkyw7 xgag4nZTbEpVn5+HyzfxUpV3snvhD2omzDE4KjrMtXuEsNf2wlpHNrwxcYls4TjhiQTF 6x0YhKHwfy6ejAfMtvMTHMOhpGXFP6Bfg5dq4oXz/4JANzI9GXgZATfq9g+BSGOc7VDz di70F82FzjLzmWpKWHIEynbxiyV+G7Q+Zfjbg2A9SO5bNpTsyxJwGNkpu+EXpcifit2O hRhw== 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=jaKaEvdB6l3eIJKHbHG4TcT0t4viqfyRkDraRnC+1uE=; b=Mk73fCffcpUfU5tGtLhkqL95am62L11S0xAaPrw/nWLO6yD+hllVZ+tLQ5YyudYb9A x1QKEy3knRHRL8nVugtpQmxJxlJynaX/t7a5TfXm6a2nV/D8ElmABsuMQtc0Pp8Cz2ra xE8yYqLsMBotAkNrMqlLTnPioK36kxDijYFbwod3RM0mkUHtzEXpq3U+TNyztbmshBv+ ENTHf0PIS/cTgks32sdvtazN9cSYyzgNYom/KzYFZ1MZhrbW9sI3oZ5zt826to5XPNm2 t+hD8XEzvWFgxKs1ElziROjithdwoRsTUPeL+BwQ05TJyFmz8Wzb5VQhsd8KI+X5Dghe lxvw== X-Gm-Message-State: APjAAAXUWRBnaZa8khj9lfyc0ggZwbzkcT/giC4Bij2/QW0YQH0a+MZ7 wJkkIW+Z6Iw+/6HKCB4Fjpqv6LVT X-Google-Smtp-Source: APXvYqxDucjZODtYtufqHTucki4UvczJt658a15osjPAkF/uTedtnnwJBJzUYKeGcTD3xIrJ6Pa4xQ== X-Received: by 2002:a05:600c:24f:: with SMTP id 15mr4604394wmj.48.1554225527939; Tue, 02 Apr 2019 10:18:47 -0700 (PDT) Received: from localhost.localdomain ([92.184.117.191]) by smtp.gmail.com with ESMTPSA id b9sm20859929wmc.9.2019.04.02.10.18.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Apr 2019 10:18:46 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Tue, 2 Apr 2019 19:18:35 +0200 Message-Id: <20190402171835.26696-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [Buildroot] [PATCH 1/1] package/quota: fix build on m68k 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: Jarkko Sakkinen , Fabrice Fontaine MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" PIE breaks the build on m68k, so add an upstream patch to disable PIE. Obviously, when we start seriously testing the BR2_RELRO_FULL option, we will realize that it is broken on some architectures, and will probably disable it on m68k. Fixes: - http://autobuild.buildroot.org/results/25985bbc160e3d62b23c4c613b2a81f3711621e3 Signed-off-by: Fabrice Fontaine --- .../0001-configure.ac-add-disable-pie-option.patch | 55 ++++++++++++++++++++++ package/quota/quota.mk | 1 + 2 files changed, 56 insertions(+) create mode 100644 package/quota/0001-configure.ac-add-disable-pie-option.patch diff --git a/package/quota/0001-configure.ac-add-disable-pie-option.patch b/package/quota/0001-configure.ac-add-disable-pie-option.patch new file mode 100644 index 0000000000..c3b57fea66 --- /dev/null +++ b/package/quota/0001-configure.ac-add-disable-pie-option.patch @@ -0,0 +1,55 @@ +From cb20e19028a8996de9305502ba5e5da3bd1181bf Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 2 Apr 2019 09:19:36 +0200 +Subject: [PATCH] configure.ac: add --disable-pie option + +PIE is not necessarily supported on all architectures, so add an option +to allow the user to disable the PIE. + +This fixes the build on the m68k architecture: + - http://autobuild.buildroot.org/results/25985bbc160e3d62b23c4c613b2a81f3711621e3 + +Signed-off-by: Fabrice Fontaine +[Upstream status: merged] +--- + Makefile.am | 2 +- + configure.ac | 12 ++++++++++++ + 2 files changed, 13 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 638198d..332bd67 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,5 +1,5 @@ + ACLOCAL_AMFLAGS = -I m4 +-AM_LDFLAGS = -pie ++AM_LDFLAGS = @PIE_LDFLAGS@ + + doc_DATA = \ + README.mailserver \ +diff --git a/configure.ac b/configure.ac +index 095ff86..5af4235 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -55,6 +55,18 @@ AS_IF([test "x${prefix}" = "xNONE"], [ + AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/share/locale", [Locale-specific data directory]) + ]) + ++# ================ ++# Check for ldflags ++# ================ ++AC_ARG_ENABLE([pie], ++ [AS_HELP_STRING([--disable-pie], [Disable Position Independent Executable])], ++ [enable_pie="$enableval"], ++ [enable_pie=yes] ++) ++AS_IF([test x"$enable_pie" != "xno"], [ ++ PIE_LDFLAGS="-pie" ++]) ++AC_SUBST([PIE_LDFLAGS]) + + # ================ + # Check for cflags +-- +2.14.1 + diff --git a/package/quota/quota.mk b/package/quota/quota.mk index 5f1e427d0b..8c7563d289 100644 --- a/package/quota/quota.mk +++ b/package/quota/quota.mk @@ -10,6 +10,7 @@ QUOTA_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-nfs-utils QUOTA_LICENSE = GPL-2.0+ QUOTA_LICENSE_FILES = COPYING QUOTA_LIBS = $(TARGET_NLS_LIBS) +QUOTA_CONF_OPTS = --disable-pie ifeq ($(BR2_PACKAGE_DBUS)$(BR2_PACKAGE_LIBNL),yy) QUOTA_DEPENDENCIES += host-pkgconf dbus libnl