[Pkg-erlang-commits] r1878 - in erlang/branches/backport-jessie: . debian debian/patches

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Fri Nov 25 17:03:28 UTC 2016 

Author: sgolovan
Date: 2016-11-25 17:03:28 +0000 (Fri, 25 Nov 2016)
New Revision: 1878

Added:
   erlang/branches/backport-jessie/debian/patches/hipe-nopie.patch
Modified:
   erlang/branches/backport-jessie/
   erlang/branches/backport-jessie/debian/changelog
   erlang/branches/backport-jessie/debian/patches/series
   erlang/branches/backport-jessie/debian/rules
Log:
[erlang-jessie-backports]
  * Backport for jessie.
  * Replaced libssl1.0-dev by libssl-dev for backport.



Property changes on: erlang/branches/backport-jessie
___________________________________________________________________
Modified: svn:mergeinfo
   - /erlang/branches/experimental:1283-1305,1468-1497,1591-1615,1693-1702
/erlang/branches/r19rc:1778-1831
/erlang/trunk:1815-1853
   + /erlang/branches/experimental:1283-1305,1468-1497,1591-1615,1693-1702
/erlang/branches/r19rc:1778-1831
/erlang/trunk:1815-1875

Modified: erlang/branches/backport-jessie/debian/changelog
===================================================================
--- erlang/branches/backport-jessie/debian/changelog	2016-11-25 06:43:26 UTC (rev 1877)
+++ erlang/branches/backport-jessie/debian/changelog	2016-11-25 17:03:28 UTC (rev 1878)
@@ -1,9 +1,45 @@
-erlang (1:19.1.2+dfsg-1~bpo8+2) UNRELEASED; urgency=medium
+erlang (1:19.1.6+dfsg-2~bpo8+1) jessie-backports; urgency=medium
 
-  * NOT RELEASED YET
+  * Backport for jessie.
+  * Replaced libssl1.0-dev by libssl-dev for backport.
 
- -- Sergei Golovan <sgolovan at debian.org>  Fri, 14 Oct 2016 21:05:24 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Fri, 25 Nov 2016 08:42:02 +0300
 
+erlang (1:19.1.6+dfsg-2) unstable; urgency=medium
+
+  * Use the solution from upstream to build HiPE if GCC enables PIE by default.
+    The previous one breaks erlang-wx (closes: #844593).
+
+ -- Sergei Golovan <sgolovan at debian.org>  Sat, 19 Nov 2016 12:45:43 +0300
+
+erlang (1:19.1.6+dfsg-1) unstable; urgency=medium
+
+  * New upstream bugfix release.
+
+ -- Sergei Golovan <sgolovan at debian.org>  Fri, 11 Nov 2016 08:26:20 +0300
+
+erlang (1:19.1.5+dfsg-2) unstable; urgency=medium
+
+  * 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>  Mon, 07 Nov 2016 09:07:18 +0300
+
+erlang (1:19.1.5+dfsg-1) unstable; urgency=medium
+
+  * New upstream bugfix release.
+
+ -- Sergei Golovan <sgolovan at debian.org>  Fri, 21 Oct 2016 07:45:04 +0300
+
+erlang (1:19.1.4+dfsg-1) unstable; urgency=medium
+
+  * New upstream bugfix release.
+
+ -- Sergei Golovan <sgolovan at debian.org>  Sat, 15 Oct 2016 09:50:31 +0300
+
 erlang (1:19.1.2+dfsg-1~bpo8+1) jessie-backports; urgency=medium
 
   * Backport for jessie.
@@ -12,6 +48,7 @@
 
 erlang (1:19.1.2+dfsg-1) unstable; urgency=medium
 
+  * New upstream bugfix release.
   * Removed dangled symlink (closes: #839854).
 
  -- Sergei Golovan <sgolovan at debian.org>  Thu, 06 Oct 2016 13:33:30 +0300

Copied: erlang/branches/backport-jessie/debian/patches/hipe-nopie.patch (from rev 1875, erlang/trunk/debian/patches/hipe-nopie.patch)
===================================================================
--- erlang/branches/backport-jessie/debian/patches/hipe-nopie.patch	                        (rev 0)
+++ erlang/branches/backport-jessie/debian/patches/hipe-nopie.patch	2016-11-25 17:03:28 UTC (rev 1878)
@@ -0,0 +1,68 @@
+Author: Upstream
+Description: Patch fixes HiPE build for the case when the GCC compiler enables
+ PIE by default.
+Date: Wed, 9 Nov 2016 16:52:23 +0100
+
+--- a/erts/configure.in
++++ b/erts/configure.in
+@@ -2771,6 +2771,23 @@ if test "$cross_compiling" != "yes" && test X${enable_hipe} != Xno; then
+   fi
+ fi
+ 
++dnl Check to disable -fPIE and friends for HiPE on amd64
++if test X${enable_hipe} = Xyes && test X$ARCH = Xamd64; then
++   AC_TRY_COMPILE(, [#if defined(__pie__) || defined(__PIE__)
++		     #error -fPIE is enabled by default
++		     #endif],
++		    [AC_MSG_NOTICE([No -fPIE enabled by default])],
++		    [AC_MSG_WARN([Security feature -fPIE will be disabled for HiPE])
++		     STATIC_CFLAGS="-fno-PIE $STATIC_CFLAGS"
++		     saved_LDFLAGS=$LDFLAGS
++		     LDFLAGS="-no-pie $LDFLAGS"
++		     AC_TRY_LINK(,, [],
++			[AC_MSG_WARN([Linked does not accept option -no-pie])
++			 LDFLAGS=$saved_LDFLAGS])])
++
++fi
++
++
+ if test X${enable_fp_exceptions} = Xauto ; then
+    case $host_os in
+    	*linux*)
+--- a/erts/emulator/Makefile.in
++++ b/erts/emulator/Makefile.in
+@@ -49,6 +49,7 @@ CREATE_DIRS=
+ LDFLAGS=@LDFLAGS@
+ ARFLAGS=rc
+ OMIT_OMIT_FP=no
++TYPE_LIBS=
+ 
+ DIRTY_SCHEDULER_SUPPORT=@DIRTY_SCHEDULER_SUPPORT@
+ NEW_PURGE_STRATEGY=@NEW_PURGE_STRATEGY@
+@@ -90,7 +91,7 @@ PURIFY =
+ TYPEMARKER = .gcov
+ TYPE_FLAGS = $(DEBUG_CFLAGS) -DERTS_GCOV -DNO_JUMP_TABLE -fprofile-arcs -ftest-coverage -O0 -DERTS_CAN_INLINE=0 -DERTS_INLINE=
+ ifneq ($(findstring solaris,$(TARGET)),solaris)
+-LIBS += -lgcov
++TYPE_LIBS = -lgcov
+ endif
+ ENABLE_ALLOC_TYPE_VARS += debug
+ else
+@@ -146,6 +147,8 @@ endif
+ endif
+ endif
+ 
++LIBS += $(TYPE_LIBS)
++
+ comma:=,
+ space:=
+ space+=
+@@ -931,7 +934,7 @@ $(OBJDIR)/%.o: hipe/%.c
+ 	$(V_CC) $(subst O2,O3, $(CFLAGS)) $(INCLUDES) -c $< -o $@
+ 
+ $(BINDIR)/hipe_mkliterals$(TF_MARKER):	$(OBJDIR)/hipe_mkliterals.o
+-	$(ld_verbose)$(CC) $(CFLAGS) $(INCLUDES) -o $@ $<
++	$(ld_verbose)$(CC) $(LDFLAGS) -o $@ $< $(TYPE_LIBS)
+ 
+ $(OBJDIR)/hipe_mkliterals.o:	$(HIPE_ASM) $(TTF_DIR)/erl_alloc_types.h $(DTRACE_HEADERS) \
+ 	$(TTF_DIR)/OPCODES-GENERATED $(TARGET)/TABLES-GENERATED

Modified: erlang/branches/backport-jessie/debian/patches/series
===================================================================
--- erlang/branches/backport-jessie/debian/patches/series	2016-11-25 06:43:26 UTC (rev 1877)
+++ erlang/branches/backport-jessie/debian/patches/series	2016-11-25 17:03:28 UTC (rev 1878)
@@ -10,3 +10,4 @@
 wx3.0-constants.patch
 beamload.patch
 x32.patch
+hipe-nopie.patch

Modified: erlang/branches/backport-jessie/debian/rules
===================================================================
--- erlang/branches/backport-jessie/debian/rules	2016-11-25 06:43:26 UTC (rev 1877)
+++ erlang/branches/backport-jessie/debian/rules	2016-11-25 17:03:28 UTC (rev 1878)
@@ -194,7 +194,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
 
@@ -225,7 +226,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
 
@@ -499,7 +501,7 @@
 
 binary: binary-indep binary-arch
 
-REL=19.1.2
+REL=19.1.6
 DEB_REL=$(REL)+dfsg
 
 get-orig-source:

More information about the Pkg-erlang-commits mailing list