[arch-commits] Commit in julia/repos/community-x86_64 (8 files)
Alexander Rødseth
arodseth at archlinux.org
Thu Aug 22 15:59:23 UTC 2019
Date: Thursday, August 22, 2019 @ 15:59:22
Author: arodseth
Revision: 500522
archrelease: copy trunk to community-x86_64
Added:
julia/repos/community-x86_64/Make.user
(from rev 500521, julia/trunk/Make.user)
julia/repos/community-x86_64/PKGBUILD
(from rev 500521, julia/trunk/PKGBUILD)
julia/repos/community-x86_64/libunwind-version.patch
(from rev 500521, julia/trunk/libunwind-version.patch)
julia/repos/community-x86_64/makefile.patch
(from rev 500521, julia/trunk/makefile.patch)
Deleted:
julia/repos/community-x86_64/Make.user
julia/repos/community-x86_64/PKGBUILD
julia/repos/community-x86_64/libunwind-version.patch
julia/repos/community-x86_64/makefile.patch
-------------------------+
Make.user | 68 ++++++++--------
PKGBUILD | 192 +++++++++++++++++++++++-----------------------
libunwind-version.patch | 34 ++++----
makefile.patch | 24 ++---
4 files changed, 159 insertions(+), 159 deletions(-)
Deleted: Make.user
===================================================================
--- Make.user 2019-08-22 15:59:15 UTC (rev 500521)
+++ Make.user 2019-08-22 15:59:22 UTC (rev 500522)
@@ -1,34 +0,0 @@
-# vim: set ft=make:
-
-override prefix = /usr
-override sysconfdir = /etc
-override MARCH = x86-64
-override JULIA_BUILD_MODE = release
-override USE_BLAS64 = 0
-override USE_SYSTEM_DSFMT = 0
-override USE_SYSTEM_FFTW = 1
-override USE_SYSTEM_GMP = 1
-override USE_SYSTEM_LIBGIT2 = 0
-override USE_SYSTEM_LIBM = 0
-override USE_SYSTEM_LIBUNWIND = 1
-override USE_SYSTEM_MPFR = 0
-override USE_SYSTEM_OPENLIBM = 0
-override USE_SYSTEM_OPENSPECFUN = 0
-override USE_SYSTEM_PCRE = 0
-override USE_SYSTEM_SUITESPARSE = 1
-override USE_SYSTEM_UTF8PROC = 1
-
-# system blas with cblas symbols linked too
-override USE_SYSTEM_BLAS = 1
-override USE_SYSTEM_CBLAS = 1
-override USE_SYSTEM_LAPACK = 1
-
-# FS#57387
-override USE_SYSTEM_LLVM = 0
-
-# FS#60227
-override USE_LLVM_SHLIB = 1
-
-# patchelf is not even used unless $(private_libdir_rel) != $(build_private_libdir_rel)
-# but we USE_SYSTEM_PATCHELF=1 to prevent building it. This is why it is not in makedepends.
-override USE_SYSTEM_PATCHELF = 1
Copied: julia/repos/community-x86_64/Make.user (from rev 500521, julia/trunk/Make.user)
===================================================================
--- Make.user (rev 0)
+++ Make.user 2019-08-22 15:59:22 UTC (rev 500522)
@@ -0,0 +1,34 @@
+# vim: set ft=make:
+
+override prefix = /usr
+override sysconfdir = /etc
+override MARCH = x86-64
+override JULIA_BUILD_MODE = release
+override USE_BLAS64 = 0
+override USE_SYSTEM_DSFMT = 0
+override USE_SYSTEM_FFTW = 1
+override USE_SYSTEM_GMP = 1
+override USE_SYSTEM_LIBGIT2 = 0
+override USE_SYSTEM_LIBM = 0
+override USE_SYSTEM_LIBUNWIND = 1
+override USE_SYSTEM_MPFR = 0
+override USE_SYSTEM_OPENLIBM = 0
+override USE_SYSTEM_OPENSPECFUN = 0
+override USE_SYSTEM_PCRE = 0
+override USE_SYSTEM_SUITESPARSE = 1
+override USE_SYSTEM_UTF8PROC = 1
+
+# system blas with cblas symbols linked too
+override USE_SYSTEM_BLAS = 1
+override USE_SYSTEM_CBLAS = 1
+override USE_SYSTEM_LAPACK = 1
+
+# FS#57387
+override USE_SYSTEM_LLVM = 0
+
+# FS#60227
+override USE_LLVM_SHLIB = 1
+
+# patchelf is not even used unless $(private_libdir_rel) != $(build_private_libdir_rel)
+# but we USE_SYSTEM_PATCHELF=1 to prevent building it. This is why it is not in makedepends.
+override USE_SYSTEM_PATCHELF = 1
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-08-22 15:59:15 UTC (rev 500521)
+++ PKGBUILD 2019-08-22 15:59:22 UTC (rev 500522)
@@ -1,96 +0,0 @@
-# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
-# Contributor: Eli Schwartz <eschwartz at archlinux.org>
-# Contributor: Lex Black <autumn-wind at web.de>
-# Contributor: Michael Jakl <jakl.michael at gmail.com>
-# Contributor: devmotion <nospam-archlinux.org at devmotion.de>
-# Contributor: Valentin Churavy <v.churavy at gmail.com>
-
-pkgbase=julia
-pkgname=(julia julia-docs)
-epoch=2
-pkgver=1.1.1
-pkgrel=3
-arch=(x86_64)
-pkgdesc='High-level, high-performance, dynamic programming language'
-url='https://julialang.org/'
-license=(MIT)
-depends=(cblas fftw hicolor-icon-theme libgit2 libunwind libutf8proc openblas
- suitesparse)
-makedepends=(cmake gcc-fortran gmp python2)
-source=("https://github.com/JuliaLang/julia/releases/download/v$pkgver/$pkgbase-$pkgver-full.tar.gz"{,.asc}
- 'cblas.patch::https://github.com/JuliaLang/julia/pull/29540/commits/0c442318196389d653ee21eba65d8c4f7beb72a0.patch'
- libunwind-version.patch
- makefile.patch
- Make.user)
-sha256sums=('3c5395dd3419ebb82d57bcc49dc729df3b225b9094e74376f8c649ee35ed79c2'
- 'SKIP'
- '88fcbd8a2450027aada0892a60c49c891a8dae43ee6c19e64364b1a1373d50bc'
- 'a5eec1e43e1161c313b1d32a5f35a67d6b4a2bbc2d6d324c010f6f2b35be4a72'
- 'b7374fcd5a579fc59d6988795fc0c3cf411a89205942c691a5b3003793ae6c52'
- '1c47e6fbe296a3186526880321542ac218ccea94eab8bdd752c762c49f01f65a')
-# Julia (Binary signing key) <buildbot at julialang.org>
-validpgpkeys=('3673DF529D9049477F76B37566E3C7DC03D6E495')
-
-prepare() {
- cd $pkgbase-$pkgver
-
- # Add and use option to build with system cblas
- patch -p1 --no-backup-if-mismatch -i ../cblas.patch
-
- # Fixing libunwind version check
- # https://github.com/JuliaLang/julia/pull/29082
- patch -p1 -i ../libunwind-version.patch
-
- # Patching make install
- patch -p0 -i ../makefile.patch
-
- # Configuring the build
- cp -f ../Make.user Make.user
-
- # Prepare a symlink from "python" to "python2"
- mkdir -p "$srcdir/bin"
- ln -s /usr/bin/python2 "$srcdir/bin/python"
-}
-
-build() {
- export PATH="$srcdir/bin:$PATH"
- env CFLAGS="$CFLAGS -w" CXXFLAGS="$CXXFLAGS -w" make -C $pkgbase-$pkgver
-}
-
-check() {
- 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)
- ../julia --check-bounds=yes --startup-file=no ./runtests.jl all --skip Sockets --skip Distributed
- find ../stdlib \( -name \*.cov -o -name \*.mem \) -delete
- rm -r depot/compiled
-}
-
-package_julia() {
- backup=(etc/julia/startup.jl)
- optdepends=('gnuplot: If using the Gaston Package from julia')
-
- 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-$pkgver/LICENSE.md \
- "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md"
-}
-
-package_julia-docs() {
- pkgdesc='Documentation and examples for Julia'
- depends=(julia)
-
- install -d "$pkgdir/usr/share/doc"
- cp -r $pkgbase-$pkgver/doc "$pkgdir/usr/share/doc/$pkgbase"
- rm -rf "$pkgdir/usr/share/doc/julia/man"
- install -Dm644 $pkgbase-$pkgver/LICENSE.md \
- "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md"
-}
-
-# getver: julialang.org/downloads
-# vim: ts=2 sw=2 et:
Copied: julia/repos/community-x86_64/PKGBUILD (from rev 500521, julia/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-08-22 15:59:22 UTC (rev 500522)
@@ -0,0 +1,96 @@
+# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
+# Contributor: Eli Schwartz <eschwartz at archlinux.org>
+# Contributor: Lex Black <autumn-wind at web.de>
+# Contributor: Michael Jakl <jakl.michael at gmail.com>
+# Contributor: devmotion <nospam-archlinux.org at devmotion.de>
+# Contributor: Valentin Churavy <v.churavy at gmail.com>
+
+pkgbase=julia
+pkgname=(julia julia-docs)
+epoch=2
+pkgver=1.2.0
+pkgrel=1
+arch=(x86_64)
+pkgdesc='High-level, high-performance, dynamic programming language'
+url='https://julialang.org/'
+license=(MIT)
+depends=(cblas fftw hicolor-icon-theme libgit2 libunwind libutf8proc openblas
+ suitesparse)
+makedepends=(cmake gcc-fortran gmp python2)
+source=("https://github.com/JuliaLang/julia/releases/download/v$pkgver/$pkgbase-$pkgver-full.tar.gz"{,.asc}
+ 'cblas.patch::https://github.com/JuliaLang/julia/pull/29540/commits/0c442318196389d653ee21eba65d8c4f7beb72a0.patch'
+ libunwind-version.patch
+ makefile.patch
+ Make.user)
+sha256sums=('2419b268fc5c3666dd9aeb554815fe7cf9e0e7265bc9b94a43957c31a68d9184'
+ 'SKIP'
+ '88fcbd8a2450027aada0892a60c49c891a8dae43ee6c19e64364b1a1373d50bc'
+ 'a5eec1e43e1161c313b1d32a5f35a67d6b4a2bbc2d6d324c010f6f2b35be4a72'
+ 'b7374fcd5a579fc59d6988795fc0c3cf411a89205942c691a5b3003793ae6c52'
+ '1c47e6fbe296a3186526880321542ac218ccea94eab8bdd752c762c49f01f65a')
+# Julia (Binary signing key) <buildbot at julialang.org>
+validpgpkeys=('3673DF529D9049477F76B37566E3C7DC03D6E495')
+
+prepare() {
+ cd $pkgbase-$pkgver
+
+ # Add and use option to build with system cblas
+ patch -p1 --no-backup-if-mismatch -i ../cblas.patch
+
+ # Fixing libunwind version check
+ # https://github.com/JuliaLang/julia/pull/29082
+ patch -p1 -i ../libunwind-version.patch
+
+ # Patching make install
+ #patch -p0 -i ../makefile.patch
+
+ # Configuring the build
+ cp -f ../Make.user Make.user
+
+ # Prepare a symlink from "python" to "python2"
+ mkdir -p "$srcdir/bin"
+ ln -s /usr/bin/python2 "$srcdir/bin/python"
+}
+
+build() {
+ export PATH="$srcdir/bin:$PATH"
+ env CFLAGS="$CFLAGS -w" CXXFLAGS="$CXXFLAGS -w" make -C $pkgbase-$pkgver
+}
+
+check() {
+ 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)
+ ../julia --check-bounds=yes --startup-file=no ./runtests.jl all --skip Sockets --skip Distributed
+ find ../stdlib \( -name \*.cov -o -name \*.mem \) -delete
+ rm -r depot/compiled
+}
+
+package_julia() {
+ backup=(etc/julia/startup.jl)
+ optdepends=('gnuplot: If using the Gaston Package from julia')
+
+ 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-$pkgver/LICENSE.md \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md"
+}
+
+package_julia-docs() {
+ pkgdesc='Documentation and examples for Julia'
+ depends=(julia)
+
+ install -d "$pkgdir/usr/share/doc"
+ cp -r $pkgbase-$pkgver/doc "$pkgdir/usr/share/doc/$pkgbase"
+ rm -rf "$pkgdir/usr/share/doc/julia/man"
+ install -Dm644 $pkgbase-$pkgver/LICENSE.md \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md"
+}
+
+# getver: julialang.org/downloads
+# vim: ts=2 sw=2 et:
Deleted: libunwind-version.patch
===================================================================
--- libunwind-version.patch 2019-08-22 15:59:15 UTC (rev 500521)
+++ libunwind-version.patch 2019-08-22 15:59:22 UTC (rev 500522)
@@ -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 != 0 && 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/repos/community-x86_64/libunwind-version.patch (from rev 500521, julia/trunk/libunwind-version.patch)
===================================================================
--- libunwind-version.patch (rev 0)
+++ libunwind-version.patch 2019-08-22 15:59:22 UTC (rev 500522)
@@ -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 != 0 && 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: makefile.patch
===================================================================
--- makefile.patch 2019-08-22 15:59:15 UTC (rev 500521)
+++ makefile.patch 2019-08-22 15:59:22 UTC (rev 500522)
@@ -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/repos/community-x86_64/makefile.patch (from rev 500521, julia/trunk/makefile.patch)
===================================================================
--- makefile.patch (rev 0)
+++ makefile.patch 2019-08-22 15:59:22 UTC (rev 500522)
@@ -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
More information about the arch-commits
mailing list