[Pkg-erlang-commits] r1842 - in erlang/trunk/debian: . patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Wed Sep 21 12:51:21 UTC 2016
Author: sgolovan
Date: 2016-09-21 12:51:20 +0000 (Wed, 21 Sep 2016)
New Revision: 1842
Removed:
erlang/trunk/debian/patches/reproducible-build.patch
Modified:
erlang/trunk/debian/changelog
erlang/trunk/debian/patches/beamload.patch
erlang/trunk/debian/patches/docs.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/sparc.patch
erlang/trunk/debian/patches/x32.patch
erlang/trunk/debian/rules
Log:
[erlang]
* New upstream release.
* Refreshed patches.
* Refined patches which fix function prototype in beamload.c and help
with FTBFS on x32.
Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog 2016-09-14 14:27:48 UTC (rev 1841)
+++ erlang/trunk/debian/changelog 2016-09-21 12:51:20 UTC (rev 1842)
@@ -1,8 +1,11 @@
-erlang (1:19.0.7+dfsg-2) UNRELEASED; urgency=medium
+erlang (1:19.1+dfsg-1) unstable; urgency=medium
- * NOT RELEASED YET
+ * New upstream release.
+ * Refreshed patches.
+ * Refined patches which fix function prototype in beamload.c and help
+ with FTBFS on x32.
- -- Sergei Golovan <sgolovan at debian.org> Wed, 14 Sep 2016 17:27:47 +0300
+ -- Sergei Golovan <sgolovan at debian.org> Wed, 21 Sep 2016 15:02:56 +0300
erlang (1:19.0.7+dfsg-1) unstable; urgency=medium
Modified: erlang/trunk/debian/patches/beamload.patch
===================================================================
--- erlang/trunk/debian/patches/beamload.patch 2016-09-14 14:27:48 UTC (rev 1841)
+++ erlang/trunk/debian/patches/beamload.patch 2016-09-21 12:51:20 UTC (rev 1842)
@@ -1,7 +1,18 @@
Author: Sergei Golovan
-Description: Patch fixes function declaration.
+Description: Patch fixes function declaration. It includes the
+ corresponding header instead of specifying the prototype directly.
Bugs-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=747593
+--- a/erts/emulator/Makefile.in
++++ b/erts/emulator/Makefile.in
+@@ -647,6 +647,7 @@
+ COMMON_INCLUDES += -Ipcre -Ihipe
+ COMMON_INCLUDES += -I../include -I../include/$(TARGET)
+ COMMON_INCLUDES += -I../include/internal -I../include/internal/$(TARGET)
++COMMON_INCLUDES += -Idrivers/common
+
+ INCLUDES = -I$(TTF_DIR) $(COMMON_INCLUDES)
+
--- a/erts/emulator/beam/beam_load.c
+++ b/erts/emulator/beam/beam_load.c
@@ -46,7 +46,7 @@
@@ -9,7 +20,7 @@
#endif
-ErlDrvBinary* erts_gzinflate_buffer(char*, int);
-+ErlDrvBinary* erts_gzinflate_buffer(char*, uLong);
++#include "gzio.h"
#define MAX_OPARGS 8
#define CALLED 0
Modified: erlang/trunk/debian/patches/docs.patch
===================================================================
--- erlang/trunk/debian/patches/docs.patch 2016-09-14 14:27:48 UTC (rev 1841)
+++ erlang/trunk/debian/patches/docs.patch 2016-09-21 12:51:20 UTC (rev 1842)
@@ -65,14 +65,3 @@
include vsn.mk
VSN = $(TOOLS_VSN)
---- a/system/doc/top/Makefile
-+++ b/system/doc/top/Makefile
-@@ -35,7 +35,7 @@
-
- GIF_FILES =
-
--INFO_FILES = ../../README ../../COPYRIGHT PR.template
-+INFO_FILES = ../../COPYRIGHT PR.template
-
- TOPDOCDIR=.
-
Modified: erlang/trunk/debian/patches/emacs.patch
===================================================================
--- erlang/trunk/debian/patches/emacs.patch 2016-09-14 14:27:48 UTC (rev 1841)
+++ erlang/trunk/debian/patches/emacs.patch 2016-09-21 12:51:20 UTC (rev 1842)
@@ -44,7 +44,7 @@
;; defvar some obsolete variables, which we still support for
;; backwards compatibility reasons.
-@@ -2052,7 +2051,7 @@
+@@ -2048,7 +2047,7 @@
(defun erlang-man-make-menu-item (file)
"Create a menu item containing the name of the man page."
@@ -53,7 +53,7 @@
(let ((page (substring file (match-beginning 1) (match-end 1))))
(list (capitalize page)
(list 'lambda '()
-@@ -2063,7 +2062,7 @@
+@@ -2059,7 +2058,7 @@
(defun erlang-man-get-files (dir)
"Return files in directory DIR."
@@ -62,7 +62,7 @@
(defun erlang-man-module (&optional module)
-@@ -2083,7 +2082,7 @@
+@@ -2079,7 +2078,7 @@
(if (or (null module) (string= module ""))
(error "No Erlang module name given"))
(let ((dir-list erlang-man-dirs)
@@ -71,7 +71,7 @@
(file nil)
file-list)
(while (and dir-list (null file))
-@@ -2224,9 +2223,9 @@
+@@ -2220,9 +2219,9 @@
(error nil))
(if file
(let ((process-environment (copy-sequence process-environment)))
Modified: erlang/trunk/debian/patches/gnu.patch
===================================================================
--- erlang/trunk/debian/patches/gnu.patch 2016-09-14 14:27:48 UTC (rev 1841)
+++ erlang/trunk/debian/patches/gnu.patch 2016-09-21 12:51:20 UTC (rev 1842)
@@ -13,7 +13,7 @@
--- a/erts/configure.in
+++ b/erts/configure.in
-@@ -415,7 +415,7 @@
+@@ -423,7 +423,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.
-@@ -1245,7 +1245,7 @@
+@@ -1279,7 +1279,7 @@
fi
case $host_os in
Modified: erlang/trunk/debian/patches/hppa.patch
===================================================================
--- erlang/trunk/debian/patches/hppa.patch 2016-09-14 14:27:48 UTC (rev 1841)
+++ erlang/trunk/debian/patches/hppa.patch 2016-09-21 12:51:20 UTC (rev 1842)
@@ -8,7 +8,7 @@
--- a/erts/configure.in
+++ b/erts/configure.in
-@@ -2062,6 +2062,14 @@
+@@ -2097,6 +2097,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-09-14 14:27:48 UTC (rev 1841)
+++ erlang/trunk/debian/patches/java.patch 2016-09-21 12:51:20 UTC (rev 1842)
@@ -8,7 +8,7 @@
--- a/erts/configure.in
+++ b/erts/configure.in
-@@ -4648,7 +4648,8 @@
+@@ -4683,7 +4683,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,
Deleted: erlang/trunk/debian/patches/reproducible-build.patch
===================================================================
--- erlang/trunk/debian/patches/reproducible-build.patch 2016-09-14 14:27:48 UTC (rev 1841)
+++ erlang/trunk/debian/patches/reproducible-build.patch 2016-09-21 12:51:20 UTC (rev 1842)
@@ -1,23 +0,0 @@
-Author: Chris Lamb <lamby at debian.org>
-Description: Patch makes erlang compiler honor the SOURCE_DATE_EPOCH
- environment variable and use its value in build results instead of the
- current timestamp. The goal is to maintain reproducible builds. More info:
- https://wiki.debian.org/ReproducibleBuilds
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=795834
-Last-modified: Mon, 17 Aug 2015 14:32:15 +0300
-
---- a/lib/compiler/src/beam_asm.erl
-+++ b/lib/compiler/src/beam_asm.erl
-@@ -226,7 +226,11 @@
- build_attributes(Opts, SourceFile, Attr, MD5) ->
- Misc = case member(slim, Opts) of
- false ->
-- {{Y,Mo,D},{H,Mi,S}} = erlang:universaltime(),
-+ {{Y,Mo,D},{H,Mi,S}} = case string:to_integer(os:getenv("SOURCE_DATE_EPOCH")) of
-+ {N,[]} ->calendar:gregorian_seconds_to_datetime(N +
-+ calendar:datetime_to_gregorian_seconds({{1970,1,1},{0,0,0}}));
-+ {_,_} -> erlang:universaltime()
-+ end,
- [{time,{Y,Mo,D,H,Mi,S}},{source,SourceFile}];
- true -> []
- end,
Modified: erlang/trunk/debian/patches/sparc.patch
===================================================================
--- erlang/trunk/debian/patches/sparc.patch 2016-09-14 14:27:48 UTC (rev 1841)
+++ erlang/trunk/debian/patches/sparc.patch 2016-09-21 12:51:20 UTC (rev 1842)
@@ -7,7 +7,7 @@
--- a/erts/configure.in
+++ b/erts/configure.in
-@@ -594,7 +594,7 @@
+@@ -602,7 +602,7 @@
fi
case $chk_arch_ in
Modified: erlang/trunk/debian/patches/x32.patch
===================================================================
--- erlang/trunk/debian/patches/x32.patch 2016-09-14 14:27:48 UTC (rev 1841)
+++ erlang/trunk/debian/patches/x32.patch 2016-09-21 12:51:20 UTC (rev 1842)
@@ -1,54 +1,26 @@
Author: Sergei Golovan
-Description: This (not yet thoroughly tested) patch fixes FTBFS for x86_x32
- architecture (x86_64 with 32-bit integers, longs and pointers).
+Description: This patch fixes FTBFS for x86_x32 architecture (x86_64
+ with 32-bit integers, longs and pointers). HiPE still doesn't work
+ and probably never will.
Last-Modified: Sun, 27 Dec 2015 12:39:07 +0300
--- a/erts/lib_src/pthread/ethread.c
+++ b/erts/lib_src/pthread/ethread.c
-@@ -195,13 +195,25 @@
- * we have the cpuid instruction.
- */
- __asm__ ("pushf\n\t"
-+#if __x86_64__ || (__x86_64__ && __ILP32__)
-+ "popq %%rax\n\t"
-+#else /* i386 */
- "popl %%eax\n\t"
-+#endif
- "movl %%eax, %%ecx\n\t"
- "xorl $0x200000, %%eax\n\t"
-+#if __x86_64__ || (__x86_64__ && __ILP32__)
-+ "pushq %%rax\n\t"
-+#else /* i386 */
- "pushl %%eax\n\t"
-+#endif
- "popf\n\t"
- "pushf\n\t"
-+#if __x86_64__ || (__x86_64__ && __ILP32__)
-+ "popq %%rax\n\t"
-+#else /* i386 */
- "popl %%eax\n\t"
-+#endif
- "movl $0x0, %0\n\t"
- "xorl %%ecx, %%eax\n\t"
- "jz no_cpuid\n\t"
-@@ -223,10 +235,19 @@
- * B register explicitly (for some reason gcc doesn't provide this
- * service to us).
- */
-- __asm__ ("pushl %%ebx\n\t"
-+ __asm__ (
-+#if __x86_64__ || (__x86_64__ && __ILP32__)
-+ "pushq %%rbx\n\t"
-+#else /* i386 */
-+ "pushl %%ebx\n\t"
-+#endif
- "cpuid\n\t"
- "movl %%ebx, %1\n\t"
-+#if __x86_64__ || (__x86_64__ && __ILP32__)
-+ "popq %%rbx\n\t"
-+#else /* i386 */
- "popl %%ebx\n\t"
-+#endif
- : "=a"(*eax), "=r"(*ebx), "=c"(*ecx), "=d"(*edx)
- : "0"(*eax)
- : "cc");
+@@ -188,7 +188,7 @@
+ void
+ ethr_x86_cpuid__(int *eax, int *ebx, int *ecx, int *edx)
+ {
+-#if ETHR_SIZEOF_PTR == 4
++#if ETHR_SIZEOF_PTR == 4 && !(__x86_64__ && __ILP32__)
+ int have_cpuid;
+ /*
+ * If it is possible to toggle eflags bit 21,
+@@ -215,7 +215,7 @@
+ return;
+ }
+ #endif
+-#if ETHR_SIZEOF_PTR == 4 && defined(__PIC__) && __PIC__
++#if ETHR_SIZEOF_PTR == 4 && !(__x86_64__ && __ILP32__) && defined(__PIC__) && __PIC__
+ /*
+ * When position independet code is used in 32-bit mode, the B register
+ * is used for storage of global offset table address, and we may not
Modified: erlang/trunk/debian/rules
===================================================================
--- erlang/trunk/debian/rules 2016-09-14 14:27:48 UTC (rev 1841)
+++ erlang/trunk/debian/rules 2016-09-21 12:51:20 UTC (rev 1842)
@@ -499,7 +499,7 @@
binary: binary-indep binary-arch
-REL=19.0.7
+REL=19.1
DEB_REL=$(REL)+dfsg
get-orig-source:
More information about the Pkg-erlang-commits
mailing list