[Pkg-erlang-commits] r1863 - erlang/trunk/debian

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2016-11-07 08:15:57 +0000 (Mon, 07 Nov 2016)
New Revision: 1863

Modified:
   erlang/trunk/debian/changelog
   erlang/trunk/debian/control
   erlang/trunk/debian/rules
Log:
[erlang]
  * Temporarily switched to libssl1.0-dev until porting to OpensSSL 1.1 is
    complete.
  * Added -fno-pie -no-pie GCC flags to make sure the HiPE build works
    (closes: #842998).
  * Enabled verbose build logs to make them more useful in debugging.


Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog	2016-10-21 06:37:29 UTC (rev 1862)
+++ erlang/trunk/debian/changelog	2016-11-07 08:15:57 UTC (rev 1863)
@@ -1,8 +1,12 @@
-erlang (1:19.1.5+dfsg-2) UNRELEASED; urgency=medium
+erlang (1:19.1.5+dfsg-2) unstable; urgency=medium
 
-  * NOT RELEASED YET
+  * Temporarily switched to libssl1.0-dev until porting to OpensSSL 1.1 is
+    complete.
+  * Added -fno-pie -no-pie GCC flags to make sure the HiPE build works
+    (closes: #842998).
+  * Enabled verbose build logs to make them more useful in debugging.
 
- -- Sergei Golovan <sgolovan at debian.org>  Fri, 21 Oct 2016 09:37:28 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Mon, 07 Nov 2016 09:07:18 +0300
 
 erlang (1:19.1.5+dfsg-1) unstable; urgency=medium
 

Modified: erlang/trunk/debian/control
===================================================================
--- erlang/trunk/debian/control	2016-10-21 06:37:29 UTC (rev 1862)
+++ erlang/trunk/debian/control	2016-11-07 08:15:57 UTC (rev 1863)
@@ -4,7 +4,7 @@
 Section: interpreters
 Priority: optional
 Standards-Version: 3.9.8
-Build-Depends: debhelper (>= 8.0.0), autoconf (>= 2.50), openssl, libssl-dev, m4,
+Build-Depends: debhelper (>= 8.0.0), autoconf (>= 2.50), openssl, libssl1.0-dev, m4,
  libncurses5-dev, autotools-dev, unixodbc-dev, bison, flex, ed,
  libwxgtk3.0-dev, dctrl-tools, xsltproc,
  libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev,

Modified: erlang/trunk/debian/rules
===================================================================
--- erlang/trunk/debian/rules	2016-10-21 06:37:29 UTC (rev 1862)
+++ erlang/trunk/debian/rules	2016-11-07 08:15:57 UTC (rev 1863)
@@ -67,11 +67,13 @@
 LIBSCTPDEP=$(shell grep-status -s Version -PX $(LIBSCTP) | sed -e's!^Version: \(.*\)-[^-]*!$(LIBSCTP) (>= \1)!')
 
 ifeq ($(findstring debug,$(DEB_BUILD_OPTIONS)),debug)
-CFLAGS=-g -O2 -fno-strict-aliasing
+CFLAGS=-g -O2 -fno-strict-aliasing -fno-pie -no-pie
+LDFLAGS=-fno-pie -no-pie
 GEN_OPT_FLGS=-O2 -fno-strict-aliasing
 TYPE=debug
 else
-CFLAGS=-g -O2 -fno-strict-aliasing
+CFLAGS=-g -O2 -fno-strict-aliasing -fno-pie -no-pie
+LDFLAGS=-fno-pie -no-pie
 GEN_OPT_FLGS=-O2 -fno-strict-aliasing
 TYPE=
 endif
@@ -177,6 +179,7 @@
 	rm -f lib/dialyzer/SKIP
 	#
 	CFLAGS="$(CFLAGS)" \
+	LDFLAGS="$(LDFLAGS)" \
 	./configure --host=$(DEB_HOST_GNU_TYPE) \
 		    --build=$(DEB_BUILD_GNU_TYPE) \
 		    --prefix=/usr \
@@ -194,7 +197,8 @@
 		    --with-ssl-rpath=no \
 		    --enable-ethread-pre-pentium4-compatibility \
 		    --enable-shared-zlib \
-		    --without-ssl-zlib
+		    --without-ssl-zlib \
+		    --disable-silent-rules
 	#
 	touch configure-hipe-stamp
 
@@ -208,6 +212,7 @@
 	rm -f lib/dialyzer/SKIP
 	#
 	CFLAGS="$(CFLAGS)" \
+	LDFLAGS="$(LDFLAGS)" \
 	./configure --host=$(DEB_HOST_GNU_TYPE) \
 		    --build=$(DEB_BUILD_GNU_TYPE) \
 		    --prefix=/usr \
@@ -225,7 +230,8 @@
 		    --with-ssl-rpath=no \
 		    --enable-ethread-pre-pentium4-compatibility \
 		    --enable-shared-zlib \
-		    --without-ssl-zlib
+		    --without-ssl-zlib \
+		    --disable-silent-rules
 	#
 	touch configure-stnd-stamp