Drop debian/patches/multiarch.patch and override LIBSEPOLA instead
Laurent Bigonville
6 years ago
2 | 2 |
* New upstream release candidate
|
3 | 3 |
- Bump libsepol1-dev build-dependency to >= 2.7~ to match the release
|
4 | 4 |
- Drop debian/patches/remove-lfl-from-LDLIBS.patch, applied upstream
|
|
5 |
- Drop debian/patches/multiarch.patch and override LIBSEPOLA instead
|
5 | 6 |
* debian/watch: Add support for rc releases and use macros
|
6 | 7 |
* debian/control: Bump Standards-Version to 4.0.0 (no further changes)
|
7 | 8 |
|
8 | |
-- Laurent Bigonville <bigon@debian.org> Wed, 21 Jun 2017 15:30:09 +0200
|
|
9 |
-- Laurent Bigonville <bigon@debian.org> Wed, 21 Jun 2017 15:36:59 +0200
|
9 | 10 |
|
10 | 11 |
checkpolicy (2.6-2) unstable; urgency=medium
|
11 | 12 |
|
debian/patches/multiarch.patch
less
more
0 | |
--- a/Makefile
|
1 | |
+++ b/Makefile
|
2 | |
@@ -4,7 +4,7 @@
|
3 | |
PREFIX ?= $(DESTDIR)/usr
|
4 | |
BINDIR ?= $(PREFIX)/bin
|
5 | |
MANDIR ?= $(PREFIX)/share/man
|
6 | |
-LIBDIR ?= $(PREFIX)/lib
|
7 | |
+LIBDIR ?= $(PREFIX)/lib/$(DEB_HOST_MULTIARCH)
|
8 | |
INCLUDEDIR ?= $(PREFIX)/include
|
9 | |
LIBSEPOLA ?= $(LIBDIR)/libsepol.a
|
10 | |
TARGETS = checkpolicy checkmodule
|
11 | |
--- a/test/Makefile
|
12 | |
+++ b/test/Makefile
|
13 | |
@@ -3,7 +3,7 @@
|
14 | |
#
|
15 | |
PREFIX ?= $(DESTDIR)/usr
|
16 | |
BINDIR=$(PREFIX)/bin
|
17 | |
-LIBDIR ?= $(PREFIX)/lib
|
18 | |
+LIBDIR ?= $(PREFIX)/lib/$(DEB_HOST_MULTIARCH)
|
19 | |
INCLUDEDIR ?= $(PREFIX)/include
|
20 | |
LIBSEPOLA ?= $(LIBDIR)/libsepol.a
|
21 | |
|
7 | 7 |
# missing (hardening) flags.
|
8 | 8 |
export DEB_CFLAGS_MAINT_APPEND = $(shell dpkg-buildflags --get CPPFLAGS)
|
9 | 9 |
|
|
10 |
export LIBSEPOLA = /usr/lib/$(DEB_HOST_MULTIARCH)/libsepol.a
|
|
11 |
|
10 | 12 |
BUILT_USING=$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W "libsepol1-dev")
|
11 | 13 |
|
12 | 14 |
%:
|