Date: Friday, November 9, 2018 @ 19:45:40 Author: arodseth Revision: 404394
archrelease: copy trunk to community-x86_64 Added: julia/repos/community-x86_64/Make.user (from rev 404393, julia/trunk/Make.user) julia/repos/community-x86_64/PKGBUILD (from rev 404393, julia/trunk/PKGBUILD) julia/repos/community-x86_64/julia-libunwind-version.diff (from rev 404393, julia/trunk/julia-libunwind-version.diff) julia/repos/community-x86_64/julia-makefile.diff (from rev 404393, julia/trunk/julia-makefile.diff) Deleted: julia/repos/community-x86_64/Make.user julia/repos/community-x86_64/PKGBUILD julia/repos/community-x86_64/julia-libunwind-version.diff julia/repos/community-x86_64/julia-makefile.diff ------------------------------+ Make.user | 64 +++++++------- PKGBUILD | 182 ++++++++++++++++++++--------------------- julia-libunwind-version.diff | 34 +++---- julia-makefile.diff | 24 ++--- 4 files changed, 152 insertions(+), 152 deletions(-) Deleted: Make.user =================================================================== --- Make.user 2018-11-09 19:45:28 UTC (rev 404393) +++ Make.user 2018-11-09 19:45:40 UTC (rev 404394) @@ -1,32 +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 = 1 -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 -override USE_LLVM_SHLIB = 0 - -# 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 404393, julia/trunk/Make.user) =================================================================== --- Make.user (rev 0) +++ Make.user 2018-11-09 19:45:40 UTC (rev 404394) @@ -0,0 +1,32 @@ +# 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 = 1 +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 +override USE_LLVM_SHLIB = 0 + +# 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 2018-11-09 19:45:28 UTC (rev 404393) +++ PKGBUILD 2018-11-09 19:45:40 UTC (rev 404394) @@ -1,91 +0,0 @@ -# Maintainer: Alexander F. Rødseth <xypr...@archlinux.org> -# Contributor: Eli Schwartz <eschwa...@archlinux.org> -# Contributor: Lex Black <autumn-w...@web.de> -# Contributor: Michael Jakl <jakl.mich...@gmail.com> -# Contributor: devmotion <nospam-archlinux....@devmotion.de> -# Contributor: Valentin Churavy <v.chur...@gmail.com> - -pkgbase=julia -pkgname=(julia julia-docs) -epoch=2 -pkgver=1.0.1 -pkgrel=2 -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/$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' - 'Make.user') -sha256sums=('874e6e67dedc6b0dfed7faba9963abf1fa8086bd13a4457c05203ab0b78ebd22' - 'SKIP' - '88fcbd8a2450027aada0892a60c49c891a8dae43ee6c19e64364b1a1373d50bc' - '22974e1a6602c250cd993cc89cf38fd24668617484f44cadd60665e9af15207b' - 'b7374fcd5a579fc59d6988795fc0c3cf411a89205942c691a5b3003793ae6c52' - '9381af45e329f874241eec5a5d85e70a7945433ab9ee82215e28a6085783df88') -# Julia (Binary signing key) <build...@julialang.org> -validpgpkeys=('3673DF529D9049477F76B37566E3C7DC03D6E495') - -prepare() { - cd $pkgbase - - # add and use option to build with system cblas - patch -p1 --no-backup-if-mismatch -i ../0c442318196389d653ee21eba65d8c4f7beb72a0.patch - - # https://github.com/JuliaLang/julia/pull/29082 - msg2 'Fixing libunwind version check...' - patch -p1 -i ../julia-libunwind-version.diff - - msg2 'Patching make install...' - patch -p0 -i ../julia-makefile.diff - - msg2 'Configuring the build...' - cp -f ../Make.user Make.user -} - -build() { - env CFLAGS="$CFLAGS -w" CXXFLAGS="$CXXFLAGS -w" make -C "$pkgbase" -} - -check() { - cd "$pkgbase/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 - 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" 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" \ - "$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/doc" "$pkgdir/usr/share/doc/$pkgbase" - rm -rf "$pkgdir/usr/share/doc/julia/man" - install -Dm644 "$pkgbase/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 404393, julia/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-11-09 19:45:40 UTC (rev 404394) @@ -0,0 +1,91 @@ +# Maintainer: Alexander F. Rødseth <xypr...@archlinux.org> +# Contributor: Eli Schwartz <eschwa...@archlinux.org> +# Contributor: Lex Black <autumn-w...@web.de> +# Contributor: Michael Jakl <jakl.mich...@gmail.com> +# Contributor: devmotion <nospam-archlinux....@devmotion.de> +# Contributor: Valentin Churavy <v.chur...@gmail.com> + +pkgbase=julia +pkgname=(julia julia-docs) +epoch=2 +pkgver=1.0.2 +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/$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' + 'Make.user') +sha256sums=('74c850516b293029fcefb1114145c424cab64e1d2f87264350d88a237f5f8bc5' + 'SKIP' + '88fcbd8a2450027aada0892a60c49c891a8dae43ee6c19e64364b1a1373d50bc' + '22974e1a6602c250cd993cc89cf38fd24668617484f44cadd60665e9af15207b' + 'b7374fcd5a579fc59d6988795fc0c3cf411a89205942c691a5b3003793ae6c52' + '9381af45e329f874241eec5a5d85e70a7945433ab9ee82215e28a6085783df88') +# Julia (Binary signing key) <build...@julialang.org> +validpgpkeys=('3673DF529D9049477F76B37566E3C7DC03D6E495') + +prepare() { + cd $pkgbase + + # add and use option to build with system cblas + patch -p1 --no-backup-if-mismatch -i ../0c442318196389d653ee21eba65d8c4f7beb72a0.patch + + # https://github.com/JuliaLang/julia/pull/29082 + msg2 'Fixing libunwind version check...' + patch -p1 -i ../julia-libunwind-version.diff + + msg2 'Patching make install...' + patch -p0 -i ../julia-makefile.diff + + msg2 'Configuring the build...' + cp -f ../Make.user Make.user +} + +build() { + env CFLAGS="$CFLAGS -w" CXXFLAGS="$CXXFLAGS -w" make -C "$pkgbase" +} + +check() { + cd "$pkgbase/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 + 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" 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" \ + "$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/doc" "$pkgdir/usr/share/doc/$pkgbase" + rm -rf "$pkgdir/usr/share/doc/julia/man" + install -Dm644 "$pkgbase/LICENSE.md" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md" +} + +# getver: julialang.org/downloads +# vim: ts=2 sw=2 et: Deleted: julia-libunwind-version.diff =================================================================== --- julia-libunwind-version.diff 2018-11-09 19:45:28 UTC (rev 404393) +++ julia-libunwind-version.diff 2018-11-09 19:45:40 UTC (rev 404394) @@ -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; Copied: julia/repos/community-x86_64/julia-libunwind-version.diff (from rev 404393, julia/trunk/julia-libunwind-version.diff) =================================================================== --- julia-libunwind-version.diff (rev 0) +++ julia-libunwind-version.diff 2018-11-09 19:45:40 UTC (rev 404394) @@ -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; Deleted: julia-makefile.diff =================================================================== --- julia-makefile.diff 2018-11-09 19:45:28 UTC (rev 404393) +++ julia-makefile.diff 2018-11-09 19:45:40 UTC (rev 404394) @@ -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/julia-makefile.diff (from rev 404393, julia/trunk/julia-makefile.diff) =================================================================== --- julia-makefile.diff (rev 0) +++ julia-makefile.diff 2018-11-09 19:45:40 UTC (rev 404394) @@ -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