Date: Wednesday, April 18, 2018 @ 15:14:09 Author: eschwartz Revision: 316901
archrelease: copy trunk to community-x86_64 Added: julia/repos/community-x86_64/PKGBUILD (from rev 316900, julia/trunk/PKGBUILD) julia/repos/community-x86_64/julia-libunwind-version.patch (from rev 316900, julia/trunk/julia-libunwind-version.patch) julia/repos/community-x86_64/julia-makefile.patch (from rev 316900, julia/trunk/julia-makefile.patch) Deleted: julia/repos/community-x86_64/PKGBUILD julia/repos/community-x86_64/julia-libunwind-version.patch julia/repos/community-x86_64/julia-makefile.patch julia/repos/community-x86_64/sysfix.install -------------------------------+ PKGBUILD | 278 +++++++++++++++++++--------------------- julia-libunwind-version.patch | 30 ++-- julia-makefile.patch | 26 +-- sysfix.install | 13 - 4 files changed, 163 insertions(+), 184 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-04-18 15:13:50 UTC (rev 316900) +++ PKGBUILD 2018-04-18 15:14:09 UTC (rev 316901) @@ -1,143 +0,0 @@ -# $Id$ -# Maintainer: Alexander F Rødseth <xypr...@archlinux.org> -# Contributor: Lex Black <autumn-wind at web dot 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=0.6.2 -pkgrel=6 -arch=('x86_64') -pkgdesc='High-level, high-performance, dynamic programming language' -url='https://julialang.org/' -license=('MIT') -makedepends=('chrpath' 'cmake' 'fftw' 'gcc-fortran' 'gmp' 'libgit2' 'libunwind' 'mpfr' 'pcre2' 'python2' 'suitesparse') -options=('!emptydirs' 'staticlibs') -source=("https://github.com/JuliaLang/$pkgbase/releases/download/v$pkgver/$pkgbase-$pkgver-full.tar.gz"{,.asc} - 'julia-libunwind-version.patch' - 'julia-makefile.patch') -sha256sums=('1e34c13091c9ddb47cf87a51566d94a06613f3db3c483b8f63b276e416dd621b' - 'SKIP' - '16009ce454f58463464027cbaf6186ccfab84c37660a52fb1ec3a0f514df64f9' - '342b43532fbace3508688eee879113160e01cbbda29610b53f2f34796bc0312a') -validpgpkeys=('3673DF529D9049477F76B37566E3C7DC03D6E495') # Julia (Binary signing key) <build...@julialang.org> - -prepare() { - # For /etc/ld.so.conf.d/ - echo /usr/lib/julia > julia.conf - - cd "$pkgbase-$pkgver" - patch -p1 -i ../julia-libunwind-version.patch - patch -p0 -i ../julia-makefile.patch # make 'make install' really just install -} - -build() { - # Make sure not to set -march - export CFLAGS='-mtune=generic -O3 -pipe -fstack-protector-strong' - export CXXFLAGS='-mtune=generic -O3 -pipe -fstack-protector-strong' - - unset ARCH - - # See FS#57387 for why USE_SYSTEM_LLVM=0, for now - # See FS#58221 for why USE_SYSTEM_ARPACK=0, for now - - make -C "$pkgbase-$pkgver" \ - prefix=/usr \ - sysconfdir=/etc \ - MARCH=x86-64 \ - JULIA_BUILD_MODE=release \ - USE_SYSTEM_LLVM=0 \ - USE_SYSTEM_LIBUNWIND=1 \ - USE_SYSTEM_PCRE=1 \ - USE_SYSTEM_LIBM=1 \ - USE_SYSTEM_OPENLIBM=0 \ - USE_SYSTEM_OPENSPECFUN=0 \ - USE_SYSTEM_BLAS=0 \ - USE_SYSTEM_LAPACK=0 \ - USE_SYSTEM_FFTW=1 \ - USE_SYSTEM_GMP=1 \ - USE_SYSTEM_MPFR=1 \ - USE_SYSTEM_ARPACK=0 \ - USE_SYSTEM_SUITESPARSE=1 \ - USE_SYSTEM_LIBUV=0 \ - USE_SYSTEM_UTF8PROC=0 \ - USE_INTEL_MKL=0 \ - USE_BLAS64=0 \ - USE_LLVM_SHLIB=1 \ - USE_SYSTEM_LIBGIT2=1 \ - USE_SYSTEM_PATCHELF=1 \ - USE_SYSTEM_DSFMT=0 -} - -package_julia() { - backup=('etc/ld.so.conf.d/julia.conf' 'etc/julia/juliarc.jl') - depends=('arpack' 'fftw' 'hicolor-icon-theme' 'libgit2' 'libunwind' 'mpfr' 'patchelf' 'pcre2' 'suitesparse') - optdepends=('gnuplot: If using the Gaston Package from julia') - install='sysfix.install' - - # Make sure not to set -march - export CFLAGS="-mtune=generic -O3 -pipe -fstack-protector-strong" - export CXXFLAGS="-mtune=generic -O3 -pipe -fstack-protector-strong" - - unset ARCH - - # See FS#57387 for why USE_SYSTEM_LLVM=0, for now - # See FS#58221 for why USE_SYSTEM_ARPACK=0, for now - - make -C "$pkgbase-$pkgver" \ - DESTDIR="$pkgdir" \ - prefix=/usr \ - sysconfdir=/etc \ - MARCH=x86-64 \ - USE_SYSTEM_LLVM=0 \ - USE_SYSTEM_LIBUNWIND=1 \ - USE_SYSTEM_PCRE=1 \ - USE_SYSTEM_LIBM=1 \ - USE_SYSTEM_OPENLIBM=0 \ - USE_SYSTEM_OPENSPECFUN=0 \ - USE_SYSTEM_BLAS=0 \ - USE_SYSTEM_LAPACK=0 \ - USE_SYSTEM_FFTW=1 \ - USE_SYSTEM_GMP=1 \ - USE_SYSTEM_MPFR=1 \ - USE_SYSTEM_ARPACK=0 \ - USE_SYSTEM_SUITESPARSE=1 \ - USE_SYSTEM_LIBUV=0 \ - USE_SYSTEM_UTF8PROC=0 \ - USE_INTEL_MKL=0 \ - USE_BLAS64=0 \ - USE_LLVM_SHLIB=1 \ - USE_SYSTEM_LIBGIT2=1 \ - USE_SYSTEM_PATCHELF=1 \ - USE_SYSTEM_DSFMT=0 \ - install - - # Remove duplicate man-page from julia/doc - rm -rf "$pkgdir/usr/share/julia/doc/man" - - # For /etc/ld.so.conf.d, FS#41731 - install -Dm644 julia.conf "$pkgdir/etc/ld.so.conf.d/julia.conf" - - # Documentation and examples are in the julia-docs package - rm -rf "$pkgdir/usr/share/"{doc,julia/doc,julia/examples} - - # License - install -Dm644 "$pkgbase-$pkgver/LICENSE.md" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md" -} - -package_julia-docs() { - pkgdesc='Documentation and examples for Julia' - - cd "$pkgbase-$pkgver" - - install -d "$pkgdir/usr/share/doc" - cp -r doc "$pkgdir/usr/share/doc/$pkgbase" - cp -r examples "$pkgdir/usr/share/doc/$pkgbase/examples" - install -Dm644 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 316900, julia/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-04-18 15:14:09 UTC (rev 316901) @@ -0,0 +1,135 @@ +# $Id$ +# Maintainer: Alexander F Rødseth <xypr...@archlinux.org> +# Contributor: Lex Black <autumn-wind at web dot 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=0.6.2 +pkgrel=7 +arch=('x86_64') +pkgdesc='High-level, high-performance, dynamic programming language' +url='https://julialang.org/' +license=('MIT') +depends=('fftw' 'hicolor-icon-theme' 'libgit2' 'libunwind' 'mpfr' 'pcre2' 'suitesparse') +makedepends=('chrpath' 'cmake' 'gcc-fortran' 'gmp' 'python2') +options=('!emptydirs' 'staticlibs') +source=("https://github.com/JuliaLang/$pkgbase/releases/download/v$pkgver/$pkgbase-$pkgver-full.tar.gz"{,.asc} + 'julia-libunwind-version.patch' + 'julia-makefile.patch') +sha256sums=('1e34c13091c9ddb47cf87a51566d94a06613f3db3c483b8f63b276e416dd621b' + 'SKIP' + '16009ce454f58463464027cbaf6186ccfab84c37660a52fb1ec3a0f514df64f9' + '342b43532fbace3508688eee879113160e01cbbda29610b53f2f34796bc0312a') +validpgpkeys=('3673DF529D9049477F76B37566E3C7DC03D6E495') # Julia (Binary signing key) <build...@julialang.org> + +prepare() { + + cd "$pkgbase-$pkgver" + patch -p1 -i ../julia-libunwind-version.patch + patch -p0 -i ../julia-makefile.patch # make 'make install' really just install +} + +build() { + # See FS#57387 for why USE_SYSTEM_LLVM=0, for now + # See FS#58221 for why USE_SYSTEM_ARPACK=0, for now + + # 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. + + make -C "$pkgbase-$pkgver" \ + prefix=/usr \ + sysconfdir=/etc \ + MARCH=x86-64 \ + JULIA_BUILD_MODE=release \ + USE_SYSTEM_LLVM=0 \ + USE_SYSTEM_LIBUNWIND=1 \ + USE_SYSTEM_PCRE=1 \ + USE_SYSTEM_LIBM=1 \ + USE_SYSTEM_OPENLIBM=0 \ + USE_SYSTEM_OPENSPECFUN=0 \ + USE_SYSTEM_BLAS=0 \ + USE_SYSTEM_LAPACK=0 \ + USE_SYSTEM_FFTW=1 \ + USE_SYSTEM_GMP=1 \ + USE_SYSTEM_MPFR=1 \ + USE_SYSTEM_ARPACK=0 \ + USE_SYSTEM_SUITESPARSE=1 \ + USE_SYSTEM_LIBUV=0 \ + USE_SYSTEM_UTF8PROC=0 \ + USE_INTEL_MKL=0 \ + USE_BLAS64=0 \ + USE_LLVM_SHLIB=1 \ + USE_SYSTEM_LIBGIT2=1 \ + USE_SYSTEM_PATCHELF=1 \ + USE_SYSTEM_DSFMT=0 +} + +package_julia() { + backup=('etc/julia/juliarc.jl') + optdepends=('gnuplot: If using the Gaston Package from julia') + + # See FS#57387 for why USE_SYSTEM_LLVM=0, for now + # See FS#58221 for why USE_SYSTEM_ARPACK=0, for now + + make -C "$pkgbase-$pkgver" \ + DESTDIR="$pkgdir" \ + prefix=/usr \ + sysconfdir=/etc \ + MARCH=x86-64 \ + USE_SYSTEM_LLVM=0 \ + USE_SYSTEM_LIBUNWIND=1 \ + USE_SYSTEM_PCRE=1 \ + USE_SYSTEM_LIBM=1 \ + USE_SYSTEM_OPENLIBM=0 \ + USE_SYSTEM_OPENSPECFUN=0 \ + USE_SYSTEM_BLAS=0 \ + USE_SYSTEM_LAPACK=0 \ + USE_SYSTEM_FFTW=1 \ + USE_SYSTEM_GMP=1 \ + USE_SYSTEM_MPFR=1 \ + USE_SYSTEM_ARPACK=0 \ + USE_SYSTEM_SUITESPARSE=1 \ + USE_SYSTEM_LIBUV=0 \ + USE_SYSTEM_UTF8PROC=0 \ + USE_INTEL_MKL=0 \ + USE_BLAS64=0 \ + USE_LLVM_SHLIB=1 \ + USE_SYSTEM_LIBGIT2=1 \ + USE_SYSTEM_PATCHELF=1 \ + USE_SYSTEM_DSFMT=0 \ + install + + # Remove duplicate man-page from julia/doc + rm -rf "$pkgdir/usr/share/julia/doc/man" + + # FS#58211 && https://github.com/JuliaLang/julia/issues/26830 + chrpath -r '$ORIGIN/julia' "$pkgdir"/usr/lib/libjulia.so.0.6.2 + # points to /usr/lib + chrpath -d "$pkgdir"/usr/bin/julia + + # Documentation and examples are in the julia-docs package + rm -rf "$pkgdir/usr/share/"{doc,julia/doc,julia/examples} + + # License + install -Dm644 "$pkgbase-$pkgver/LICENSE.md" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md" +} + +package_julia-docs() { + pkgdesc='Documentation and examples for Julia' + depends=('julia') + + cd "$pkgbase-$pkgver" + + install -d "$pkgdir/usr/share/doc" + cp -r doc "$pkgdir/usr/share/doc/$pkgbase" + rm -rf "$pkgdir"/usr/share/doc/julia/man/ + cp -r examples "$pkgdir/usr/share/doc/$pkgbase/examples" + install -Dm644 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md" +} + +# getver: julialang.org/downloads +# vim: ts=2 sw=2 et: Deleted: julia-libunwind-version.patch =================================================================== --- julia-libunwind-version.patch 2018-04-18 15:13:50 UTC (rev 316900) +++ julia-libunwind-version.patch 2018-04-18 15:14:09 UTC (rev 316901) @@ -1,15 +0,0 @@ ---- julia-0.6.0/src/julia_internal.h.0 2017-06-25 16:10:29.688382943 +0000 -+++ julia-0.6.0/src/julia_internal.h 2017-06-25 16:11:15.328315342 +0000 -@@ -643,11 +643,8 @@ - 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 - #endif - size_t rec_backtrace(uintptr_t *data, size_t maxsize); - size_t rec_backtrace_ctx(uintptr_t *data, size_t maxsize, bt_context_t *ctx); - Copied: julia/repos/community-x86_64/julia-libunwind-version.patch (from rev 316900, julia/trunk/julia-libunwind-version.patch) =================================================================== --- julia-libunwind-version.patch (rev 0) +++ julia-libunwind-version.patch 2018-04-18 15:14:09 UTC (rev 316901) @@ -0,0 +1,15 @@ +--- julia-0.6.0/src/julia_internal.h.0 2017-06-25 16:10:29.688382943 +0000 ++++ julia-0.6.0/src/julia_internal.h 2017-06-25 16:11:15.328315342 +0000 +@@ -643,11 +643,8 @@ + 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 + #endif + size_t rec_backtrace(uintptr_t *data, size_t maxsize); + size_t rec_backtrace_ctx(uintptr_t *data, size_t maxsize, bt_context_t *ctx); + Deleted: julia-makefile.patch =================================================================== --- julia-makefile.patch 2018-04-18 15:13:50 UTC (rev 316900) +++ julia-makefile.patch 2018-04-18 15:14:09 UTC (rev 316901) @@ -1,13 +0,0 @@ ---- Makefile.orig 2017-10-28 17:06:53.003582943 +0000 -+++ Makefile 2017-10-28 17:07:27.690408154 +0000 -@@ -332,8 +332,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/site/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir); do \ - mkdir -p $(DESTDIR)$$subdir; \ - done - Copied: julia/repos/community-x86_64/julia-makefile.patch (from rev 316900, julia/trunk/julia-makefile.patch) =================================================================== --- julia-makefile.patch (rev 0) +++ julia-makefile.patch 2018-04-18 15:14:09 UTC (rev 316901) @@ -0,0 +1,13 @@ +--- Makefile.orig 2017-10-28 17:06:53.003582943 +0000 ++++ Makefile 2017-10-28 17:07:27.690408154 +0000 +@@ -332,8 +332,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/site/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir); do \ + mkdir -p $(DESTDIR)$$subdir; \ + done + Deleted: sysfix.install =================================================================== --- sysfix.install 2018-04-18 15:13:50 UTC (rev 316900) +++ sysfix.install 2018-04-18 15:14:09 UTC (rev 316901) @@ -1,13 +0,0 @@ -post_install() { - # Removing sys.so if needed, in order for Julia to start, see FS#39721 - julia --version &>/dev/null || rm /usr/lib/julia/sys.so - - # #58221 - chrpath -r '/usr/lib/julia/' /usr/lib/libjulia.so.0.6.2 -} - -post_upgrade() { - post_install -} - -# vim:set ts=2 sw=2 et: