[arch-commits] Commit in julia/trunk (PKGBUILD julia-makefile.patch)

[Antonio Rojas]

    Date: Saturday, October 28, 2017 @ 17:25:53
  Author: arojas
Revision: 264644

Update to 0.6.1

Added:
  julia/trunk/julia-makefile.patch
Modified:
  julia/trunk/PKGBUILD

----------------------+
 PKGBUILD             |   22 +++++++++++++---------
 julia-makefile.patch |   13 +++++++++++++
 2 files changed, 26 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-10-28 17:17:44 UTC (rev 264643)
+++ PKGBUILD	2017-10-28 17:25:53 UTC (rev 264644)
@@ -7,8 +7,8 @@
 
 pkgbase=julia
 pkgname=('julia' 'julia-docs')
-pkgver=0.6.0
-pkgrel=3
+pkgver=0.6.1
+pkgrel=1
 epoch=2
 arch=('x86_64' 'i686')
 pkgdesc='High-level, high-performance, dynamic programming language'
@@ -17,10 +17,12 @@
 makedepends=('gcc-fortran' 'python2' 'blas' 'lapack' 'arpack' 'libunwind' 'fftw'
              'gmp' 'mpfr' 'zlib' 'suitesparse' 'patchelf' 'cmake' 'pcre2' 'libgit2' 'llvm39')
 options=('!emptydirs' 'staticlibs')
-source=("https://github.com/JuliaLang/julia/releases/download/v$pkgver/julia-$pkgver.tar.gz"{,.asc} julia-libunwind-version.patch)
-sha256sums=('1c62bfce8075acf2b5b02355520a61210690324eceb021030681459d18a3a665'
+source=("https://github.com/JuliaLang/julia/releases/download/v$pkgver/julia-$pkgver.tar.gz"{,.asc}
+        julia-libunwind-version.patch julia-makefile.patch)
+sha256sums=('e68adfa85df529f8ad092a9bf85d2350101c658fe455c5ebf2b6d119359e10d9'
             'SKIP'
-            '16009ce454f58463464027cbaf6186ccfab84c37660a52fb1ec3a0f514df64f9')
+            '16009ce454f58463464027cbaf6186ccfab84c37660a52fb1ec3a0f514df64f9'
+            '342b43532fbace3508688eee879113160e01cbbda29610b53f2f34796bc0312a')
 validpgpkeys=('3673DF529D9049477F76B37566E3C7DC03D6E495') # Julia (Binary signing key) <buildbot at julialang.org>
 
 prepare() {
@@ -27,9 +29,10 @@
   # For /etc/ld.so.conf.d/
   echo '/usr/lib/julia' > julia.conf
 
-  cd $pkgname-$pkgver
+  cd $pkgname
   patch -p1 -i ../julia-libunwind-version.patch
   sed -e 's|-lLLVM|-lLLVM-3.9|' -i src/Makefile # link against llvm39
+  patch -p0 -i ../julia-makefile.patch # make 'make install' really just install
 }
 
 build() {
@@ -47,9 +50,10 @@
     export M="x86-64"
   fi
 
-  cd julia-$pkgver
+  cd julia
   make prefix=/usr sysconfdir=/etc \
     MARCH=$M \
+    JULIA_BUILD_MODE=release \
     USE_SYSTEM_LLVM=1 \
     USE_SYSTEM_LIBUNWIND=1 \
     USE_SYSTEM_PCRE=1 \
@@ -92,7 +96,7 @@
     export M="x86-64"
   fi
 
-  cd julia-$pkgver
+  cd julia
   make DESTDIR="$pkgdir" \
     prefix=/usr sysconfdir=/etc  \
     MARCH=$M \
@@ -135,7 +139,7 @@
 
 package_julia-docs() {
   pkgdesc='Documentation and examples for Julia'
-  cd julia-$pkgver
+  cd julia
 
   install -d "$pkgdir/usr/share/doc"
   cp -rv doc "$pkgdir/usr/share/doc/$pkgbase"

Added: julia-makefile.patch
===================================================================
--- julia-makefile.patch	                        (rev 0)
+++ julia-makefile.patch	2017-10-28 17:25:53 UTC (rev 264644)
@@ -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
+