Date: Thursday, December 20, 2018 @ 14:19:22
Author: arodseth
Revision: 417007
upgpkg: julia 2:1.0.3-1
Added:
julia/trunk/libunwind-version.patch
(from rev 417006, julia/trunk/julia-libunwind-version.diff)
julia/trunk/makefile.patch
(from rev 417006, julia/trunk/julia-makefile.diff)
Modified:
julia/trunk/PKGBUILD
Deleted:
julia/trunk/julia-libunwind-version.diff
julia/trunk/julia-makefile.diff
------------------------------+
PKGBUILD | 30 +++++++++++++++---------------
julia-libunwind-version.diff | 17 -----------------
julia-makefile.diff | 12 ------------
libunwind-version.patch | 17 +++++++++++++++++
makefile.patch | 12 ++++++++++++
5 files changed, 44 insertions(+), 44 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-12-20 13:40:41 UTC (rev 417006)
+++ PKGBUILD 2018-12-20 14:19:22 UTC (rev 417007)
@@ -8,7 +8,7 @@
pkgbase=julia
pkgname=(julia julia-docs)
epoch=2
-pkgver=1.0.2
+pkgver=1.0.3
pkgrel=1
arch=('x86_64')
pkgdesc='High-level, high-performance, dynamic programming language'
@@ -18,11 +18,11 @@
'openblas' 'suitesparse')
makedepends=('cmake' 'gcc-fortran' 'gmp' 'python2')
source=("https://github.com/JuliaLang/$pkgbase/releases/download/v$pkgver/$pkgbase-$pkgver-full.tar.gz"{,.asc}
-
'https://github.com/JuliaLang/julia/pull/29540/commits/0c442318196389d653ee21eba65d8c4f7beb72a0.patch'
- 'julia-libunwind-version.diff'
- 'julia-makefile.diff'
+
'cblas.patch::https://github.com/JuliaLang/julia/pull/29540/commits/0c442318196389d653ee21eba65d8c4f7beb72a0.patch'
+ 'libunwind-version.patch'
+ 'makefile.patch'
'Make.user')
-sha256sums=('74c850516b293029fcefb1114145c424cab64e1d2f87264350d88a237f5f8bc5'
+sha256sums=('618e6d29f1fba00f5b2bebf14e69a3a536c27c3132e021cf39774e8500dd29fa'
'SKIP'
'88fcbd8a2450027aada0892a60c49c891a8dae43ee6c19e64364b1a1373d50bc'
'22974e1a6602c250cd993cc89cf38fd24668617484f44cadd60665e9af15207b'
@@ -32,17 +32,17 @@
validpgpkeys=('3673DF529D9049477F76B37566E3C7DC03D6E495')
prepare() {
- cd $pkgbase
+ cd $pkgbase-$pkgver
# add and use option to build with system cblas
- patch -p1 --no-backup-if-mismatch -i
../0c442318196389d653ee21eba65d8c4f7beb72a0.patch
+ patch -p1 --no-backup-if-mismatch -i ../cblas.patch
# https://github.com/JuliaLang/julia/pull/29082
msg2 'Fixing libunwind version check...'
- patch -p1 -i ../julia-libunwind-version.diff
+ patch -p1 -i ../libunwind-version.patch
msg2 'Patching make install...'
- patch -p0 -i ../julia-makefile.diff
+ patch -p0 -i ../makefile.patch
msg2 'Configuring the build...'
cp -f ../Make.user Make.user
@@ -49,11 +49,11 @@
}
build() {
- env CFLAGS="$CFLAGS -w" CXXFLAGS="$CXXFLAGS -w" make -C "$pkgbase"
+ env CFLAGS="$CFLAGS -w" CXXFLAGS="$CXXFLAGS -w" make -C $pkgbase-$pkgver
}
check() {
- cd "$pkgbase/test"
+ cd $pkgbase-$pkgver/test
# this is the make testall target, plus the --skip option from
# travis/appveyor/circleci (one test fails with DNS resolution errors)
@@ -66,13 +66,13 @@
backup=('etc/julia/startup.jl')
optdepends=('gnuplot: If using the Gaston Package from julia')
- make -C "$pkgbase" DESTDIR="$pkgdir" install
+ make -C $pkgbase-$pkgver DESTDIR="$pkgdir" install
# Documentation is in the julia-docs package.
# Man pages in /usr/share/julia/doc/man are duplicate.
rm -rf "$pkgdir/usr/share/"{doc,julia/doc}
- install -Dm644 "$pkgbase/LICENSE.md" \
+ install -Dm644 $pkgbase-$pkgver/LICENSE.md \
"$pkgdir/usr/share/licenses/$pkgname/LICENSE.md"
}
@@ -81,9 +81,9 @@
depends=('julia')
install -d "$pkgdir/usr/share/doc"
- cp -r "$pkgbase/doc" "$pkgdir/usr/share/doc/$pkgbase"
+ cp -r $pkgbase-$pkgver/doc "$pkgdir/usr/share/doc/$pkgbase"
rm -rf "$pkgdir/usr/share/doc/julia/man"
- install -Dm644 "$pkgbase/LICENSE.md" \
+ install -Dm644 $pkgbase-$pkgver/LICENSE.md \
"$pkgdir/usr/share/licenses/$pkgname/LICENSE.md"
}
Deleted: julia-libunwind-version.diff
===================================================================
--- julia-libunwind-version.diff 2018-12-20 13:40:41 UTC (rev 417006)
+++ julia-libunwind-version.diff 2018-12-20 14:19:22 UTC (rev 417007)
@@ -1,17 +0,0 @@
-diff --git a/src/julia_internal.h b/src/julia_internal.h
-index 186b5d7b2b..33143f2062 100644
---- a/src/julia_internal.h
-+++ b/src/julia_internal.h
-@@ -623,12 +623,9 @@ extern volatile int jl_in_stackwalk;
- # include <libunwind.h>
- typedef unw_context_t bt_context_t;
- typedef unw_cursor_t bt_cursor_t;
--# if (!defined(SYSTEM_LIBUNWIND) || UNW_VERSION_MAJOR > 1 || \
-- (UNW_VERSION_MAJOR == 1 && UNW_VERSION_MINOR > 1))
- // Enable our memory manager only for libunwind with our patch or
- // on a newer release
- # define JL_UNW_HAS_FORMAT_IP 1
--# endif
- #else
- // Unwinding is disabled
- typedef int bt_context_t;
Deleted: julia-makefile.diff
===================================================================
--- julia-makefile.diff 2018-12-20 13:40:41 UTC (rev 417006)
+++ julia-makefile.diff 2018-12-20 14:19:22 UTC (rev 417007)
@@ -1,12 +0,0 @@
---- Makefile.orig 2018-09-03 15:46:25.081697186 +0000
-+++ Makefile 2018-09-03 15:46:43.958418721 +0000
-@@ -316,8 +316,7 @@
- $(build_depsbindir)/stringreplace $$(strings -t x - $1 | grep '$2' |
awk '{print $$1;}') '$3' 255 "$(call cygpath_w,$1)"
- endef
-
--install: $(build_depsbindir)/stringreplace
$(BUILDROOT)/doc/_build/html/en/index.html
-- @$(MAKE) $(QUIET_MAKE) all
-+install:
- @for subdir in $(bindir) $(datarootdir)/julia/stdlib/$(VERSDIR)
$(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir)
$(sysconfdir); do \
- mkdir -p $(DESTDIR)$$subdir; \
- done
Copied: julia/trunk/libunwind-version.patch (from rev 417006,
julia/trunk/julia-libunwind-version.diff)
===================================================================
--- libunwind-version.patch (rev 0)
+++ libunwind-version.patch 2018-12-20 14:19:22 UTC (rev 417007)
@@ -0,0 +1,17 @@
+diff --git a/src/julia_internal.h b/src/julia_internal.h
+index 186b5d7b2b..33143f2062 100644
+--- a/src/julia_internal.h
++++ b/src/julia_internal.h
+@@ -623,12 +623,9 @@ extern volatile int jl_in_stackwalk;
+ # include <libunwind.h>
+ typedef unw_context_t bt_context_t;
+ typedef unw_cursor_t bt_cursor_t;
+-# if (!defined(SYSTEM_LIBUNWIND) || UNW_VERSION_MAJOR > 1 || \
+- (UNW_VERSION_MAJOR == 1 && UNW_VERSION_MINOR > 1))
+ // Enable our memory manager only for libunwind with our patch or
+ // on a newer release
+ # define JL_UNW_HAS_FORMAT_IP 1
+-# endif
+ #else
+ // Unwinding is disabled
+ typedef int bt_context_t;
Copied: julia/trunk/makefile.patch (from rev 417006,
julia/trunk/julia-makefile.diff)
===================================================================
--- makefile.patch (rev 0)
+++ makefile.patch 2018-12-20 14:19:22 UTC (rev 417007)
@@ -0,0 +1,12 @@
+--- Makefile.orig 2018-09-03 15:46:25.081697186 +0000
++++ Makefile 2018-09-03 15:46:43.958418721 +0000
+@@ -316,8 +316,7 @@
+ $(build_depsbindir)/stringreplace $$(strings -t x - $1 | grep '$2' |
awk '{print $$1;}') '$3' 255 "$(call cygpath_w,$1)"
+ endef
+
+-install: $(build_depsbindir)/stringreplace
$(BUILDROOT)/doc/_build/html/en/index.html
+- @$(MAKE) $(QUIET_MAKE) all
++install:
+ @for subdir in $(bindir) $(datarootdir)/julia/stdlib/$(VERSDIR)
$(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir)
$(sysconfdir); do \
+ mkdir -p $(DESTDIR)$$subdir; \
+ done
