summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rwxr-xr-xdebian/rules12
2 files changed, 10 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog
index 4c30ce18..1e8b0747 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+urweb (20161022+dfsg-2) unstable; urgency=medium
+
+ * Build position-independent. (Closes: #844891)
+
+ -- Benjamin Barenblat <bbaren@mit.edu> Sat, 31 Dec 2016 17:35:18 -0600
+
urweb (20161022+dfsg-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/rules b/debian/rules
index 575fb3ed..cd3f8296 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,16 +7,12 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
# Avoid overlinking and reduce library dependencies.
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-# Harden SML executables. Do not build position-independent executables,
-# though; urweb depends on the MLton runtime, which is not built position-
-# independent in Debian (#837567).
-export DEB_BUILD_MAINT_OPTIONS := hardening=+all,-pie
+# Harden SML executables.
+export DEB_BUILD_MAINT_OPTIONS := hardening=+all
export MLTONARGS := \
-cc-opt "$(shell dpkg-buildflags --get CPPFLAGS) \
- $(shell dpkg-buildflags --get CFLAGS) \
- -no-pie" \
- -link-opt "$(shell dpkg-buildflags --get LDFLAGS) \
- -no-pie"
+ $(shell dpkg-buildflags --get CFLAGS)" \
+ -link-opt "$(shell dpkg-buildflags --get LDFLAGS)"
%:
dh $@ --parallel --with autoreconf