[arch-commits] Commit in julia/trunk (Make.user PKGBUILD)

[Alexander Rødseth]

    Date: Monday, September 17, 2018 @ 22:05:49
  Author: arodseth
Revision: 382801

Move Make.User to a separate file

Added:
  julia/trunk/Make.user
Modified:
  julia/trunk/PKGBUILD

-----------+
 Make.user |   27 ++++++++++++++++++++
 PKGBUILD  |   79 ++++++++++++++++++------------------------------------------
 2 files changed, 51 insertions(+), 55 deletions(-)

Added: Make.user
===================================================================
--- Make.user	                        (rev 0)
+++ Make.user	2018-09-17 22:05:49 UTC (rev 382801)
@@ -0,0 +1,27 @@
+override prefix = /usr
+override sysconfdir = /etc
+override MARCH = x86-64
+override JULIA_BUILD_MODE = release
+override USE_BLAS64 = 0
+override USE_SYSTEM_BLAS = 0
+override USE_SYSTEM_DSFMT = 0
+override USE_SYSTEM_FFTW = 1
+override USE_SYSTEM_GMP = 1
+override USE_SYSTEM_LAPACK = 0
+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
+
+# 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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-17 22:00:47 UTC (rev 382800)
+++ PKGBUILD	2018-09-17 22:05:49 UTC (rev 382801)
@@ -13,16 +13,20 @@
 pkgdesc='High-level, high-performance, dynamic programming language'
 url='https://julialang.org/'
 license=('MIT')
-depends=('fftw' 'hicolor-icon-theme' 'libgit2' 'libunwind' 'libutf8proc' 'suitesparse')
+depends=('fftw' 'hicolor-icon-theme' 'libgit2' 'libunwind' 'libutf8proc'
+         'suitesparse')
 makedepends=('cmake' 'gcc-fortran' 'gmp' 'python2')
 source=("https://github.com/JuliaLang/$pkgbase/releases/download/v$pkgver/$pkgbase-$pkgver-full.tar.gz"{,.asc}
-        "julia-libunwind-version.diff"
-        "julia-makefile.diff")
+        'julia-libunwind-version.diff'
+        'julia-makefile.diff'
+        'Make.user')
 sha256sums=('1a2497977b1d43bb821a5b7475b4054b29938baae8170881c6b8dd4099d133f1'
             'SKIP'
             '22974e1a6602c250cd993cc89cf38fd24668617484f44cadd60665e9af15207b'
-            'b7374fcd5a579fc59d6988795fc0c3cf411a89205942c691a5b3003793ae6c52')
-validpgpkeys=('3673DF529D9049477F76B37566E3C7DC03D6E495') # Julia (Binary signing key) <buildbot at julialang.org>
+            'b7374fcd5a579fc59d6988795fc0c3cf411a89205942c691a5b3003793ae6c52'
+            '67577a8ecf98e1593f5a649ff5bc36380878e6c16dfea46a3ffde8d3c87e672b')
+# Julia (Binary signing key) <buildbot at julialang.org>
+validpgpkeys=('3673DF529D9049477F76B37566E3C7DC03D6E495')
 
 prepare() {
   cd $pkgbase
@@ -29,57 +33,23 @@
   # https://github.com/JuliaLang/julia/pull/29082 fix libunwind version check
   patch -p1 -i ../julia-libunwind-version.diff
   # make 'make install' really just install
-  patch -p0 -i ../julia-makefile.diff 
+  patch -p0 -i ../julia-makefile.diff
+  # configure the build
+  cp -f ../Make.user Make.user
 }
 
-
 build() {
-  # configure the build.
-  #
-  # Setting USE_SYSTEM_*=1 for quite a few things, for now,
-  # just to make Julia 1.0.0 compile.
-  cat << '__EOF__' > $pkgbase/Make.user
-override prefix = /usr
-override sysconfdir = /etc
-override MARCH = x86-64
-override JULIA_BUILD_MODE = release
-override USE_BLAS64 = 0
-override USE_SYSTEM_BLAS = 0
-override USE_SYSTEM_DSFMT = 0
-override USE_SYSTEM_FFTW = 1
-override USE_SYSTEM_GMP = 1
-override USE_SYSTEM_LAPACK = 0
-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
-
-# 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
-__EOF__
-
-  export CFLAGS="$CFLAGS -w"
-  export CXXFLAGS="$CXXFLAGS -w"
-  make -C "$pkgbase"
+  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)
+ 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/
+ rm -r depot/compiled
 }
 
 package_julia() {
@@ -94,8 +64,8 @@
   # Documentation is in the julia-docs package
   rm -rf "$pkgdir/usr/share/"{doc,julia/doc}
 
-  # License
-  install -Dm644 "$pkgbase/LICENSE.md" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md"
+  install -Dm644 "$pkgbase/LICENSE.md" \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md"
 }
 
 package_julia-docs() {
@@ -102,12 +72,11 @@
   pkgdesc='Documentation and examples for Julia'
   depends=('julia')
 
-  cd "$pkgbase"
-
   install -d "$pkgdir/usr/share/doc"
-  cp -r doc "$pkgdir/usr/share/doc/$pkgbase"
-  rm -rf "$pkgdir"/usr/share/doc/julia/man/
-  install -Dm644 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md"
+  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