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

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2017-01-18 12:31:19 +0000 (Wed, 18 Jan 2017)
New Revision: 1890

Modified:
   erlang-cl/trunk/debian/changelog
   erlang-cl/trunk/debian/patches/non-linux.patch
Log:
[erlang-cl]
  * Removed the -m32 and -m64 options from gcc calls to prevent FTBFS for
    Linux architectures other than i386 and amd64, added another fix
    for GNU/kFreeBSD.


Modified: erlang-cl/trunk/debian/changelog
===================================================================
--- erlang-cl/trunk/debian/changelog	2017-01-17 10:03:38 UTC (rev 1889)
+++ erlang-cl/trunk/debian/changelog	2017-01-18 12:31:19 UTC (rev 1890)
@@ -1,8 +1,10 @@
-erlang-cl (1.2.3-2) UNRELEASED; urgency=medium
+erlang-cl (1.2.3-2) unstable; urgency=medium
 
-  * NOT RELEASED YET
+  * Removed the -m32 and -m64 options from gcc calls to prevent FTBFS for
+    Linux architectures other than i386 and amd64, added another fix
+    for GNU/kFreeBSD.
 
- -- Sergei Golovan <sgolovan at debian.org>  Tue, 17 Jan 2017 13:03:37 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Wed, 18 Jan 2017 15:29:49 +0300
 
 erlang-cl (1.2.3-1) unstable; urgency=medium
 

Modified: erlang-cl/trunk/debian/patches/non-linux.patch
===================================================================
--- erlang-cl/trunk/debian/patches/non-linux.patch	2017-01-17 10:03:38 UTC (rev 1889)
+++ erlang-cl/trunk/debian/patches/non-linux.patch	2017-01-18 12:31:19 UTC (rev 1890)
@@ -9,7 +9,7 @@
  
  EXT       = so
  PRIVDIR=../priv
-@@ -56,7 +56,16 @@
+@@ -56,14 +56,23 @@
  endif
  
  ifeq ($(OSNAME), Linux)
@@ -27,3 +27,32 @@
  CFLAGS += -I/usr/include/nvidia-current
  CFLAGS += -I/opt/AMDAPP/include
  ifeq ($(WORDSIZE), 32)
+-CFLAGS += -O3 -fPIC -m32
++CFLAGS += -O3 -fPIC
+ endif
+ ifeq ($(WORDSIZE), 64)
+-CFLAGS += -O3 -fPIC -m64
++CFLAGS += -O3 -fPIC
+ endif
+ LD_SHARED	:= $(CC) -shared
+ LDFLAGS	        += -lOpenCL
+--- a/rebar.config
++++ b/rebar.config
+@@ -6,7 +6,7 @@
+ {provider_hooks, [{post, [{ct, edoc}, {ct, dialyzer}]}]}.
+ 
+ {pre_hooks,
+- [{"(linux|darwin|solaris|win32)", compile, "make -C c_src"},
++ [{"(gnu|linux|darwin|solaris|win32)", compile, "make -C c_src"},
+   {"(freebsd)", compile, "gmake -C c_src"}
+  ]}.
+ 
+@@ -22,7 +22,7 @@
+   {"", clean, "rm -rf logs"},
+   {"", clean, "rm -rf doc/*.html"},
+   {"", clean, "rm -rf ebin/*"},
+-  {"(linux|darwin|solaris|win32)", clean, "make -C c_src clean"},
++  {"(gnu|linux|darwin|solaris|win32)", clean, "make -C c_src clean"},
+   {"(freebsd)", clean, "gmake -C c_src clean"}
+  ]}.
+