[Pkg-erlang-commits] r1881 - in erlang/trunk/debian: . patches

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Wed Dec 14 21:12:13 UTC 2016 

Author: sgolovan
Date: 2016-12-14 21:12:13 +0000 (Wed, 14 Dec 2016)
New Revision: 1881

Removed:
   erlang/trunk/debian/patches/hipe-nopie.patch
Modified:
   erlang/trunk/debian/changelog
   erlang/trunk/debian/patches/beamload.patch
   erlang/trunk/debian/patches/emacs.patch
   erlang/trunk/debian/patches/gnu.patch
   erlang/trunk/debian/patches/hppa.patch
   erlang/trunk/debian/patches/java.patch
   erlang/trunk/debian/patches/series
   erlang/trunk/debian/patches/sparc.patch
   erlang/trunk/debian/patches/wx3.0-constants.patch
   erlang/trunk/debian/rules
Log:
[erlang]
  * New upstream release.
  * Refreshed patches.
  * Removed the patch which fixed HiPE build with PIE enabled by default in
    the GCC C compiler, because it's been applied upstream.


Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog	2016-11-25 17:03:46 UTC (rev 1880)
+++ erlang/trunk/debian/changelog	2016-12-14 21:12:13 UTC (rev 1881)
@@ -1,8 +1,11 @@
-erlang (1:19.1.6+dfsg-3) UNRELEASED; urgency=medium
+erlang (1:19.2+dfsg-1) unstable; urgency=medium
 
-  * NOT RELEASED YET
+  * New upstream release.
+  * Refreshed patches.
+  * Removed the patch which fixed HiPE build with PIE enabled by default in
+    the GCC C compiler, because it's been applied upstream.
 
- -- Sergei Golovan <sgolovan at debian.org>  Sat, 19 Nov 2016 14:12:33 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Wed, 14 Dec 2016 23:32:53 +0300
 
 erlang (1:19.1.6+dfsg-2) unstable; urgency=medium
 

Modified: erlang/trunk/debian/patches/beamload.patch
===================================================================
--- erlang/trunk/debian/patches/beamload.patch	2016-11-25 17:03:46 UTC (rev 1880)
+++ erlang/trunk/debian/patches/beamload.patch	2016-12-14 21:12:13 UTC (rev 1881)
@@ -5,7 +5,7 @@
 
 --- a/erts/emulator/Makefile.in
 +++ b/erts/emulator/Makefile.in
-@@ -647,6 +647,7 @@
+@@ -650,6 +650,7 @@
  COMMON_INCLUDES += -Ipcre -Ihipe
  COMMON_INCLUDES += -I../include -I../include/$(TARGET)
  COMMON_INCLUDES += -I../include/internal -I../include/internal/$(TARGET)

Modified: erlang/trunk/debian/patches/emacs.patch
===================================================================
--- erlang/trunk/debian/patches/emacs.patch	2016-11-25 17:03:46 UTC (rev 1880)
+++ erlang/trunk/debian/patches/emacs.patch	2016-12-14 21:12:13 UTC (rev 1881)
@@ -5,7 +5,7 @@
 
 --- a/lib/tools/emacs/erlang.el
 +++ b/lib/tools/emacs/erlang.el
-@@ -498,8 +498,8 @@
+@@ -507,8 +507,8 @@
  (defvar erlang-man-dirs
    '(("Man - Commands" "/man/man1" t)
      ("Man - Modules" "/man/man3" t)
@@ -16,7 +16,7 @@
    "*The man directories displayed in the Erlang menu.
  
  Each item in the list should be a list with three elements, the first
-@@ -1304,23 +1304,22 @@
+@@ -1313,23 +1313,22 @@
  (or (fboundp 'eval-when-compile)
      (defmacro eval-when-compile (&rest rest) nil))
  
@@ -44,16 +44,16 @@
  
  ;; defvar some obsolete variables, which we still support for
  ;; backwards compatibility reasons.
-@@ -2048,7 +2047,7 @@
+@@ -2060,7 +2059,7 @@
  
  (defun erlang-man-make-menu-item (file)
    "Create a menu item containing the name of the man page."
 -  (and (string-match ".+/\\([^/]+\\)\\.\\([124-9]\\|3\\(erl\\)?\\)\\(\\.gz\\)?$" file)
 +  (and (string-match ".+/\\([^/]+\\)\\.\\([124-9]\\|3\\(erl\\)\\)\\(\\.gz\\)?$" file)
         (let ((page (substring file (match-beginning 1) (match-end 1))))
- 	 (list (capitalize page)
- 	       (list 'lambda '()
-@@ -2059,7 +2058,7 @@
+          (list (capitalize page)
+                (list 'lambda '()
+@@ -2071,7 +2070,7 @@
  
  (defun erlang-man-get-files (dir)
    "Return files in directory DIR."
@@ -62,24 +62,24 @@
  
  
  (defun erlang-man-module (&optional module)
-@@ -2079,7 +2078,7 @@
+@@ -2091,7 +2090,7 @@
    (if (or (null module) (string= module ""))
        (error "No Erlang module name given"))
    (let ((dir-list erlang-man-dirs)
--	(pat (concat "/" (regexp-quote module) "\\.\\([124-9]\\|3\\(erl\\)?\\)\\(\\.gz\\)?$"))
-+	(pat (concat "/" (regexp-quote module) "\\.\\(3\\(erl\\)\\)\\(\\.gz\\)?$"))
- 	(file nil)
- 	file-list)
+-        (pat (concat "/" (regexp-quote module) "\\.\\([124-9]\\|3\\(erl\\)?\\)\\(\\.gz\\)?$"))
++        (pat (concat "/" (regexp-quote module) "\\.\\(3\\(erl\\)\\)\\(\\.gz\\)?$"))
+         (file nil)
+         file-list)
      (while (and dir-list (null file))
-@@ -2220,9 +2219,9 @@
+@@ -2232,9 +2231,9 @@
      (error nil))
    (if file
        (let ((process-environment (copy-sequence process-environment)))
--	(if (string-match "\\(.*\\)/man[^/]*/\\([^.]+\\)\\.\\([124-9]\\|3\\(erl\\)?\\)\\(\\.gz\\)?$" file)
-+	(if (string-match "\\(.*\\)/man[^/]*/\\([^.]+\\)\\.\\([124-9]\\|3\\(erl\\)\\)\\(\\.gz\\)?$" file)
- 	    (let ((dir (substring file (match-beginning 1) (match-end 1)))
--		  (page (substring file (match-beginning 2) (match-end 2))))
-+		  (page (concat (substring file (match-beginning 2) (match-end 2)) "(" (substring file (match-beginning 3) (match-end 3)) ")")))
- 	      (if (fboundp 'setenv)
- 		  (setenv "MANPATH" dir)
- 		;; Emacs 18
+-        (if (string-match "\\(.*\\)/man[^/]*/\\([^.]+\\)\\.\\([124-9]\\|3\\(erl\\)?\\)\\(\\.gz\\)?$" file)
++        (if (string-match "\\(.*\\)/man[^/]*/\\([^.]+\\)\\.\\([124-9]\\|3\\(erl\\)\\)\\(\\.gz\\)?$" file)
+             (let ((dir (substring file (match-beginning 1) (match-end 1)))
+-                  (page (substring file (match-beginning 2) (match-end 2))))
++                  (page (concat (substring file (match-beginning 2) (match-end 2)) "(" (substring file (match-beginning 3) (match-end 3)) ")")))
+               (if (fboundp 'setenv)
+                   (setenv "MANPATH" dir)
+                 ;; Emacs 18

Modified: erlang/trunk/debian/patches/gnu.patch
===================================================================
--- erlang/trunk/debian/patches/gnu.patch	2016-11-25 17:03:46 UTC (rev 1880)
+++ erlang/trunk/debian/patches/gnu.patch	2016-12-14 21:12:13 UTC (rev 1881)
@@ -13,7 +13,7 @@
 
 --- a/erts/configure.in
 +++ b/erts/configure.in
-@@ -423,7 +423,7 @@
+@@ -429,7 +429,7 @@
  
  dnl NOTE: CPPFLAGS will be included in CFLAGS at the end
  case $host_os in
@@ -22,7 +22,7 @@
      win32)
  	# The ethread library requires _WIN32_WINNT of at least 0x0403.
  	# -D_WIN32_WINNT=* from CPPFLAGS is saved in ETHR_DEFS.
-@@ -1279,7 +1279,7 @@
+@@ -1301,7 +1301,7 @@
  	fi
  
  	case $host_os in

Deleted: erlang/trunk/debian/patches/hipe-nopie.patch
===================================================================
--- erlang/trunk/debian/patches/hipe-nopie.patch	2016-11-25 17:03:46 UTC (rev 1880)
+++ erlang/trunk/debian/patches/hipe-nopie.patch	2016-12-14 21:12:13 UTC (rev 1881)
@@ -1,68 +0,0 @@
-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/trunk/debian/patches/hppa.patch
===================================================================
--- erlang/trunk/debian/patches/hppa.patch	2016-11-25 17:03:46 UTC (rev 1880)
+++ erlang/trunk/debian/patches/hppa.patch	2016-12-14 21:12:13 UTC (rev 1881)
@@ -8,7 +8,7 @@
 
 --- a/erts/configure.in
 +++ b/erts/configure.in
-@@ -2097,6 +2097,14 @@
+@@ -2120,6 +2120,14 @@
  AC_CHECK_DECLS([posix2time, time2posix],,,[#include <time.h>])
  
  disable_vfork=false

Modified: erlang/trunk/debian/patches/java.patch
===================================================================
--- erlang/trunk/debian/patches/java.patch	2016-11-25 17:03:46 UTC (rev 1880)
+++ erlang/trunk/debian/patches/java.patch	2016-12-14 21:12:13 UTC (rev 1881)
@@ -8,7 +8,7 @@
 
 --- a/erts/configure.in
 +++ b/erts/configure.in
-@@ -4683,7 +4683,8 @@
+@@ -4723,7 +4723,8 @@
    dnl Make sure it's at least JDK 1.6
    AC_CACHE_CHECK(for JDK version 1.6, 
       ac_cv_prog_javac_ver_1_6,

Modified: erlang/trunk/debian/patches/series
===================================================================
--- erlang/trunk/debian/patches/series	2016-11-25 17:03:46 UTC (rev 1880)
+++ erlang/trunk/debian/patches/series	2016-12-14 21:12:13 UTC (rev 1881)
@@ -10,4 +10,3 @@
 wx3.0-constants.patch
 beamload.patch
 x32.patch
-hipe-nopie.patch

Modified: erlang/trunk/debian/patches/sparc.patch
===================================================================
--- erlang/trunk/debian/patches/sparc.patch	2016-11-25 17:03:46 UTC (rev 1880)
+++ erlang/trunk/debian/patches/sparc.patch	2016-12-14 21:12:13 UTC (rev 1881)
@@ -7,7 +7,7 @@
 
 --- a/erts/configure.in
 +++ b/erts/configure.in
-@@ -602,7 +602,7 @@
+@@ -608,7 +608,7 @@
  fi
  
  case $chk_arch_ in

Modified: erlang/trunk/debian/patches/wx3.0-constants.patch
===================================================================
--- erlang/trunk/debian/patches/wx3.0-constants.patch	2016-11-25 17:03:46 UTC (rev 1880)
+++ erlang/trunk/debian/patches/wx3.0-constants.patch	2016-12-14 21:12:13 UTC (rev 1881)
@@ -8,7 +8,7 @@
 
 --- a/lib/wx/include/wx.hrl
 +++ b/lib/wx/include/wx.hrl
-@@ -771,7 +771,7 @@
+@@ -778,7 +778,7 @@
  % From "checkbox.h"
  -define(wxCHK_ALLOW_3RD_STATE_FOR_USER, 8192).
  -define(wxCHK_3STATE, 4096).
@@ -17,7 +17,7 @@
  % From "checkbox.h": wxCheckBoxState
  -define(wxCHK_UNCHECKED, 0).
  -define(wxCHK_CHECKED, 1).
-@@ -1018,10 +1018,10 @@
+@@ -1025,10 +1025,10 @@
  -define(wxSIZE_AUTO_WIDTH, 1).
  -define(wxSETUP, 131072).
  -define(wxMORE, 65536).
@@ -32,7 +32,7 @@
  -define(wxICON_MASK, (16#00000100 bor 16#00000200 bor 16#00000400 bor 16#00000800)).
  -define(wxICON_ASTERISK, ?wxICON_INFORMATION).
  -define(wxICON_STOP, ?wxICON_HAND).
-@@ -1053,8 +1053,8 @@
+@@ -1060,8 +1060,8 @@
  -define(wxTC_TOP, 0).
  -define(wxTC_FIXEDWIDTH, 32).
  -define(wxTC_RIGHTJUSTIFY, 16).
@@ -43,7 +43,7 @@
  -define(wxSP_VERTICAL, ?wxVERTICAL).
  -define(wxSP_HORIZONTAL, ?wxHORIZONTAL).
  -define(wxSB_VERTICAL, ?wxVERTICAL).
-@@ -1075,8 +1075,8 @@
+@@ -1082,8 +1082,8 @@
  -define(wxCB_SIMPLE, 4).
  -define(wxLB_INT_HEIGHT, 2048).
  -define(wxLB_HSCROLL, ?wxHSCROLL).
@@ -54,7 +54,7 @@
  -define(wxLB_OWNERDRAW, 256).
  -define(wxLB_EXTENDED, 128).
  -define(wxLB_MULTIPLE, 64).
-@@ -1552,7 +1552,7 @@
+@@ -1559,7 +1559,7 @@
  -define(wxUPDATE_UI_FROMIDLE, 2).
  % From "dialog.h"
  -define(wxDEFAULT_DIALOG_STYLE, (?wxCAPTION bor ?wxSYSTEM_MENU bor ?wxCLOSE_BOX)).
@@ -63,7 +63,7 @@
  % From "dirctrlg.h"
  -define(wxDIRCTRL_DIR_ONLY, 16).
  -define(wxDIRCTRL_SELECT_FIRST, 32).
-@@ -3732,7 +3732,7 @@
+@@ -3739,7 +3739,7 @@
  -define(wxSTC_KEY_LEFT, 302).
  -define(wxSTC_KEY_UP, 301).
  -define(wxSTC_KEY_DOWN, 300).
@@ -72,7 +72,7 @@
  -define(wxSTC_MULTILINEUNDOREDO, 4096).
  -define(wxSTC_MOD_BEFOREDELETE, 2048).
  -define(wxSTC_MOD_BEFOREINSERT, 1024).
-@@ -3814,7 +3814,7 @@
+@@ -3821,7 +3821,7 @@
  -define(wxSTC_INDIC_TT, 2).
  -define(wxSTC_INDIC_SQUIGGLE, 1).
  -define(wxSTC_INDIC_PLAIN, 0).
@@ -81,7 +81,7 @@
  -define(wxSTC_CASE_LOWER, 2).
  -define(wxSTC_CASE_UPPER, 1).
  -define(wxSTC_CASE_MIXED, 0).
-@@ -3839,7 +3839,7 @@
+@@ -3846,7 +3846,7 @@
  -define(wxSTC_CHARSET_BALTIC, 186).
  -define(wxSTC_CHARSET_DEFAULT, 1).
  -define(wxSTC_CHARSET_ANSI, 0).
@@ -90,7 +90,7 @@
  -define(wxSTC_STYLE_LASTPREDEFINED, 39).
  -define(wxSTC_STYLE_CALLTIP, 38).
  -define(wxSTC_STYLE_INDENTGUIDE, 37).
-@@ -3938,9 +3938,9 @@
+@@ -3945,9 +3945,9 @@
  -define(wxTE_PROCESS_TAB, 64).
  -define(wxTE_MULTILINE, 32).
  -define(wxTE_READONLY, 16).
@@ -102,7 +102,7 @@
  % From "textctrl.h": wxTextAttrAlignment
  -define(wxTEXT_ALIGNMENT_DEFAULT, 0).
  -define(wxTEXT_ALIGNMENT_LEFT, 1).
-@@ -3990,7 +3990,7 @@
+@@ -3997,7 +3997,7 @@
  -define(wxDEFAULT_FRAME_STYLE, (?wxSYSTEM_MENU bor ?wxRESIZE_BORDER bor ?wxMINIMIZE_BOX bor ?wxMAXIMIZE_BOX bor ?wxCLOSE_BOX bor ?wxCAPTION bor ?wxCLIP_CHILDREN)).
  -define(wxRESIZE_BORDER, 64).
  -define(wxTINY_CAPTION_VERT, 128).

Modified: erlang/trunk/debian/rules
===================================================================
--- erlang/trunk/debian/rules	2016-11-25 17:03:46 UTC (rev 1880)
+++ erlang/trunk/debian/rules	2016-12-14 21:12:13 UTC (rev 1881)
@@ -501,7 +501,7 @@
 
 binary: binary-indep binary-arch
 
-REL=19.1.6
+REL=19.2
 DEB_REL=$(REL)+dfsg
 
 get-orig-source:

More information about the Pkg-erlang-commits mailing list