From patchwork Sat Apr 25 14:03:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1276834 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.a=rsa-sha256 header.s=20161025 header.b=brd4XFyP; 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 498XpR3zS6z9sSG for ; Sun, 26 Apr 2020 00:04:13 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 61FF987CB8; Sat, 25 Apr 2020 14:04:08 +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 BoSZW8Ne9AYA; Sat, 25 Apr 2020 14:04:06 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id C40C987D73; Sat, 25 Apr 2020 14:04:06 +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 4E4891BF30E for ; Sat, 25 Apr 2020 14:04:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4AB5C86833 for ; Sat, 25 Apr 2020 14:04:05 +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 GGIPROcsD5qt for ; Sat, 25 Apr 2020 14:04:03 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by whitealder.osuosl.org (Postfix) with ESMTPS id 0007F84F6F for ; Sat, 25 Apr 2020 14:04:02 +0000 (UTC) Received: by mail-wr1-f42.google.com with SMTP id x17so14175883wrt.5 for ; Sat, 25 Apr 2020 07:04:02 -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=3RXfyaWaVk9ss7Hw0p+mLrh2hH0oXgNpU76Mb5sQATk=; b=brd4XFyPc3cYS5+Tgq9LeJXe8gbPwoOkApL3h+ha4XvzNO9IkklvPo+FSr9lRBkqOa 3GivPxyXH3ndhzE4Bb7rf61lvYMC9AqatNyETHB/3edItfl0g1Or+hmbWJfX7tB3Yy+M 2Qq3WdyaUICnV0LM8h6Cq5oL8WJ3w4SGZIutvX3bDkryRC8kAroeELwiU7z/bfsY0Swj tsb8XgLl3+4aLantJQCkU01RKqmkPpbH73cp7PsWUJiqLGEq0fIIY63uxegFUqU8F5PV DaTFtbtUaJPdSq5p+e7U+Opllj028wFLDJzri4iNafxq8wi4TZRGdb07l1dqPMWN4mEf s0dg== 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=3RXfyaWaVk9ss7Hw0p+mLrh2hH0oXgNpU76Mb5sQATk=; b=NCb9h7qjsaLQpUGddwWK6cdkFuDoIx6fwS8AiKFb8I4HQYXxmvJrqCkJRaD1uxQNVC tPy/qHPKlRHFyUCzR+aOaWmFDfxPmssn5T+srFvbI0EtMQ9O4gjvR6Vzsa1wRZam2k01 UHa2e0NJhueMh9rXXinUWBal6GxCxMk2qzhZKEPD87OTdg1/78LIi7HaEQJThPw3geaH ToLi3yQ8KrR9q9JOvaVMndy5XmSUbkm2zRjrk5A4g32mh2WT1WKmIKx6MFHEhbo1WOoC AaZz+idLJDnyroRtEEapW2bPrcT6ngsxIaXmTzWKfcMrQdrctPvPCZQlYQ9fKimBXhu+ FJfw== X-Gm-Message-State: AGi0PuaDprQxerb+IS67U+/LRwd8kAK57JZeUHUDHmU2GdPMzgQZ2tUD X7C7y9ZdrUas3W8+aqjjWCImj/fRyU4= X-Google-Smtp-Source: APiQypJq2+FJiW3FDSesBMsePiwjfVNoxZxSNs8xLswOZGVVUc8sx05sFrepinvV+jm4q665IuG+JQ== X-Received: by 2002:adf:f1c5:: with SMTP id z5mr17195173wro.100.1587823441217; Sat, 25 Apr 2020 07:04:01 -0700 (PDT) Received: from localhost.localdomain (host185036129193.static.fidoka.tech. [185.36.129.193]) by smtp.gmail.com with ESMTPSA id h1sm7792838wme.42.2020.04.25.07.04.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Apr 2020 07:04:00 -0700 (PDT) From: Angelo Compagnucci X-Google-Original-From: Angelo Compagnucci To: buildroot@buildroot.org Date: Sat, 25 Apr 2020 16:03:56 +0200 Message-Id: <20200425140356.6448-1-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.17.1 Subject: [Buildroot] [PATCH v2] package/apparmor: fix compilation with libintl 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: Angelo Compagnucci MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" When libintl is enabled, Apparmor should link againts libintl. The patch is already sent upstream. Fixes: http://autobuild.buildroot.net/results/8bf/8bf5ce74721f828b01fd708443d020cdf8dc7d3a Signed-off-by: Angelo Compagnucci --- Changelo: v1->v2: * Adding autobuild ref (Thomas P.) ...inutils-fix-compilation-with-libintl.patch | 48 +++++++++++++++++++ package/apparmor/apparmor.mk | 4 ++ 2 files changed, 52 insertions(+) create mode 100644 package/apparmor/0001-parser-binutils-fix-compilation-with-libintl.patch diff --git a/package/apparmor/0001-parser-binutils-fix-compilation-with-libintl.patch b/package/apparmor/0001-parser-binutils-fix-compilation-with-libintl.patch new file mode 100644 index 0000000000..d3f4a51646 --- /dev/null +++ b/package/apparmor/0001-parser-binutils-fix-compilation-with-libintl.patch @@ -0,0 +1,48 @@ +From c9fe40d9386a5e4cf99f44df9b98382d83f1c4f4 Mon Sep 17 00:00:00 2001 +From: Angelo Compagnucci +Date: Fri, 24 Apr 2020 17:34:24 +0200 +Subject: [PATCH] parser: binutils: fix compilation with libintl + +When libintl is available on the system, we need to link against the +libintl library too. + +Signed-off-by: Angelo Compagnucci +--- + binutils/Makefile | 4 ++++ + parser/Makefile | 5 +++++ + 2 files changed, 9 insertions(+) + +diff --git a/binutils/Makefile b/binutils/Makefile +index 11459bec..d8c1b634 100644 +--- a/binutils/Makefile ++++ b/binutils/Makefile +@@ -56,6 +56,10 @@ SBINTOOLS = aa-status + + AALIB = -Wl,-Bstatic -lapparmor -Wl,-Bdynamic -lpthread + ++ifdef WITH_LIBINTL ++ AALIB += -lintl ++endif ++ + ifdef USE_SYSTEM + # Using the system libapparmor so Makefile dependencies can't be used + LIBAPPARMOR_A = +diff --git a/parser/Makefile b/parser/Makefile +index eab64be9..998230ee 100644 +--- a/parser/Makefile ++++ b/parser/Makefile +@@ -91,6 +91,11 @@ AAREOBJECTS = $(AAREOBJECT) + AARE_LDFLAGS = -static-libgcc -static-libstdc++ -L. $(LDFLAGS) + AALIB = -Wl,-Bstatic -lapparmor -Wl,-Bdynamic -lpthread + ++ifdef WITH_LIBINTL ++ AALIB += -lintl ++endif ++ ++ + ifdef USE_SYSTEM + # Using the system libapparmor so Makefile dependencies can't be used + LIBAPPARMOR_A = +-- +2.25.1 + diff --git a/package/apparmor/apparmor.mk b/package/apparmor/apparmor.mk index 097c9cfba7..5c67e15106 100644 --- a/package/apparmor/apparmor.mk +++ b/package/apparmor/apparmor.mk @@ -17,6 +17,10 @@ APPARMOR_DEPENDENCIES = libapparmor APPARMOR_TOOLS = parser APPARMOR_MAKE_OPTS = USE_SYSTEM=1 DISTRO=unknown +ifeq ($(BR2_PACKAGE_GETTEXT_PROVIDES_LIBINTL),y) +APPARMOR_MAKE_OPTS += WITH_LIBINTL=1 +endif + ifeq ($(BR2_PACKAGE_APPARMOR_BINUTILS),y) APPARMOR_TOOLS += binutils endif