NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/apparmor: fix compilation with libintl

Browse Source 
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 <angelo@amarulasolutions.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Angelo Compagnucci 2020-04-25 16:03:56 +02:00 committed by Thomas Petazzoni
parent 5c0c4861be
commit 4f064ef8ef
2 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
package/apparmor/0001-parser-binutils-fix-compilation-with-libintl.patch Normal file
View File

@ -0,0 +1,48 @@
From c9fe40d9386a5e4cf99f44df9b98382d83f1c4f4 Mon Sep 17 00:00:00 2001
From: Angelo Compagnucci <angelo@amarulasolutions.com>
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 <angelo@amarulasolutions.com>
---
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

5
package/apparmor/apparmor.mk
View File

@ -17,6 +17,11 @@ APPARMOR_DEPENDENCIES = libapparmor
APPARMOR_TOOLS = parser APPARMOR_TOOLS = parser
APPARMOR_MAKE_OPTS = USE_SYSTEM=1 DISTRO=unknown APPARMOR_MAKE_OPTS = USE_SYSTEM=1 DISTRO=unknown
ifeq ($(BR2_PACKAGE_GETTEXT_PROVIDES_LIBINTL),y)
APPARMOR_DEPENDENCIES += gettext
APPARMOR_MAKE_OPTS += WITH_LIBINTL=1
endif
ifeq ($(BR2_PACKAGE_APPARMOR_BINUTILS),y) ifeq ($(BR2_PACKAGE_APPARMOR_BINUTILS),y)
APPARMOR_TOOLS += binutils APPARMOR_TOOLS += binutils
endif endif