From e85c11c31b26f4038bea2d69494db969d2b54f5f Mon Sep 17 00:00:00 2001 From: allgdante Date: Thu, 5 Jul 2018 18:26:04 +0200 Subject: testing/apparmor: upgrade to 2.13 --- ...-Fix-linking-against-gettext-on-musl-libc.patch | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 testing/apparmor/0006-Fix-linking-against-gettext-on-musl-libc.patch (limited to 'testing/apparmor/0006-Fix-linking-against-gettext-on-musl-libc.patch') diff --git a/testing/apparmor/0006-Fix-linking-against-gettext-on-musl-libc.patch b/testing/apparmor/0006-Fix-linking-against-gettext-on-musl-libc.patch new file mode 100644 index 0000000000..3f14d92815 --- /dev/null +++ b/testing/apparmor/0006-Fix-linking-against-gettext-on-musl-libc.patch @@ -0,0 +1,40 @@ +From 3a8b6738b80faa9049cdda00de86eac33aa677b8 Mon Sep 17 00:00:00 2001 +From: allgdante +Date: Wed, 4 Jul 2018 16:57:19 +0200 +Subject: [PATCH 06/11] Fix linking against gettext on musl libc + +Both parser and binutils must be linked against gettext +--- + binutils/Makefile | 2 +- + parser/Makefile | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/binutils/Makefile b/binutils/Makefile +index 7fb71813..52e55f70 100644 +--- a/binutils/Makefile ++++ b/binutils/Makefile +@@ -52,7 +52,7 @@ SRCS = aa_enabled.c + HDRS = + TOOLS = aa-enabled aa-exec + +-AALIB = -Wl,-Bstatic -lapparmor -Wl,-Bdynamic -lpthread ++AALIB = -Wl,-Bstatic -lapparmor -Wl,-Bdynamic -lpthread -lintl + + ifdef USE_SYSTEM + # Using the system libapparmor so Makefile dependencies can't be used +diff --git a/parser/Makefile b/parser/Makefile +index b18cfe41..193a30f7 100644 +--- a/parser/Makefile ++++ b/parser/Makefile +@@ -90,7 +90,7 @@ AAREDIR= libapparmor_re + AAREOBJECT = ${AAREDIR}/libapparmor_re.a + AAREOBJECTS = $(AAREOBJECT) + AARE_LDFLAGS = -static-libgcc -static-libstdc++ -L. $(LDFLAGS) +-AALIB = -Wl,-Bstatic -lapparmor -Wl,-Bdynamic -lpthread ++AALIB = -Wl,-Bstatic -lapparmor -Wl,-Bdynamic -lpthread -lintl + + ifdef USE_SYSTEM + # Using the system libapparmor so Makefile dependencies can't be used +-- +2.17.1 + -- cgit v1.2.3