Hello community,

here is the log from the commit of package julia for openSUSE:Factory checked 
in at 2014-12-23 11:50:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/julia (Old)
 and      /work/SRC/openSUSE:Factory/.julia.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "julia"

Changes:
--------
--- /work/SRC/openSUSE:Factory/julia/julia.changes      2014-11-26 
22:57:45.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.julia.new/julia.changes 2014-12-23 
11:49:15.000000000 +0100
@@ -1,0 +2,18 @@
+Sat Dec 20 19:42:31 UTC 2014 - [email protected]
+
+- Add julia-upstream-9221.patch to temporarily fix the upstream issue:
+  https://github.com/JuliaLang/julia/issues/8690 
+
+-------------------------------------------------------------------
+Sat Dec 20 19:35:16 UTC 2014 - [email protected]
+
+- Fix bug related with build architecture (JULIA_CPU_TARGET) that 
+  was added by revision 15 of science repo.
+
+-------------------------------------------------------------------
+Fri Dec 19 13:07:48 UTC 2014 - [email protected]
+
+- Deduce JULIA_TARGET_ARCH from RPM build flags, specifying just
+  JULIA_CPU_TARGET=core2 is not portable
+
+-------------------------------------------------------------------

New:
----
  julia-upstream-9221.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ julia.spec ++++++
--- /var/tmp/diff_new_pack.MyqMr9/_old  2014-12-23 11:49:16.000000000 +0100
+++ /var/tmp/diff_new_pack.MyqMr9/_new  2014-12-23 11:49:16.000000000 +0100
@@ -30,6 +30,8 @@
 # external sources
 Source10:       libuv-%{libuv_ver}.tar.gz
 Source11:       Rmath-%{rmath_ver}.tar.gz
+# PATCH-FIX-UPSTREAM julia-upstream-9221.patch Temporary fix for the upstream 
issue #8690
+Patch0:         julia-upstream-9221.patch
 BuildRequires:  arpack-ng-devel
 BuildRequires:  blas-devel
 BuildRequires:  dSFMT-devel
@@ -120,6 +122,9 @@
 # remove .gitignore
 find . -name ".git*" -exec rm {} \;
 
+# Apply the patch to temporarily fix the upstream issue #8690
+%patch0 -p1
+
 cd deps
 tar xzf %{SOURCE10}
 tar xzf %{SOURCE11}
@@ -127,7 +132,14 @@
 mv -T libuv-%{libuv_ver} libuv
 
 %build
-make %{?_smp_mflags} %{juliabuildopts}
+
+%ifarch x86_64
+%define julia_cpu_target core2
+%else
+%define julia_cpu_target i386
+%endif
+
+make %{?_smp_mflags} JULIA_CPU_TARGET=%{julia_cpu_target} %{juliabuildopts}
 
 %install
 make install DESTDIR=%{buildroot} \


++++++ julia-upstream-9221.patch ++++++
>From 22c3c9ab89a4f4051d147fe1cf355c767cd967ba Mon Sep 17 00:00:00 2001
From: Tracy Wadleigh <[email protected]>
Date: Tue, 2 Dec 2014 12:09:55 -0500
Subject: [PATCH 1/2] Added uv.h and dependencies to distribution.

---
 Makefile | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Makefile b/Makefile
index 03d203c..72de1c2 100644
--- a/Makefile
+++ b/Makefile
@@ -261,6 +261,15 @@ endif
        done
 endif
 
+ifeq ($(USE_SYSTEM_LIBUV),0)
+ifeq ($(OS),WINNT)
+       $(INSTALL_M) $(build_libdir)/libuv.a $(DESTDIR)$(private_libdir)
+       $(INSTALL_F) $(build_includedir)/tree.h $(DESTDIR)$(includedir)/julia
+else
+       $(INSTALL_M) $(build_libdir)/libuv.a $(DESTDIR)$(private_libdir)
+endif  
+       $(INSTALL_F) $(build_includedir)/uv* $(DESTDIR)$(includedir)/julia
+endif
        $(INSTALL_F) src/julia.h src/options.h src/support/*.h 
$(DESTDIR)$(includedir)/julia
        # Copy system image
        $(INSTALL_F) $(build_private_libdir)/sys.ji $(DESTDIR)$(private_libdir)

>From bd9a1bc2ac7e157668459714fc0a0ed1a5dd168a Mon Sep 17 00:00:00 2001
From: Tracy Wadleigh <[email protected]>
Date: Thu, 11 Dec 2014 17:30:59 -0500
Subject: [PATCH 2/2] Remove references to installing libuv.a

---
 Makefile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Makefile b/Makefile
index 72de1c2..851b053 100644
--- a/Makefile
+++ b/Makefile
@@ -263,10 +263,7 @@ endif
 
 ifeq ($(USE_SYSTEM_LIBUV),0)
 ifeq ($(OS),WINNT)
-       $(INSTALL_M) $(build_libdir)/libuv.a $(DESTDIR)$(private_libdir)
        $(INSTALL_F) $(build_includedir)/tree.h $(DESTDIR)$(includedir)/julia
-else
-       $(INSTALL_M) $(build_libdir)/libuv.a $(DESTDIR)$(private_libdir)
 endif  
        $(INSTALL_F) $(build_includedir)/uv* $(DESTDIR)$(includedir)/julia
 endif
++++++ juliabuildopts ++++++
--- /var/tmp/diff_new_pack.MyqMr9/_old  2014-12-23 11:49:16.000000000 +0100
+++ /var/tmp/diff_new_pack.MyqMr9/_new  2014-12-23 11:49:16.000000000 +0100
@@ -1,4 +1,3 @@
-JULIA_CPU_TARGET=core2 \
 USE_SYSTEM_LLVM=1 \
 USE_SYSTEM_LIBUNWIND=1 \
 USE_SYSTEM_READLINE=1 \

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to