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

[Alexander Rødseth]

    Date: Monday, August 26, 2019 @ 11:28:22
  Author: arodseth
Revision: 502125

upgpkg: julia 2:1.2.0-2

Modified:
  julia/trunk/Make.user
  julia/trunk/PKGBUILD
Deleted:
  julia/trunk/makefile.patch

----------------+
 Make.user      |   12 ++++++++----
 PKGBUILD       |   11 +++--------
 makefile.patch |   12 ------------
 3 files changed, 11 insertions(+), 24 deletions(-)

Modified: Make.user
===================================================================
--- Make.user	2019-08-26 11:24:45 UTC (rev 502124)
+++ Make.user	2019-08-26 11:28:22 UTC (rev 502125)
@@ -4,17 +4,18 @@
 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 = 0
 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_FFTW = 1
+override USE_SYSTEM_GMP = 1
+override USE_SYSTEM_LIBUNWIND = 1
 override USE_SYSTEM_SUITESPARSE = 1
 override USE_SYSTEM_UTF8PROC = 1
 
@@ -23,6 +24,9 @@
 override USE_SYSTEM_CBLAS = 1
 override USE_SYSTEM_LAPACK = 1
 
+# FS#63536
+override USE_SYSTEM_LIBGIT2 = 1
+
 # FS#57387
 override USE_SYSTEM_LLVM = 0
 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-08-26 11:24:45 UTC (rev 502124)
+++ PKGBUILD	2019-08-26 11:28:22 UTC (rev 502125)
@@ -9,7 +9,7 @@
 pkgname=(julia julia-docs)
 epoch=2
 pkgver=1.2.0
-pkgrel=1
+pkgrel=2
 arch=(x86_64)
 pkgdesc='High-level, high-performance, dynamic programming language'
 url='https://julialang.org/'
@@ -20,14 +20,12 @@
 source=("https://github.com/JuliaLang/julia/releases/download/v$pkgver/$pkgbase-$pkgver-full.tar.gz"{,.asc}
         'cblas.patch::https://github.com/JuliaLang/julia/pull/29540/commits/0c442318196389d653ee21eba65d8c4f7beb72a0.patch'
         libunwind-version.patch
-        makefile.patch
         Make.user)
 sha256sums=('2419b268fc5c3666dd9aeb554815fe7cf9e0e7265bc9b94a43957c31a68d9184'
             'SKIP'
             '88fcbd8a2450027aada0892a60c49c891a8dae43ee6c19e64364b1a1373d50bc'
             'a5eec1e43e1161c313b1d32a5f35a67d6b4a2bbc2d6d324c010f6f2b35be4a72'
-            'b7374fcd5a579fc59d6988795fc0c3cf411a89205942c691a5b3003793ae6c52'
-            '1c47e6fbe296a3186526880321542ac218ccea94eab8bdd752c762c49f01f65a')
+            '2057587e21a2261c49adb524ece2af48aa9a04a544c21a2de115c7b4fe58e98a')
 # Julia (Binary signing key) <buildbot at julialang.org>
 validpgpkeys=('3673DF529D9049477F76B37566E3C7DC03D6E495')
 
@@ -41,9 +39,6 @@
   # https://github.com/JuliaLang/julia/pull/29082
   patch -p1 -i ../libunwind-version.patch
 
-  # Patching make install
-  #patch -p0 -i ../makefile.patch
-
   # Configuring the build
   cp -f ../Make.user Make.user
 
@@ -62,7 +57,7 @@
 
  # 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 --skip Distributed
+ ../julia --check-bounds=yes --startup-file=no ./runtests.jl all --skip Sockets --skip Distributed --skip LibGit2/libgit2
  find ../stdlib \( -name \*.cov -o -name \*.mem \) -delete
  rm -r depot/compiled
 }

Deleted: makefile.patch
===================================================================
--- makefile.patch	2019-08-26 11:24:45 UTC (rev 502124)
+++ makefile.patch	2019-08-26 11:28:22 UTC (rev 502125)
@@ -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