diff options
-rw-r--r-- | debian/patches/0002-introduce-debian-standard-build-flags.patch | 34 | ||||
-rw-r--r-- | debian/patches/series | 1 |
2 files changed, 35 insertions, 0 deletions
diff --git a/debian/patches/0002-introduce-debian-standard-build-flags.patch b/debian/patches/0002-introduce-debian-standard-build-flags.patch new file mode 100644 index 0000000..e4b7c6d --- /dev/null +++ b/debian/patches/0002-introduce-debian-standard-build-flags.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From: YAEGASHI Takeshi <yaegashi@debian.org> | ||
2 | Date: Mon, 17 Feb 2014 06:51:44 +0900 | ||
3 | Subject: introduce debian standard build flags | ||
4 | |||
5 | See https://wiki.debian.org/Hardening | ||
6 | --- | ||
7 | Makefile | 7 ++++++- | ||
8 | 1 file changed, 6 insertions(+), 1 deletion(-) | ||
9 | |||
10 | diff --git a/Makefile b/Makefile | ||
11 | index 1dac1ef..7e1381c 100644 | ||
12 | --- a/Makefile | ||
13 | +++ b/Makefile | ||
14 | @@ -37,6 +37,10 @@ DOC_PDF = $(patsubst %.txt,%.pdf,$(MAN_TXT)) | ||
15 | # | ||
16 | -include cgit.conf | ||
17 | |||
18 | +# Import Debian standard build flags. | ||
19 | +DPKG_EXPORT_BUILDFLAGS = 1 | ||
20 | +include /usr/share/dpkg/buildflags.mk | ||
21 | + | ||
22 | export CGIT_VERSION CGIT_SCRIPT_NAME CGIT_SCRIPT_PATH CGIT_DATA_PATH CGIT_CONFIG CACHE_ROOT | ||
23 | |||
24 | # | ||
25 | @@ -65,7 +69,8 @@ endif | ||
26 | all:: cgit | ||
27 | |||
28 | cgit: | ||
29 | - $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) -f ../cgit.mk ../cgit $(EXTRA_GIT_TARGETS) NO_CURL=1 | ||
30 | + $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) -f ../cgit.mk ../cgit $(EXTRA_GIT_TARGETS) NO_CURL=1 \ | ||
31 | + CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" | ||
32 | |||
33 | test: | ||
34 | @$(MAKE) --no-print-directory cgit EXTRA_GIT_TARGETS=all | ||
diff --git a/debian/patches/series b/debian/patches/series index 0f6683d..dd1ea6a 100644 --- a/debian/patches/series +++ b/debian/patches/series | |||
@@ -1 +1,2 @@ | |||
1 | 0001-make-a2x-skip-xmllint.patch | 1 | 0001-make-a2x-skip-xmllint.patch |
2 | 0002-introduce-debian-standard-build-flags.patch | ||