diff options
| author | allgdante <allan.garret@gmail.com> | 2018-07-05 18:26:04 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-07-13 15:53:52 +0000 |
| commit | e85c11c31b26f4038bea2d69494db969d2b54f5f (patch) | |
| tree | 55543f4f579ec21098d3bb1860e8f89ae75954b6 /testing/apparmor/0007-utils-remove-vim-from-the-default-build.patch | |
| parent | 3a33d4256d9ade07a196aac6c6a36c18401b601a (diff) | |
| download | aports-e85c11c31b26f4038bea2d69494db969d2b54f5f.tar.bz2 aports-e85c11c31b26f4038bea2d69494db969d2b54f5f.tar.xz | |
testing/apparmor: upgrade to 2.13
Diffstat (limited to 'testing/apparmor/0007-utils-remove-vim-from-the-default-build.patch')
| -rw-r--r-- | testing/apparmor/0007-utils-remove-vim-from-the-default-build.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/testing/apparmor/0007-utils-remove-vim-from-the-default-build.patch b/testing/apparmor/0007-utils-remove-vim-from-the-default-build.patch new file mode 100644 index 0000000000..14ea3ea499 --- /dev/null +++ b/testing/apparmor/0007-utils-remove-vim-from-the-default-build.patch @@ -0,0 +1,46 @@ +From 09cfa1f321a306429390a8ed2b347d5335f75126 Mon Sep 17 00:00:00 2001 +From: allgdante <allan.garret@gmail.com> +Date: Wed, 4 Jul 2018 17:02:34 +0200 +Subject: [PATCH 07/11] 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.17.1 + |