diff options
author | allgdante <allan.garret@gmail.com> | 2019-01-31 14:57:00 +0000 |
---|---|---|
committer | Andy Postnikov <apostnikov@gmail.com> | 2019-01-31 18:58:36 +0200 |
commit | db71657811113505e8ebd6cada74c97313eb4200 (patch) | |
tree | 6636d3796f599ca0a0f010e403dd1ca819bfa006 /testing/apparmor/0001-Fix-linking-against-gettext-on-musl-libc.patch | |
parent | 7bbc0dad2f8260a50fa078b831a3b1a46024aaac (diff) |
testing/apparmor: upgrade to 2.13.2
Diffstat (limited to 'testing/apparmor/0001-Fix-linking-against-gettext-on-musl-libc.patch')
-rw-r--r-- | testing/apparmor/0001-Fix-linking-against-gettext-on-musl-libc.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/testing/apparmor/0001-Fix-linking-against-gettext-on-musl-libc.patch b/testing/apparmor/0001-Fix-linking-against-gettext-on-musl-libc.patch new file mode 100644 index 00000000000..4180cf65817 --- /dev/null +++ b/testing/apparmor/0001-Fix-linking-against-gettext-on-musl-libc.patch @@ -0,0 +1,40 @@ +From 183849ec988c7326bcb9bf729d087e262d121b67 Mon Sep 17 00:00:00 2001 +From: allgdante <allan.garret@gmail.com> +Date: Wed, 4 Jul 2018 16:57:19 +0200 +Subject: [PATCH 1/7] 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 5d799f6a..000540a3 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.20.1 + |