Skip to content

Commit

Permalink
debian: Remove obsolete manual setting of CFLAGS and warnings from ru…
Browse files Browse the repository at this point in the history
…les.

Setting CFLAGS by hand before invoking dpkg-buildflags is ineffective,
because dpkg-buildflags overrides it.

Reported-by: Andrey Korolyov <[email protected]>
Signed-off-by: Ben Pfaff <[email protected]>
  • Loading branch information
blp committed Jun 10, 2015
1 parent 40e7cf5 commit 40c9675
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,6 @@ PARALLEL =
endif
MAKEFLAGS += $(PARALLEL)

CFLAGS += -g
ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
CFLAGS += -O2
endif

# Old versions of dpkg-buildflags do not understand --export=configure.
# When dpkg-buildflags does not understand an option, it prints its full
# --help output on stdout, so we have to avoid that here.
Expand All @@ -45,7 +38,7 @@ configure-stamp:
cd _debian && ( \
test -e Makefile || \
../configure --prefix=/usr --localstatedir=/var --enable-ssl \
--sysconfdir=/etc --host=$(DEB_HOST_GNU_TYPE) CFLAGS="$(CFLAGS)" \
--sysconfdir=/etc --host=$(DEB_HOST_GNU_TYPE) \
$(buildflags) $(DATAPATH_CONFIGURE_OPTS))
touch configure-stamp

Expand Down

0 comments on commit 40c9675

Please sign in to comment.