Author: yavor-guest
Date: 2014-05-30 18:58:05 +0000 (Fri, 30 May 2014)
New Revision: 17021
Modified:
trunk/packages/adun.app/trunk/debian/changelog
trunk/packages/adun.app/trunk/debian/rules
Log:
* debian/rules: Enable hardening build.
(CPPFLAGS, CFLAGS): New variables.
(override_dh_auto_build): Use them.
(mipsen-flags): Remove; binutils bug fixed long time ago.
Modified: trunk/packages/adun.app/trunk/debian/changelog
===================================================================
--- trunk/packages/adun.app/trunk/debian/changelog 2014-05-30 18:29:16 UTC
(rev 17020)
+++ trunk/packages/adun.app/trunk/debian/changelog 2014-05-30 18:58:05 UTC
(rev 17021)
@@ -3,6 +3,10 @@
* debian/patches/gcc-warnings.patch: New, adapt to the new GNUstep API
and fix some important warnings (Closes: #749733).
* debian/patches/series: Update.
+ * debian/rules: Enable hardening build.
+ (CPPFLAGS, CFLAGS): New variables.
+ (override_dh_auto_build): Use them.
+ (mipsen-flags): Remove; binutils bug fixed long time ago.
-- Yavor Doganov <[email protected]> Fri, 30 May 2014 21:27:17 +0300
Modified: trunk/packages/adun.app/trunk/debian/rules
===================================================================
--- trunk/packages/adun.app/trunk/debian/rules 2014-05-30 18:29:16 UTC (rev
17020)
+++ trunk/packages/adun.app/trunk/debian/rules 2014-05-30 18:58:05 UTC (rev
17021)
@@ -7,7 +7,10 @@
export GNUSTEP_MAKEFILES := $(GS_MAKE_DIR)
d_app := $(CURDIR)/debian/adun.app
-LDFLAGS += -Wl,-z,defs -Wl,--as-needed -Wl,-rpath,/usr/lib/adun.app
+CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) \
+ -Wl,--as-needed -Wl,-rpath,/usr/lib/adun.app
# Avoid building the bundled StepTalk framework.
export external := no
@@ -16,11 +19,6 @@
optim := debug=yes
endif
-# Workaround for gcc-4.4 bug 519006.
-ifneq (,$(findstring mips,$(DEB_BUILD_ARCH)))
-mipsen-flags := ADDITIONAL_OBJCFLAGS=-g0 ADDITIONAL_CFLAGS=-g0
-endif
-
%:
dh $@
@@ -37,18 +35,10 @@
# even if no -j option is used. GNUSTEP_MAKE_PARALLEL_BUILDING=no
# prevents messing the MAKELEVEL again.
MAKELEVEL=0 $(MAKE) GNUSTEP_MAKE_PARALLEL_BUILDING=no $(optim) \
- messages=yes ADDITIONAL_CFLAGS="$(CFLAGS)" \
- LDFLAGS="$(LDFLAGS)" \
- $(mipsen-flags)
+ messages=yes CPPFLAGS="$(CPPFLAGS)" ADDITIONAL_CFLAGS="$(CFLAGS)" \
+ OBJCFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
convert UL/Resources/icon.tiff -resize 32x32 adun.xpm
-## tried for hardening but does not help
-## if all four variables below are set the build even fails
-# ADDITIONAL_LDFLAGS="$(LDFLAGS)" \
-# ADDITIONAL_OBJC_LIBS="$(LDFLAGS)" \
-# ADDITIONAL_TOOL_LIBS="$(LDFLAGS)" \
-# ADDITIONAL_GUI_LIBS="$(LDFLAGS)" \
-
override_dh_auto_clean:
ifdef GS_MAKE_DIR
# This conditional and the ignored config.mk include at the top is to
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
