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

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2017-07-03 12:03:19 +0000 (Mon, 03 Jul 2017)
New Revision: 1932

Modified:
   erlang/trunk/debian/changelog
   erlang/trunk/debian/patches/x32.patch
Log:
[erlang]
  * Fixed patch for x32 architecture which led to FTBFS for *-i386
    architectures due to undefined __x86_64__.


Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog	2017-07-03 08:15:16 UTC (rev 1931)
+++ erlang/trunk/debian/changelog	2017-07-03 12:03:19 UTC (rev 1932)
@@ -1,8 +1,9 @@
-erlang (1:20.0+dfsg-2) UNRELEASED; urgency=medium
+erlang (1:20.0+dfsg-2) unstable; urgency=medium
 
-  * NOT RELEASED YET
+  * Fixed patch for x32 architecture which led to FTBFS for *-i386
+    architectures due to undefined __x86_64__.
 
- -- Sergei Golovan <sgolovan at debian.org>  Mon, 03 Jul 2017 11:15:14 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Mon, 03 Jul 2017 14:19:40 +0300
 
 erlang (1:20.0+dfsg-1) unstable; urgency=medium
 

Modified: erlang/trunk/debian/patches/x32.patch
===================================================================
--- erlang/trunk/debian/patches/x32.patch	2017-07-03 08:15:16 UTC (rev 1931)
+++ erlang/trunk/debian/patches/x32.patch	2017-07-03 12:03:19 UTC (rev 1932)
@@ -11,7 +11,7 @@
  ethr_x86_cpuid__(int *eax, int *ebx, int *ecx, int *edx)
  {
 -#if ETHR_SIZEOF_PTR == 4
-+#if ETHR_SIZEOF_PTR == 4 && !(__x86_64__ && __ILP32__)
++#if ETHR_SIZEOF_PTR == 4 && (!defined(__x86_64__) || !(__x86_64__ && __ILP32__))
      int have_cpuid;
      /*
       * If it is possible to toggle eflags bit 21,
@@ -20,7 +20,7 @@
      }
  #endif
 -#if ETHR_SIZEOF_PTR == 4 && defined(__PIC__) && __PIC__
-+#if ETHR_SIZEOF_PTR == 4 && !(__x86_64__ && __ILP32__) && defined(__PIC__) && __PIC__
++#if ETHR_SIZEOF_PTR == 4 && (!defined(__x86_64__) || !(__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