[arch-commits] Commit in julia/trunk (PKGBUILD julia-system-gcc-libs.patch)

[Antonio Rojas]

    Date: Saturday, March 27, 2021 @ 08:41:31
  Author: arojas
Revision: 905029

Build bundled libs from source, remove installed debug library

Modified:
  julia/trunk/PKGBUILD
  julia/trunk/julia-system-gcc-libs.patch

-----------------------------+
 PKGBUILD                    |    6 ++-
 julia-system-gcc-libs.patch |   65 +++++++++++++++++++++++++++++++-----------
 2 files changed, 53 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-27 08:18:00 UTC (rev 905028)
+++ PKGBUILD	2021-03-27 08:41:31 UTC (rev 905029)
@@ -8,7 +8,7 @@
 pkgname=julia
 epoch=2
 pkgver=1.6.0
-pkgrel=4
+pkgrel=5
 arch=(x86_64)
 pkgdesc='High-level, high-performance, dynamic programming language'
 url='https://julialang.org/'
@@ -29,7 +29,7 @@
             'e44c260e4111908337caa82e1c3fef563b9d40e0a30da68d6e91405bf6db24dc'
             '692a51efc1a9608720a8ec8899ad62e48f0f2bf43b71e495e16f0429e8a80441'
             '8be4605f92a009072ca7e843549c225fc4e959893498e7c4f8f79e861e63714d'
-            '223d706718d1ba5203613dbf626f28b05cfde775652bd319904fd304c339ea17')
+            '5c264736dd0339973537473520cb377da9e52ecb10d14750146c42e7767d56a3')
 validpgpkeys=('3673DF529D9049477F76B37566E3C7DC03D6E495') # Julia (Binary signing key) <buildbot at julialang.org>
 
 prepare() {
@@ -52,6 +52,7 @@
     bindir=/usr/bin \
     sysconfdir=/etc \
     libexecdir=/usr/lib \
+    USE_BINARYBUILDER=0 \
     USE_SYSTEM_CSL=1 \
     USE_SYSTEM_LLVM=1 \
     USE_SYSTEM_LIBUNWIND=1 \
@@ -107,5 +108,6 @@
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install $_buildopts
 
+  rm "$pkgdir"/usr/lib/julia/libccalltest.so.debug # Remove debug testing library
   install -Dm644 LICENSE.md -t "$pkgdir"/usr/share/licenses/$pkgname
 }

Modified: julia-system-gcc-libs.patch
===================================================================
--- julia-system-gcc-libs.patch	2021-03-27 08:18:00 UTC (rev 905028)
+++ julia-system-gcc-libs.patch	2021-03-27 08:41:31 UTC (rev 905029)
@@ -1,18 +1,20 @@
-diff --git a/Makefile b/Makefile
-index fde327557d..f1b1d9b64e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -291,7 +291,7 @@ endif
- 		done \
- 	done
- 	for suffix in $(JL_PRIVATE_LIBS-1) ; do \
--		lib=$(build_private_libdir)/$${suffix}.$(SHLIB_EXT); \
-+		lib=$(build_private_libdir)/$${suffix}.$(SHLIB_EXT)*; \
- 		$(INSTALL_M) $$lib $(DESTDIR)$(private_libdir) ; \
- 	done
- endif
+From 71d7a8a8c12b72bfa362ae955d2ce4dfbdf5b8ba Mon Sep 17 00:00:00 2001
+From: Elliot Saba <staticfloat at gmail.com>
+Date: Fri, 26 Mar 2021 18:40:07 +0000
+Subject: [PATCH 1/2] [build] Add `symlink_system_library` calls for CSL
+
+We differentiate between a `USE_BINARYBUILDER_CSL=0` configuration
+(where we copy the CSL libraries into the Julia build tree) versus a
+`USE_SYSTEM_CSL=1` configuration (where we symlink them in a manner
+similar to other system libararies)
+---
+ Make.inc      | 23 +++++++++++++-
+ base/Makefile | 88 ++++++++++++++++++++++++++++++---------------------
+ deps/csl.mk   | 40 ++++++++---------------
+ 3 files changed, 87 insertions(+), 64 deletions(-)
+
 diff --git a/Make.inc b/Make.inc
-index 519720a861ed..7cba05806e68 100644
+index 519720a861ed7..7cba05806e684 100644
 --- a/Make.inc
 +++ b/Make.inc
 @@ -596,6 +596,21 @@ else
@@ -61,7 +63,7 @@
  
  # USE_SYSTEM_LIBM and USE_SYSTEM_OPENLIBM causes it to get symlinked into build_private_shlibdir
 diff --git a/base/Makefile b/base/Makefile
-index e024e546f94d..2bef6aab7f1f 100644
+index e024e546f94d3..2bef6aab7f1f4 100644
 --- a/base/Makefile
 +++ b/base/Makefile
 @@ -169,53 +169,69 @@ endif
@@ -171,7 +173,7 @@
  # libunwind
  endif # WINNT
 diff --git a/deps/csl.mk b/deps/csl.mk
-index 095d4ceec4a1..423201cbb5a0 100644
+index 095d4ceec4a1e..423201cbb5a0c 100644
 --- a/deps/csl.mk
 +++ b/deps/csl.mk
 @@ -19,48 +19,34 @@ $$(build_shlibdir)/$(1): | $$(build_shlibdir)
@@ -236,3 +238,34 @@
  endif
  
  get-csl:
+
+From 6536b8519b25db844f2a1866d056879cb87d1c66 Mon Sep 17 00:00:00 2001
+From: Elliot Saba <staticfloat at gmail.com>
+Date: Fri, 26 Mar 2021 22:32:04 +0000
+Subject: [PATCH 2/2] Expand `JL_PRIVATE_LIBS-1` for versioned library names as
+ well
+
+Without this, we fail to install things like `libgcc_s.so.1` when
+installed into the private libdir by `symlink_system_libraries`.
+---
+ Makefile | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 823ff3b86339d..e08f0e959e1b3 100644
+--- a/Makefile
++++ b/Makefile
+@@ -290,8 +290,11 @@ endif
+ 		done \
+ 	done
+ 	for suffix in $(JL_PRIVATE_LIBS-1) ; do \
+-		lib=$(build_private_libdir)/$${suffix}.$(SHLIB_EXT); \
+-		$(INSTALL_M) $$lib $(DESTDIR)$(private_libdir) ; \
++		for lib in $(build_private_libdir)/$${suffix}.$(SHLIB_EXT)*; do \
++			if [ "$${lib##*.}" != "dSYM" ]; then \
++				$(INSTALL_M) $$lib $(DESTDIR)$(private_libdir) ; \
++			fi \
++		done \
+ 	done
+ endif
+ 	# Install `7z` into libexec/