aboutsummaryrefslogtreecommitdiffstats
path: root/testing/apparmor/0002-utils-remove-vim-from-the-default-build.patch
diff options
context:
space:
mode:
authorallgdante <allan.garret@gmail.com>2019-01-31 14:57:00 +0000
committerAndy Postnikov <apostnikov@gmail.com>2019-01-31 18:58:36 +0200
commitdb71657811113505e8ebd6cada74c97313eb4200 (patch)
tree6636d3796f599ca0a0f010e403dd1ca819bfa006 /testing/apparmor/0002-utils-remove-vim-from-the-default-build.patch
parent7bbc0dad2f8260a50fa078b831a3b1a46024aaac (diff)
downloadaports-db71657811113505e8ebd6cada74c97313eb4200.tar.gz
aports-db71657811113505e8ebd6cada74c97313eb4200.tar.bz2
aports-db71657811113505e8ebd6cada74c97313eb4200.tar.xz
testing/apparmor: upgrade to 2.13.2
Diffstat (limited to 'testing/apparmor/0002-utils-remove-vim-from-the-default-build.patch')
-rw-r--r--testing/apparmor/0002-utils-remove-vim-from-the-default-build.patch46
1 files changed, 46 insertions, 0 deletions
diff --git a/testing/apparmor/0002-utils-remove-vim-from-the-default-build.patch b/testing/apparmor/0002-utils-remove-vim-from-the-default-build.patch
new file mode 100644
index 0000000000..f3fa0bbc61
--- /dev/null
+++ b/testing/apparmor/0002-utils-remove-vim-from-the-default-build.patch
@@ -0,0 +1,46 @@
+From 24aca47716b70c1d0e3b58a1fbd8e312fec70e07 Mon Sep 17 00:00:00 2001
+From: allgdante <allan.garret@gmail.com>
+Date: Wed, 4 Jul 2018 17:02:34 +0200
+Subject: [PATCH 2/7] utils: remove vim from the default build
+
+We will build the vim utils as a separate target
+---
+ utils/Makefile | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/utils/Makefile b/utils/Makefile
+index 68f8c376..01604796 100644
+--- a/utils/Makefile
++++ b/utils/Makefile
+@@ -32,7 +32,6 @@ MANPAGES = ${TOOLS:=.8} logprof.conf.5
+
+ all: docs
+ $(MAKE) -C po all
+- $(MAKE) -C vim all
+
+ .PHONY: docs
+ docs: ${MANPAGES} ${HTMLMANPAGES}
+@@ -58,7 +57,6 @@ install: ${MANPAGES} ${HTMLMANPAGES}
+ install -m 755 $(filter-out aa-easyprof, ${TOOLS}) ${BINDIR}
+ $(MAKE) -C po install DESTDIR=${DESTDIR} NAME=${NAME}
+ $(MAKE) install_manpages DESTDIR=${DESTDIR}
+- $(MAKE) -C vim install DESTDIR=${DESTDIR}
+ ln -sf aa-status.8 ${DESTDIR}/${MANDIR}/man8/apparmor_status.8
+ ${PYTHON} ${PYSETUP} install --prefix=${PYPREFIX} --root=${DESTDIR} --version=${VERSION}
+
+@@ -69,7 +67,6 @@ endif
+ clean: pod_clean
+ rm -f core core.* *.o *.s *.a *~
+ $(MAKE) -C po clean
+- $(MAKE) -C vim clean
+ $(MAKE) -C test clean
+ rm -rf staging/ build/
+ rm -f apparmor/*.pyc apparmor/rule/*.pyc
+@@ -100,4 +97,3 @@ check: check_severity_db check_pod_files
+ $(PYFLAKES) $$i || exit 1; \
+ done
+ $(MAKE) -C test check
+- $(MAKE) -C vim check
+--
+2.20.1
+