Date: Friday, September 8, 2017 @ 19:10:16 Author: arojas Revision: 256439
archrelease: copy trunk to community-x86_64, community-i686 Added: julia/repos/community-i686/PKGBUILD (from rev 256438, julia/trunk/PKGBUILD) julia/repos/community-i686/julia-libunwind-version.patch (from rev 256438, julia/trunk/julia-libunwind-version.patch) julia/repos/community-i686/sysfix.install (from rev 256438, julia/trunk/sysfix.install) julia/repos/community-x86_64/PKGBUILD (from rev 256438, julia/trunk/PKGBUILD) julia/repos/community-x86_64/julia-libunwind-version.patch (from rev 256438, julia/trunk/julia-libunwind-version.patch) julia/repos/community-x86_64/sysfix.install (from rev 256438, julia/trunk/sysfix.install) Deleted: julia/repos/community-i686/PKGBUILD julia/repos/community-i686/julia-libunwind-version.patch julia/repos/community-i686/sysfix.install julia/repos/community-x86_64/PKGBUILD julia/repos/community-x86_64/julia-libunwind-version.patch julia/repos/community-x86_64/sysfix.install ------------------------------------------------+ /PKGBUILD | 286 +++++++++++++++++++++++ /julia-libunwind-version.patch | 30 ++ /sysfix.install | 20 + community-i686/PKGBUILD | 143 ----------- community-i686/julia-libunwind-version.patch | 15 - community-i686/sysfix.install | 10 community-x86_64/PKGBUILD | 143 ----------- community-x86_64/julia-libunwind-version.patch | 15 - community-x86_64/sysfix.install | 10 9 files changed, 336 insertions(+), 336 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2017-09-08 19:09:11 UTC (rev 256438) +++ community-i686/PKGBUILD 2017-09-08 19:10:16 UTC (rev 256439) @@ -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') -pkgver=0.6.0 -pkgrel=1 -epoch=2 -arch=('x86_64' 'i686') -pkgdesc='High-level, high-performance, dynamic programming language' -url='http://julialang.org/' -license=('MIT') -makedepends=('gcc-fortran' 'python2' 'blas' 'lapack' 'arpack' 'libunwind' 'fftw' 'llvm' - 'gmp' 'mpfr' 'zlib' 'suitesparse' 'patchelf' 'cmake' 'pcre2' 'libgit2' 'openssl') -options=('!emptydirs' 'staticlibs') -source=("https://github.com/JuliaLang/julia/releases/download/v$pkgver/julia-$pkgver.tar.gz"{,.asc} julia-libunwind-version.patch) -sha256sums=('1c62bfce8075acf2b5b02355520a61210690324eceb021030681459d18a3a665' - 'SKIP' - '16009ce454f58463464027cbaf6186ccfab84c37660a52fb1ec3a0f514df64f9') -validpgpkeys=('3673DF529D9049477F76B37566E3C7DC03D6E495') # Julia (Binary signing key) <build...@julialang.org> - -prepare() { - # For /etc/ld.so.conf.d/ - echo '/usr/lib/julia' > julia.conf - - cd $pkgname-$pkgver - patch -p1 -i ../julia-libunwind-version.patch -} - -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" - - # SSE2 is a requirement for Julia on 32-bit x86 - unset ARCH - if [[ $CARCH == i686 ]]; then - export M="pentium4" - export CFLAGS+=" -march=pentium4" - export CXXFLAGS+=" -march=pentium4" - else - export M="x86-64" - fi - - cd julia-$pkgver - make prefix=/usr sysconfdir=/etc \ - MARCH=$M \ - USE_SYSTEM_LLVM=1 \ - USE_SYSTEM_LIBUNWIND=1 \ - USE_SYSTEM_PCRE=1 \ - USE_SYSTEM_LIBM=1 \ - USE_SYSTEM_OPENLIBM=0 \ - USE_SYSTEM_OPENSPECFUN=0 \ - USE_SYSTEM_BLAS=1 \ - USE_SYSTEM_LAPACK=1 \ - USE_SYSTEM_FFTW=1 \ - USE_SYSTEM_GMP=1 \ - USE_SYSTEM_MPFR=1 \ - USE_SYSTEM_ARPACK=1 \ - 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' 'libunwind' 'mpfr' 'suitesparse' 'pcre2' 'libgit2' 'llvm-libs' 'patchelf' 'hicolor-icon-theme') - 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" - - # SSE2 is a requirement for Julia on 32-bit x86 - if [[ $CARCH == i686 ]]; then - export M="pentium4" - export CFLAGS+=" -march=pentium4" - export CXXFLAGS+=" -march=pentium4" - else - export M="x86-64" - fi - - cd julia-$pkgver - make DESTDIR="$pkgdir" \ - prefix=/usr sysconfdir=/etc \ - MARCH=$M \ - USE_SYSTEM_LLVM=1 \ - USE_SYSTEM_LIBUNWIND=1 \ - USE_SYSTEM_PCRE=1 \ - USE_SYSTEM_LIBM=1 \ - USE_SYSTEM_OPENLIBM=0 \ - USE_SYSTEM_OPENSPECFUN=0 \ - USE_SYSTEM_BLAS=1 \ - USE_SYSTEM_LAPACK=1 \ - USE_SYSTEM_FFTW=1 \ - USE_SYSTEM_GMP=1 \ - USE_SYSTEM_MPFR=1 \ - USE_SYSTEM_ARPACK=1 \ - 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 -rvf "$pkgdir/usr/share/julia/doc/man" - - # For /etc/ld.so.conf.d, FS#41731 - install -Dm644 "$srcdir"/julia.conf "$pkgdir/etc/ld.so.conf.d/julia.conf" - - # Documentation and examples are in the julia-docs package - rm -rvf "$pkgdir/usr/share/doc/" - rm -rvf "$pkgdir/usr/share/julia/doc/" - rm -rvf "$pkgdir/usr/share/julia/examples/" - - install -Dm644 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md" -} - -package_julia-docs() { - pkgdesc='Documentation and examples for Julia' - cd julia-$pkgver - - install -d "$pkgdir/usr/share/doc" - cp -rv doc "$pkgdir/usr/share/doc/$pkgbase" - cp -rv examples "$pkgdir/usr/share/doc/$pkgbase/examples" - install -Dm644 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md" -} Copied: julia/repos/community-i686/PKGBUILD (from rev 256438, julia/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2017-09-08 19:10:16 UTC (rev 256439) @@ -0,0 +1,143 @@ +# $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') +pkgver=0.6.0 +pkgrel=2 +epoch=2 +arch=('x86_64' 'i686') +pkgdesc='High-level, high-performance, dynamic programming language' +url='http://julialang.org/' +license=('MIT') +makedepends=('gcc-fortran' 'python2' 'blas' 'lapack' 'arpack' 'libunwind' 'fftw' 'llvm' + 'gmp' 'mpfr' 'zlib' 'suitesparse' 'patchelf' 'cmake' 'pcre2' 'libgit2' 'openssl') +options=('!emptydirs' 'staticlibs') +source=("https://github.com/JuliaLang/julia/releases/download/v$pkgver/julia-$pkgver.tar.gz"{,.asc} julia-libunwind-version.patch) +sha256sums=('1c62bfce8075acf2b5b02355520a61210690324eceb021030681459d18a3a665' + 'SKIP' + '16009ce454f58463464027cbaf6186ccfab84c37660a52fb1ec3a0f514df64f9') +validpgpkeys=('3673DF529D9049477F76B37566E3C7DC03D6E495') # Julia (Binary signing key) <build...@julialang.org> + +prepare() { + # For /etc/ld.so.conf.d/ + echo '/usr/lib/julia' > julia.conf + + cd $pkgname-$pkgver + patch -p1 -i ../julia-libunwind-version.patch +} + +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" + + # SSE2 is a requirement for Julia on 32-bit x86 + unset ARCH + if [[ $CARCH == i686 ]]; then + export M="pentium4" + export CFLAGS+=" -march=pentium4" + export CXXFLAGS+=" -march=pentium4" + else + export M="x86-64" + fi + + cd julia-$pkgver + make prefix=/usr sysconfdir=/etc \ + MARCH=$M \ + 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=1 \ + USE_SYSTEM_LAPACK=1 \ + USE_SYSTEM_FFTW=1 \ + USE_SYSTEM_GMP=1 \ + USE_SYSTEM_MPFR=1 \ + USE_SYSTEM_ARPACK=1 \ + 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' 'libunwind' 'mpfr' 'suitesparse' 'pcre2' 'libgit2' 'llvm-libs' 'patchelf' 'hicolor-icon-theme') + 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" + + # SSE2 is a requirement for Julia on 32-bit x86 + if [[ $CARCH == i686 ]]; then + export M="pentium4" + export CFLAGS+=" -march=pentium4" + export CXXFLAGS+=" -march=pentium4" + else + export M="x86-64" + fi + + cd julia-$pkgver + make DESTDIR="$pkgdir" \ + prefix=/usr sysconfdir=/etc \ + MARCH=$M \ + USE_SYSTEM_LLVM=1 \ + USE_SYSTEM_LIBUNWIND=1 \ + USE_SYSTEM_PCRE=1 \ + USE_SYSTEM_LIBM=1 \ + USE_SYSTEM_OPENLIBM=0 \ + USE_SYSTEM_OPENSPECFUN=0 \ + USE_SYSTEM_BLAS=1 \ + USE_SYSTEM_LAPACK=1 \ + USE_SYSTEM_FFTW=1 \ + USE_SYSTEM_GMP=1 \ + USE_SYSTEM_MPFR=1 \ + USE_SYSTEM_ARPACK=1 \ + 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 -rvf "$pkgdir/usr/share/julia/doc/man" + + # For /etc/ld.so.conf.d, FS#41731 + install -Dm644 "$srcdir"/julia.conf "$pkgdir/etc/ld.so.conf.d/julia.conf" + + # Documentation and examples are in the julia-docs package + rm -rvf "$pkgdir/usr/share/doc/" + rm -rvf "$pkgdir/usr/share/julia/doc/" + rm -rvf "$pkgdir/usr/share/julia/examples/" + + install -Dm644 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md" +} + +package_julia-docs() { + pkgdesc='Documentation and examples for Julia' + cd julia-$pkgver + + install -d "$pkgdir/usr/share/doc" + cp -rv doc "$pkgdir/usr/share/doc/$pkgbase" + cp -rv examples "$pkgdir/usr/share/doc/$pkgbase/examples" + install -Dm644 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md" +} Deleted: community-i686/julia-libunwind-version.patch =================================================================== --- community-i686/julia-libunwind-version.patch 2017-09-08 19:09:11 UTC (rev 256438) +++ community-i686/julia-libunwind-version.patch 2017-09-08 19:10:16 UTC (rev 256439) @@ -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-i686/julia-libunwind-version.patch (from rev 256438, julia/trunk/julia-libunwind-version.patch) =================================================================== --- community-i686/julia-libunwind-version.patch (rev 0) +++ community-i686/julia-libunwind-version.patch 2017-09-08 19:10:16 UTC (rev 256439) @@ -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: community-i686/sysfix.install =================================================================== --- community-i686/sysfix.install 2017-09-08 19:09:11 UTC (rev 256438) +++ community-i686/sysfix.install 2017-09-08 19:10:16 UTC (rev 256439) @@ -1,10 +0,0 @@ -post_install() { - # Removing sys.so if needed, in order for Julia to start, see FS#39721 - julia --version 2>/dev/null || rm /usr/lib/julia/sys.so -} - -post_upgrade() { - post_install -} - -# vim:set ts=2 sw=2 et: Copied: julia/repos/community-i686/sysfix.install (from rev 256438, julia/trunk/sysfix.install) =================================================================== --- community-i686/sysfix.install (rev 0) +++ community-i686/sysfix.install 2017-09-08 19:10:16 UTC (rev 256439) @@ -0,0 +1,10 @@ +post_install() { + # Removing sys.so if needed, in order for Julia to start, see FS#39721 + julia --version 2>/dev/null || rm /usr/lib/julia/sys.so +} + +post_upgrade() { + post_install +} + +# vim:set ts=2 sw=2 et: Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2017-09-08 19:09:11 UTC (rev 256438) +++ community-x86_64/PKGBUILD 2017-09-08 19:10:16 UTC (rev 256439) @@ -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') -pkgver=0.6.0 -pkgrel=1 -epoch=2 -arch=('x86_64' 'i686') -pkgdesc='High-level, high-performance, dynamic programming language' -url='http://julialang.org/' -license=('MIT') -makedepends=('gcc-fortran' 'python2' 'blas' 'lapack' 'arpack' 'libunwind' 'fftw' 'llvm' - 'gmp' 'mpfr' 'zlib' 'suitesparse' 'patchelf' 'cmake' 'pcre2' 'libgit2' 'openssl') -options=('!emptydirs' 'staticlibs') -source=("https://github.com/JuliaLang/julia/releases/download/v$pkgver/julia-$pkgver.tar.gz"{,.asc} julia-libunwind-version.patch) -sha256sums=('1c62bfce8075acf2b5b02355520a61210690324eceb021030681459d18a3a665' - 'SKIP' - '16009ce454f58463464027cbaf6186ccfab84c37660a52fb1ec3a0f514df64f9') -validpgpkeys=('3673DF529D9049477F76B37566E3C7DC03D6E495') # Julia (Binary signing key) <build...@julialang.org> - -prepare() { - # For /etc/ld.so.conf.d/ - echo '/usr/lib/julia' > julia.conf - - cd $pkgname-$pkgver - patch -p1 -i ../julia-libunwind-version.patch -} - -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" - - # SSE2 is a requirement for Julia on 32-bit x86 - unset ARCH - if [[ $CARCH == i686 ]]; then - export M="pentium4" - export CFLAGS+=" -march=pentium4" - export CXXFLAGS+=" -march=pentium4" - else - export M="x86-64" - fi - - cd julia-$pkgver - make prefix=/usr sysconfdir=/etc \ - MARCH=$M \ - USE_SYSTEM_LLVM=1 \ - USE_SYSTEM_LIBUNWIND=1 \ - USE_SYSTEM_PCRE=1 \ - USE_SYSTEM_LIBM=1 \ - USE_SYSTEM_OPENLIBM=0 \ - USE_SYSTEM_OPENSPECFUN=0 \ - USE_SYSTEM_BLAS=1 \ - USE_SYSTEM_LAPACK=1 \ - USE_SYSTEM_FFTW=1 \ - USE_SYSTEM_GMP=1 \ - USE_SYSTEM_MPFR=1 \ - USE_SYSTEM_ARPACK=1 \ - 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' 'libunwind' 'mpfr' 'suitesparse' 'pcre2' 'libgit2' 'llvm-libs' 'patchelf' 'hicolor-icon-theme') - 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" - - # SSE2 is a requirement for Julia on 32-bit x86 - if [[ $CARCH == i686 ]]; then - export M="pentium4" - export CFLAGS+=" -march=pentium4" - export CXXFLAGS+=" -march=pentium4" - else - export M="x86-64" - fi - - cd julia-$pkgver - make DESTDIR="$pkgdir" \ - prefix=/usr sysconfdir=/etc \ - MARCH=$M \ - USE_SYSTEM_LLVM=1 \ - USE_SYSTEM_LIBUNWIND=1 \ - USE_SYSTEM_PCRE=1 \ - USE_SYSTEM_LIBM=1 \ - USE_SYSTEM_OPENLIBM=0 \ - USE_SYSTEM_OPENSPECFUN=0 \ - USE_SYSTEM_BLAS=1 \ - USE_SYSTEM_LAPACK=1 \ - USE_SYSTEM_FFTW=1 \ - USE_SYSTEM_GMP=1 \ - USE_SYSTEM_MPFR=1 \ - USE_SYSTEM_ARPACK=1 \ - 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 -rvf "$pkgdir/usr/share/julia/doc/man" - - # For /etc/ld.so.conf.d, FS#41731 - install -Dm644 "$srcdir"/julia.conf "$pkgdir/etc/ld.so.conf.d/julia.conf" - - # Documentation and examples are in the julia-docs package - rm -rvf "$pkgdir/usr/share/doc/" - rm -rvf "$pkgdir/usr/share/julia/doc/" - rm -rvf "$pkgdir/usr/share/julia/examples/" - - install -Dm644 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md" -} - -package_julia-docs() { - pkgdesc='Documentation and examples for Julia' - cd julia-$pkgver - - install -d "$pkgdir/usr/share/doc" - cp -rv doc "$pkgdir/usr/share/doc/$pkgbase" - cp -rv examples "$pkgdir/usr/share/doc/$pkgbase/examples" - install -Dm644 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md" -} Copied: julia/repos/community-x86_64/PKGBUILD (from rev 256438, julia/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2017-09-08 19:10:16 UTC (rev 256439) @@ -0,0 +1,143 @@ +# $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') +pkgver=0.6.0 +pkgrel=2 +epoch=2 +arch=('x86_64' 'i686') +pkgdesc='High-level, high-performance, dynamic programming language' +url='http://julialang.org/' +license=('MIT') +makedepends=('gcc-fortran' 'python2' 'blas' 'lapack' 'arpack' 'libunwind' 'fftw' 'llvm' + 'gmp' 'mpfr' 'zlib' 'suitesparse' 'patchelf' 'cmake' 'pcre2' 'libgit2' 'openssl') +options=('!emptydirs' 'staticlibs') +source=("https://github.com/JuliaLang/julia/releases/download/v$pkgver/julia-$pkgver.tar.gz"{,.asc} julia-libunwind-version.patch) +sha256sums=('1c62bfce8075acf2b5b02355520a61210690324eceb021030681459d18a3a665' + 'SKIP' + '16009ce454f58463464027cbaf6186ccfab84c37660a52fb1ec3a0f514df64f9') +validpgpkeys=('3673DF529D9049477F76B37566E3C7DC03D6E495') # Julia (Binary signing key) <build...@julialang.org> + +prepare() { + # For /etc/ld.so.conf.d/ + echo '/usr/lib/julia' > julia.conf + + cd $pkgname-$pkgver + patch -p1 -i ../julia-libunwind-version.patch +} + +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" + + # SSE2 is a requirement for Julia on 32-bit x86 + unset ARCH + if [[ $CARCH == i686 ]]; then + export M="pentium4" + export CFLAGS+=" -march=pentium4" + export CXXFLAGS+=" -march=pentium4" + else + export M="x86-64" + fi + + cd julia-$pkgver + make prefix=/usr sysconfdir=/etc \ + MARCH=$M \ + 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=1 \ + USE_SYSTEM_LAPACK=1 \ + USE_SYSTEM_FFTW=1 \ + USE_SYSTEM_GMP=1 \ + USE_SYSTEM_MPFR=1 \ + USE_SYSTEM_ARPACK=1 \ + 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' 'libunwind' 'mpfr' 'suitesparse' 'pcre2' 'libgit2' 'llvm-libs' 'patchelf' 'hicolor-icon-theme') + 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" + + # SSE2 is a requirement for Julia on 32-bit x86 + if [[ $CARCH == i686 ]]; then + export M="pentium4" + export CFLAGS+=" -march=pentium4" + export CXXFLAGS+=" -march=pentium4" + else + export M="x86-64" + fi + + cd julia-$pkgver + make DESTDIR="$pkgdir" \ + prefix=/usr sysconfdir=/etc \ + MARCH=$M \ + USE_SYSTEM_LLVM=1 \ + USE_SYSTEM_LIBUNWIND=1 \ + USE_SYSTEM_PCRE=1 \ + USE_SYSTEM_LIBM=1 \ + USE_SYSTEM_OPENLIBM=0 \ + USE_SYSTEM_OPENSPECFUN=0 \ + USE_SYSTEM_BLAS=1 \ + USE_SYSTEM_LAPACK=1 \ + USE_SYSTEM_FFTW=1 \ + USE_SYSTEM_GMP=1 \ + USE_SYSTEM_MPFR=1 \ + USE_SYSTEM_ARPACK=1 \ + 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 -rvf "$pkgdir/usr/share/julia/doc/man" + + # For /etc/ld.so.conf.d, FS#41731 + install -Dm644 "$srcdir"/julia.conf "$pkgdir/etc/ld.so.conf.d/julia.conf" + + # Documentation and examples are in the julia-docs package + rm -rvf "$pkgdir/usr/share/doc/" + rm -rvf "$pkgdir/usr/share/julia/doc/" + rm -rvf "$pkgdir/usr/share/julia/examples/" + + install -Dm644 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md" +} + +package_julia-docs() { + pkgdesc='Documentation and examples for Julia' + cd julia-$pkgver + + install -d "$pkgdir/usr/share/doc" + cp -rv doc "$pkgdir/usr/share/doc/$pkgbase" + cp -rv examples "$pkgdir/usr/share/doc/$pkgbase/examples" + install -Dm644 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md" +} Deleted: community-x86_64/julia-libunwind-version.patch =================================================================== --- community-x86_64/julia-libunwind-version.patch 2017-09-08 19:09:11 UTC (rev 256438) +++ community-x86_64/julia-libunwind-version.patch 2017-09-08 19:10:16 UTC (rev 256439) @@ -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 256438, julia/trunk/julia-libunwind-version.patch) =================================================================== --- community-x86_64/julia-libunwind-version.patch (rev 0) +++ community-x86_64/julia-libunwind-version.patch 2017-09-08 19:10:16 UTC (rev 256439) @@ -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: community-x86_64/sysfix.install =================================================================== --- community-x86_64/sysfix.install 2017-09-08 19:09:11 UTC (rev 256438) +++ community-x86_64/sysfix.install 2017-09-08 19:10:16 UTC (rev 256439) @@ -1,10 +0,0 @@ -post_install() { - # Removing sys.so if needed, in order for Julia to start, see FS#39721 - julia --version 2>/dev/null || rm /usr/lib/julia/sys.so -} - -post_upgrade() { - post_install -} - -# vim:set ts=2 sw=2 et: Copied: julia/repos/community-x86_64/sysfix.install (from rev 256438, julia/trunk/sysfix.install) =================================================================== --- community-x86_64/sysfix.install (rev 0) +++ community-x86_64/sysfix.install 2017-09-08 19:10:16 UTC (rev 256439) @@ -0,0 +1,10 @@ +post_install() { + # Removing sys.so if needed, in order for Julia to start, see FS#39721 + julia --version 2>/dev/null || rm /usr/lib/julia/sys.so +} + +post_upgrade() { + post_install +} + +# vim:set ts=2 sw=2 et: