projects
/
debian
/
gzip
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
636f0d3
)
use more pre-baked dpkg Makefile snippets in rules file
author
Bdale Garbee
<bdale@gag.com>
Tue, 25 Feb 2020 23:31:28 +0000
(16:31 -0700)
committer
Bdale Garbee
<bdale@gag.com>
Tue, 25 Feb 2020 23:31:28 +0000
(16:31 -0700)
debian/rules
patch
|
blob
|
history
diff --git
a/debian/rules
b/debian/rules
index 87953a6ebcd5414e277d0440bfea8ebc3c87869f..47273f11eb2c029a3cb46af718e51960a884ab94 100755
(executable)
--- a/
debian/rules
+++ b/
debian/rules
@@
-25,28
+25,14
@@
endif
endif
export DEFS=NO_ASM # Avoid TEXTRELs on i386
endif
export DEFS=NO_ASM # Avoid TEXTRELs on i386
-EXTRA_CFLAGS= -Wall
-EXTRA_CPPFLAGS=
-
-ifeq (${DEB_HOST_ARCH},amd64)
-EXTRA_CPPFLAGS+= -DUNALIGNED_OK
-endif
+DEB_CFLAGS_MAINT_APPEND := -Wall
+DEB_CPPFLAGS_MAINT_APPEND := -DUNALIGNED_OK
# Automatic dpkg-buildflags selection, backport-friendly
# Automatic dpkg-buildflags selection, backport-friendly
-ifneq (,$(wildcard /usr/share/dpkg/buildflags.mk))
-# dpkg-dev (>= 1.16.1~)
-DEB_CFLAGS_MAINT_APPEND=${EXTRA_CFLAGS}
-DEB_CPPFLAGS_MAINT_APPEND=${EXTRA_CPPFLAGS}
# maybe turn this on later
#DEB_BUILD_MAINT_OPTIONS=hardening=+all
include /usr/share/dpkg/buildflags.mk
# maybe turn this on later
#DEB_BUILD_MAINT_OPTIONS=hardening=+all
include /usr/share/dpkg/buildflags.mk
-else
-# old-fashioned way to determine build flags
-CFLAGS= -O$(if $(findstring noopt,${DEB_BUILD_OPTIONS}),0,2) -g
-CFLAGS+= ${EXTRA_CFLAGS}
-LDFLAGS+= ${EXTRA_LDFLAGS}
-endif
# maybe turn this on later
#ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
# maybe turn this on later
#ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))