Hello community, here is the log from the commit of package julia for openSUSE:Factory checked in at 2015-01-03 22:00:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-12-23 11:49:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.julia.new/julia.changes 2015-01-03 22:00:56.000000000 +0100 @@ -1,0 +2,16 @@ +Mon Dec 29 02:29:15 UTC 2014 - ronisbr@gmail.com + +- Update to version 0.3.4 + * Bugfix release, no changelog available + +- Set USE_SYSTEM_LIBM=0 + * If USE_SYSTEM_LIBM is set to 1, then julia will not use + openlibm. + +- Set MARCH=pentium4 (32 bits) / MARCH=core2 (64 bits) + +- Add libarpack2 to the dependency list + +- Remove upstreamed julia-upstream-9221.patch + +------------------------------------------------------------------- Old: ---- julia-0.3.3.tar.gz julia-upstream-9221.patch libuv-a12eb33.tar.gz New: ---- julia-0.3.4.tar.gz libuv-abcbb0c.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ julia.spec ++++++ --- /var/tmp/diff_new_pack.w2ShhJ/_old 2015-01-03 22:00:57.000000000 +0100 +++ /var/tmp/diff_new_pack.w2ShhJ/_new 2015-01-03 22:00:57.000000000 +0100 @@ -17,10 +17,10 @@ Name: julia -Version: 0.3.3 +Version: 0.3.4 Release: 0 %define rmath_ver 226598f -%define libuv_ver a12eb33 +%define libuv_ver abcbb0c Summary: High-level, high-performance dynamic programming language License: MIT and GPL-2.0+ Group: Development/Languages/Other @@ -30,8 +30,6 @@ # 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 @@ -64,6 +62,7 @@ Requires: ncurses Requires: readline # Julia uses dlopen +Requires: libarpack2 Requires: libblas3 Requires: libfftw3_threads3 Requires: liblapack3 @@ -76,6 +75,7 @@ Recommends: openspecfun-devel Recommends: pcre-devel Recommends: suitesparse-devel +Recommends: arpack-ng-devel %description Julia is a high-level, high-performance dynamic programming language for @@ -122,9 +122,6 @@ # 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} @@ -134,15 +131,20 @@ %build %ifarch x86_64 -%define julia_cpu_target core2 +%define julia_march core2 %else -%define julia_cpu_target i386 +%define julia_march pentium4 %endif -make %{?_smp_mflags} JULIA_CPU_TARGET=%{julia_cpu_target} %{juliabuildopts} +make %{?_smp_mflags} MARCH=%{julia_march} \ + prefix=%{_prefix} \ + libdir=%{_libdir} \ + sysconfdir=%{_sysconfdir} \ + %{juliabuildopts} %install make install DESTDIR=%{buildroot} \ + MARCH=%{julia_march} \ prefix=%{_prefix} \ libdir=%{_libdir} \ sysconfdir=%{_sysconfdir} \ @@ -194,6 +196,7 @@ %defattr(-,root,root) %{_bindir}/julia-debug %{_datadir}/julia/test/ +%{_datadir}/julia/build_sysimg.jl %{_includedir}/julia/ %{_libdir}/libjulia.so %{_libdir}/julia/libjulia-debug.so ++++++ _service ++++++ --- /var/tmp/diff_new_pack.w2ShhJ/_old 2015-01-03 22:00:57.000000000 +0100 +++ /var/tmp/diff_new_pack.w2ShhJ/_new 2015-01-03 22:00:57.000000000 +0100 @@ -9,10 +9,10 @@ <param name="url">https://github.com/JuliaLang/libuv.git</param> <param name="scm">git</param> <param name="versionformat">%h</param> - <param name="revision">a12eb33</param> + <param name="revision">abcbb0c</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">gz</param> </service> -</services> \ No newline at end of file +</services> ++++++ julia-0.3.3.tar.gz -> julia-0.3.4.tar.gz ++++++ ++++ 4854 lines of diff (skipped) ++++++ juliabuildopts ++++++ --- /var/tmp/diff_new_pack.w2ShhJ/_old 2015-01-03 22:00:58.000000000 +0100 +++ /var/tmp/diff_new_pack.w2ShhJ/_new 2015-01-03 22:00:58.000000000 +0100 @@ -2,7 +2,7 @@ USE_SYSTEM_LIBUNWIND=1 \ USE_SYSTEM_READLINE=1 \ USE_SYSTEM_PCRE=1 \ -USE_SYSTEM_LIBM=1 \ +USE_SYSTEM_LIBM=0 \ USE_SYSTEM_OPENLIBM=1 \ USE_SYSTEM_OPENSPECFUN=1 \ USE_SYSTEM_DSFMT=1 \ @@ -28,4 +28,4 @@ LLVM_LLC=llc \ LLVM_CONFIG=/usr/bin/llvm-config \ VERBOSE=1 \ -USECLANG=1 \ No newline at end of file +USECLANG=1 ++++++ libuv-a12eb33.tar.gz -> libuv-abcbb0c.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libuv-a12eb33/Makefile.am new/libuv-abcbb0c/Makefile.am --- old/libuv-a12eb33/Makefile.am 2014-08-16 15:11:32.000000000 +0200 +++ new/libuv-abcbb0c/Makefile.am 2014-12-26 14:23:51.000000000 +0100 @@ -308,7 +308,7 @@ if HAVE_DTRACE include/uv-dtrace.h: src/unix/uv-dtrace.d - $(AM_V_GEN)$(DTRACE) $(DTRACEFLAGS) -h -xnolibs -s $< -o $(top_srcdir)/$@ + $(AM_V_GEN)$(DTRACE) $(DTRACEFLAGS) -h -s $< -o $(top_srcdir)/$@ endif if DTRACE_NEEDS_OBJECTS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libuv-a12eb33/Makefile.in new/libuv-abcbb0c/Makefile.in --- old/libuv-a12eb33/Makefile.in 2014-08-16 15:11:32.000000000 +0200 +++ new/libuv-abcbb0c/Makefile.in 2014-12-26 14:23:51.000000000 +0100 @@ -3949,7 +3949,7 @@ @HAVE_DTRACE_TRUE@include/uv-dtrace.h: src/unix/uv-dtrace.d -@HAVE_DTRACE_TRUE@ $(AM_V_GEN)$(DTRACE) $(DTRACEFLAGS) -h -xnolibs -s $< -o $(top_srcdir)/$@ +@HAVE_DTRACE_TRUE@ $(AM_V_GEN)$(DTRACE) $(DTRACEFLAGS) -h -s $< -o $(top_srcdir)/$@ @DTRACE_NEEDS_OBJECTS_TRUE@src/unix/uv-dtrace.o: src/unix/uv-dtrace.d ${libuv_la_OBJECTS} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libuv-a12eb33/src/unix/internal.h new/libuv-abcbb0c/src/unix/internal.h --- old/libuv-a12eb33/src/unix/internal.h 2014-08-16 15:11:32.000000000 +0200 +++ new/libuv-abcbb0c/src/unix/internal.h 2014-12-26 14:23:51.000000000 +0100 @@ -138,8 +138,7 @@ UV_TCP_KEEPALIVE = 0x800, /* Turn on keep-alive. */ UV_TCP_SINGLE_ACCEPT = 0x1000, /* Only accept() when idle. */ UV_HANDLE_IPV6 = 0x2000, /* Handle is bound to a IPv6 socket. */ - UV__PIPE_IPC = 0x400, - UV__PIPE_SPAWN_SAFE = 0x800, + UV__PIPE_IPC = 0x4000, /* Pipe handle may be used for IPC */ }; typedef enum { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libuv-a12eb33/src/unix/pipe.c new/libuv-abcbb0c/src/unix/pipe.c --- old/libuv-a12eb33/src/unix/pipe.c 2014-08-16 15:11:32.000000000 +0200 +++ new/libuv-abcbb0c/src/unix/pipe.c 2014-12-26 14:23:51.000000000 +0100 @@ -35,9 +35,9 @@ handle->shutdown_req = NULL; handle->connect_req = NULL; handle->pipe_fname = NULL; - + handle->flags |= ((flags&UV_PIPE_IPC)?UV__PIPE_IPC:0)| - ((flags&UV_PIPE_SPAWN_SAFE)?UV__PIPE_SPAWN_SAFE:0)| + ((flags&UV_PIPE_SPAWN_SAFE)?UV_STREAM_BLOCKING:0)| ((flags&UV_PIPE_READABLE)?UV_STREAM_READABLE:0)| ((flags&UV_PIPE_WRITABLE)?UV_STREAM_WRITABLE:0); /*if (flags == 0 || flags == 1) @@ -107,25 +107,30 @@ return err; } + int uv_pipe_link(uv_pipe_t *read, uv_pipe_t *write) { int fds[2]; int err; int flags; - assert(read->loop==write->loop); - assert(read->flags&UV_STREAM_READABLE); - assert(write->flags&UV_STREAM_WRITABLE); - assert(!(write->flags&read->flags&UV__PIPE_IPC)); - - flags = ((read->flags & UV_PIPE_SPAWN_SAFE)==(write->flags & UV_PIPE_SPAWN_SAFE) && - (write->flags & UV_PIPE_SPAWN_SAFE) != 0) ? UV__F_NONBLOCK : 0; + assert(read->loop == write->loop); + assert(read->flags & UV_STREAM_READABLE); + assert(write->flags & UV_STREAM_WRITABLE); + assert(!(write->flags & UV__PIPE_IPC)); /* IPC requires a socket (recvmsg/ENOTSOCK) */ + assert(!(write->flags & UV__PIPE_IPC)); /* IPC requires a socket (recvmsg/ENOTSOCK) */ + + if (!(read->flags & UV_STREAM_BLOCKING) && + !(write->flags & UV_STREAM_BLOCKING)) + flags = UV__F_NONBLOCK; + else + flags = 0; uv__make_pipe(fds,flags); - if(flags == 0) { - if (~(read->flags & UV_PIPE_SPAWN_SAFE)) + if (flags == 0) { + if (!(read->flags & UV_STREAM_BLOCKING)) uv__nonblock(fds[0], 1); - if (~(write->flags & UV_PIPE_SPAWN_SAFE)) + if (!(write->flags & UV_STREAM_BLOCKING)) uv__nonblock(fds[1], 1); } @@ -145,7 +150,7 @@ } return 0; - + pipe_error: return -1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libuv-a12eb33/src/uv-common.h new/libuv-abcbb0c/src/uv-common.h --- old/libuv-a12eb33/src/uv-common.h 2014-08-16 15:11:32.000000000 +0200 +++ new/libuv-abcbb0c/src/uv-common.h 2014-12-26 14:23:51.000000000 +0100 @@ -47,9 +47,9 @@ #ifndef _WIN32 enum { - UV__HANDLE_INTERNAL = 0x8000, - UV__HANDLE_ACTIVE = 0x4000, - UV__HANDLE_REF = 0x2000, + UV__HANDLE_INTERNAL = 0x40000000, + UV__HANDLE_ACTIVE = 0x20000000, + UV__HANDLE_REF = 0x10000000, UV__HANDLE_CLOSING = 0 /* no-op on unix */ }; #else -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org