[arch-commits] Commit in julia/trunk (3 files)
Antonio Rojas
arojas at archlinux.org
Fri Mar 26 23:00:56 UTC 2021
Date: Friday, March 26, 2021 @ 23:00:56
Author: arojas
Revision: 904874
Simplify PKGBUILD, enforce system LDFLAGS, merge julia-docs (it's less than 10% of the total size)
Added:
julia/trunk/julia-system-gcc-libs.patch
Modified:
julia/trunk/PKGBUILD
julia/trunk/julia-system-cblas.patch
-----------------------------+
PKGBUILD | 106 +++++++-----------
julia-system-cblas.patch | 18 +--
julia-system-gcc-libs.patch | 238 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 292 insertions(+), 70 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-03-26 22:57:01 UTC (rev 904873)
+++ PKGBUILD 2021-03-26 23:00:56 UTC (rev 904874)
@@ -5,11 +5,10 @@
# Contributor: devmotion <nospam-archlinux.org at devmotion.de>
# Contributor: Valentin Churavy <v.churavy at gmail.com>
-pkgbase=julia
-pkgname=(julia julia-docs)
+pkgname=julia
epoch=2
pkgver=1.6.0
-pkgrel=3
+pkgrel=4
arch=(x86_64)
pkgdesc='High-level, high-performance, dynamic programming language'
url='https://julialang.org/'
@@ -17,33 +16,35 @@
depends=(cblas fftw hicolor-icon-theme libgit2 libunwind libutf8proc openblas
suitesparse mbedtls openlibm pcre2 llvm-libs p7zip)
makedepends=(cmake gcc-fortran python llvm patchelf)
-source=("https://github.com/JuliaLang/julia/releases/download/v$pkgver/$pkgbase-$pkgver-full.tar.gz"{,.asc}
+optdepends=('gnuplot: If using the Gaston Package from julia')
+replaces=(julia-docs)
+source=("https://github.com/JuliaLang/julia/releases/download/v$pkgver/$pkgname-$pkgver-full.tar.gz"{,.asc}
julia-system-cblas.patch
julia-hardcoded-libs.patch
- make-install-no-build.patch)
+ make-install-no-build.patch
+ julia-system-gcc-libs.patch)
+backup=(etc/julia/startup.jl)
sha256sums=('c4c6872ee79fbe6391991057c3d0007e578b28d42572b0b35dace4107fe8bdf4'
'SKIP'
- 'd4c8fe9eec1bc416549924ae328ceb3f63cc736ecd5e67886faa924e7c14bc5d'
+ 'e44c260e4111908337caa82e1c3fef563b9d40e0a30da68d6e91405bf6db24dc'
'692a51efc1a9608720a8ec8899ad62e48f0f2bf43b71e495e16f0429e8a80441'
- '8be4605f92a009072ca7e843549c225fc4e959893498e7c4f8f79e861e63714d')
-# Julia (Binary signing key) <buildbot at julialang.org>
-validpgpkeys=('3673DF529D9049477F76B37566E3C7DC03D6E495')
+ '8be4605f92a009072ca7e843549c225fc4e959893498e7c4f8f79e861e63714d'
+ '223d706718d1ba5203613dbf626f28b05cfde775652bd319904fd304c339ea17')
+validpgpkeys=('3673DF529D9049477F76B37566E3C7DC03D6E495') # Julia (Binary signing key) <buildbot at julialang.org>
prepare() {
mv julia-{f9720dc2eb,$pkgver}
- cd $pkgbase-$pkgver
+ cd $pkgname-$pkgver
+# Fix build failure with system gcc-libs
+ patch -p1 -i ../julia-system-gcc-libs.patch
+# Add and use option to build with system cblas
patch -p1 -i ../julia-system-cblas.patch # Add and use option to build with system cblas
- mkdir -p usr/lib/julia
- ln -s /usr/lib/libgcc_s.so.1 usr/lib # Workaround build failure with system gcc-libs
-
- # Don't hardcode library names
+# Don't hardcode library names
patch -p1 -i ../julia-hardcoded-libs.patch
-
- # Don't build again in install
+# Don't build again in install
patch -p1 -i ../make-install-no-build.patch
-
- # Fix test failure
+# Fix test failure
sed -e 's|0.22314355f0 + 3.1415927f0im|0.22314355f0 - 3.1415927f0im|' -i stdlib/LinearAlgebra/test/lu.jl
}
@@ -74,54 +75,37 @@
MARCH=x86-64"
build() {
- env CFLAGS="$CFLAGS -w" CXXFLAGS="$CXXFLAGS -w" make VERBOSE=1 -C $pkgbase-$pkgver $_buildopts
+ cd $pkgname-$pkgver
+ make release VERBOSE=1 JLDFLAGS=${LDFLAGS} $_buildopts
}
check() {
- cd $pkgbase-$pkgver/test
+ cd $pkgname-$pkgver/test
- # this is the make testall target, plus the --skip option from
- # travis/appveyor/circleci (one test fails with DNS resolution errors)
- # Also skip tests that check for a hardcoded version number
- ../julia --check-bounds=yes --startup-file=no ./runtests.jl all \
- --skip Sockets \
- --skip broadcast \
- --skip Distributed \
- --skip nghttp2_jll \
- --skip GMP_jll \
- --skip LibCURL \
- --skip LibSSH2_jll \
- --skip MbedTLS_jll \
- --skip SuiteSparse_jll \
- --skip PCRE2_jll \
- --skip LibGit2_jll \
- --skip MozillaCACerts_jll \
- --skip NetworkOptions
- find ../stdlib \( -name \*.cov -o -name \*.mem \) -delete
+ # this is the make testall target, plus the --skip option from
+ # travis/appveyor/circleci (one test fails with DNS resolution errors)
+ # Also skip tests that check for a hardcoded version number
+ ../julia --check-bounds=yes --startup-file=no ./runtests.jl all \
+ --skip Sockets \
+ --skip broadcast \
+ --skip Distributed \
+ --skip nghttp2_jll \
+ --skip GMP_jll \
+ --skip LibCURL \
+ --skip LibSSH2_jll \
+ --skip MbedTLS_jll \
+ --skip SuiteSparse_jll \
+ --skip PCRE2_jll \
+ --skip LibGit2_jll \
+ --skip MozillaCACerts_jll \
+ --skip NetworkOptions
+ find ../stdlib \( -name \*.cov -o -name \*.mem \) -delete
+ rm -fr ../stdlib/Artifacts/test/artifacts
}
-package_julia() {
- backup=(etc/julia/startup.jl)
- optdepends=('gnuplot: If using the Gaston Package from julia')
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install $_buildopts
- make -C $pkgbase-$pkgver DESTDIR="$pkgdir" install $_buildopts
- ln -s /usr/lib/libgcc_s.so.1 "$pkgdir"/usr/lib/julia # https://github.com/JuliaLang/julia/issues/40201
-
- # Documentation is in the julia-docs package.
- # Man pages in /usr/share/julia/doc/man are duplicate.
- rm -rf "$pkgdir/usr/share/"{doc,julia/doc}
-
- install -Dm644 $pkgbase-$pkgver/LICENSE.md \
- "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md"
+ install -Dm644 LICENSE.md -t "$pkgdir"/usr/share/licenses/$pkgname
}
-
-package_julia-docs() {
- pkgdesc='Documentation and examples for Julia'
- depends=(julia)
-
- install -d "$pkgdir/usr/share/doc"
- cp -r $pkgbase-$pkgver/doc "$pkgdir/usr/share/doc/$pkgbase"
- rm -rf "$pkgdir/usr/share/doc/julia/man"
- install -Dm644 $pkgbase-$pkgver/LICENSE.md \
- "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md"
-}
Modified: julia-system-cblas.patch
===================================================================
--- julia-system-cblas.patch 2021-03-26 22:57:01 UTC (rev 904873)
+++ julia-system-cblas.patch 2021-03-26 23:00:56 UTC (rev 904874)
@@ -17,7 +17,7 @@
index b00a41b356d8..7bc6cd69e863 100644
--- a/Make.inc
+++ b/Make.inc
-@@ -945,6 +945,7 @@ endif
+@@ -1109,6 +1109,7 @@ endif
ifeq ($(USE_SYSTEM_BLAS), 1)
ifeq ($(OS), Darwin)
USE_BLAS64 := 0
@@ -25,7 +25,7 @@
USE_SYSTEM_LAPACK := 0
LIBBLAS := -L$(build_libdir) -lgfortblas
LIBBLASNAME := libgfortblas
-@@ -957,12 +958,21 @@ LIBBLAS := -L$(build_shlibdir) -lopenblas
+@@ -1121,12 +1122,21 @@ LIBBLAS := -L$(build_shlibdir) -lopenblas
LIBBLASNAME := libopenblas
endif
@@ -52,7 +52,7 @@
index 6063e79ae956..7df60b8170d6 100644
--- a/Makefile
+++ b/Makefile
-@@ -184,6 +184,9 @@ endif
+@@ -198,6 +198,9 @@ endif
endif
JL_PRIVATE_LIBS-$(USE_SYSTEM_BLAS) += $(LIBBLASNAME)
@@ -66,7 +66,7 @@
index 70e6da933d70..8ecfa6902b59 100644
--- a/base/Makefile
+++ b/base/Makefile
-@@ -42,6 +42,7 @@ else
+@@ -54,6 +54,7 @@ else
endif
@echo "const libm_name = \"$(LIBMNAME)\"" >> $@
@echo "const libblas_name = \"$(LIBBLASNAME)\"" >> $@
@@ -75,14 +75,14 @@
ifeq ($(USE_BLAS64), 1)
@echo "const USE_BLAS64 = true" >> $@
@@ -183,6 +184,9 @@ endif
- $(eval $(call symlink_system_library,libpcre2-8,PCRE))
- $(eval $(call symlink_system_library,libdSFMT,DSFMT))
- $(eval $(call symlink_system_library,$(LIBBLASNAME),BLAS))
+ $(eval $(call symlink_system_library,PCRE,libpcre2-8))
+ $(eval $(call symlink_system_library,DSFMT,libdSFMT))
+ $(eval $(call symlink_system_library,BLAS,$(LIBBLASNAME)))
+ifneq ($(LIBCBLASNAME),$(LIBBLASNAME))
-+$(eval $(call symlink_system_library,$(LIBCBLASNAME),CBLAS))
++$(eval $(call symlink_system_library,CBLAS,$(LIBCBLASNAME)))
+endif
ifneq ($(LIBLAPACKNAME),$(LIBBLASNAME))
- $(eval $(call symlink_system_library,$(LIBLAPACKNAME),LAPACK))
+ $(eval $(call symlink_system_library,LAPACK,$(LIBLAPACKNAME)))
endif
diff --git a/stdlib/LinearAlgebra/src/blas.jl b/stdlib/LinearAlgebra/src/blas.jl
index fee8c9e74d7e..8c76d1acbf29 100644
Added: julia-system-gcc-libs.patch
===================================================================
--- julia-system-gcc-libs.patch (rev 0)
+++ julia-system-gcc-libs.patch 2021-03-26 23:00:56 UTC (rev 904874)
@@ -0,0 +1,238 @@
+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
+diff --git a/Make.inc b/Make.inc
+index 519720a861ed..7cba05806e68 100644
+--- a/Make.inc
++++ b/Make.inc
+@@ -596,6 +596,21 @@ else
+ SHLIB_EXT := so
+ endif
+
++ifeq ($(OS),WINNT)
++define versioned_libname
++$$(if $(2),$(1)-$(2).$(SHLIB_EXT),$(1).$(SHLIB_EXT))
++endef
++else ifeq ($(OS),Darwin)
++define versioned_libname
++$$(if $(2),$(1).$(2).$(SHLIB_EXT),$(1).$(SHLIB_EXT))
++endef
++else
++define versioned_libname
++$$(if $(2),$(1).$(SHLIB_EXT).$(2),$(1).$(SHLIB_EXT))
++endef
++endif
++
++
+ ifeq ($(SHLIB_EXT), so)
+ define SONAME_FLAGS
+ -Wl,-soname=$1
+@@ -1147,6 +1162,8 @@ BB_TRIPLET_LIBGFORTRAN := $(subst $(SPACE),-,$(filter-out cxx%,$(subst -,$(SPACE
+ BB_TRIPLET_CXXABI := $(subst $(SPACE),-,$(filter-out libgfortran%,$(subst -,$(SPACE),$(BB_TRIPLET_LIBGFORTRAN_CXXABI))))
+ BB_TRIPLET := $(subst $(SPACE),-,$(filter-out cxx%,$(filter-out libgfortran%,$(subst -,$(SPACE),$(BB_TRIPLET_LIBGFORTRAN_CXXABI)))))
+
++LIBGFORTRAN_VERSION := $(subst libgfortran,,$(filter libgfortran%,$(subst -,$(SPACE),$(BB_TRIPLET_LIBGFORTRAN))))
++
+ # This is the set of projects that BinaryBuilder dependencies are hooked up for.
+ BB_PROJECTS := BLASTRAMPOLINE OPENBLAS LLVM SUITESPARSE OPENLIBM GMP MBEDTLS LIBSSH2 NGHTTP2 MPFR CURL LIBGIT2 PCRE LIBUV LIBUNWIND DSFMT OBJCONV ZLIB P7ZIP CSL
+ define SET_BB_DEFAULT
+@@ -1479,8 +1496,12 @@ ifneq ($(findstring $(OS),Linux FreeBSD),)
+ LIBGCC_NAME := libgcc_s.$(SHLIB_EXT).1
+ endif
+
+-
++# USE_SYSTEM_CSL causes it to get symlinked into build_private_shlibdir
++ifeq ($(USE_SYSTEM_CSL),1)
++LIBGCC_BUILD_DEPLIB := $(call dep_lib_path,$(build_libdir),$(build_private_shlibdir)/$(LIBGCC_NAME))
++else
+ LIBGCC_BUILD_DEPLIB := $(call dep_lib_path,$(build_libdir),$(build_shlibdir)/$(LIBGCC_NAME))
++endif
+ LIBGCC_INSTALL_DEPLIB := $(call dep_lib_path,$(libdir),$(private_shlibdir)/$(LIBGCC_NAME))
+
+ # 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
+--- a/base/Makefile
++++ b/base/Makefile
+@@ -169,53 +169,69 @@ endif
+ # echo "$$P"
+
+ define symlink_system_library
+-symlink_$1: $$(build_private_libdir)/$1.$$(SHLIB_EXT)
+-$$(build_private_libdir)/$1.$$(SHLIB_EXT):
+- REALPATH=`$$(call spawn,$$(build_depsbindir)/libwhich) -p $$(notdir $$@)` && \
+- $$(call resolve_path,REALPATH) && \
+- [ -e "$$$$REALPATH" ] && \
+- ([ ! -e "$$@" ] || rm "$$@") && \
+- echo ln -sf "$$$$REALPATH" "$$@" && \
+- ln -sf "$$$$REALPATH" "$$@"
+-ifneq ($2,)
+-ifneq ($$(USE_SYSTEM_$2),0)
+-SYMLINK_SYSTEM_LIBRARIES += symlink_$1
+-endif
++libname_$2 := $$(notdir $(call versioned_libname,$2,$3))
++libpath_$2 := $$(shell $$(call spawn,$$(build_depsbindir)/libwhich) -p $$(libname_$2) 2>/dev/null)
++symlink_$2: $$(build_private_libdir)/$$(libname_$2)
++$$(build_private_libdir)/$$(libname_$2):
++ @if [ -e "$$(libpath_$2)" ]; then \
++ REALPATH=$$(libpath_$2); \
++ $$(call resolve_path,REALPATH) && \
++ [ -e "$$$$REALPATH" ] && \
++ ([ ! -e "$$@" ] || rm "$$@") && \
++ echo ln -sf "$$$$REALPATH" "$$@" && \
++ ln -sf "$$$$REALPATH" "$$@"; \
++ else \
++ if [ "$4" != "ALLOW_FAILURE" ]; then \
++ echo "System library symlink failure: Unable to locate $$(libname_$2) on your system!" >&2; \
++ false; \
++ fi; \
++ fi
++ifneq ($$(USE_SYSTEM_$1),0)
++SYMLINK_SYSTEM_LIBRARIES += symlink_$2
+ endif
+ endef
+
+ # the following excludes: libuv.a, libutf8proc.a
+
+-$(eval $(call symlink_system_library,$(LIBMNAME)))
+ ifneq ($(USE_SYSTEM_LIBM),0)
+-SYMLINK_SYSTEM_LIBRARIES += symlink_$(LIBMNAME)
++$(eval $(call symlink_system_library,LIBM,$(LIBMNAME)))
+ else ifneq ($(USE_SYSTEM_OPENLIBM),0)
+-SYMLINK_SYSTEM_LIBRARIES += symlink_$(LIBMNAME)
++$(eval $(call symlink_system_library,OPENLIBM,$(LIBMNAME)))
+ endif
+
+-$(eval $(call symlink_system_library,libpcre2-8,PCRE))
+-$(eval $(call symlink_system_library,libdSFMT,DSFMT))
+-$(eval $(call symlink_system_library,$(LIBBLASNAME),BLAS))
++$(eval $(call symlink_system_library,CSL,libgcc_s,1))
++ifneq (,$(LIBGFORTRAN_VERSION))
++$(eval $(call symlink_system_library,CSL,libgfortran,$(LIBGFORTRAN_VERSION)))
++endif
++$(eval $(call symlink_system_library,CSL,libquadmath,0))
++$(eval $(call symlink_system_library,CSL,libstdc++,6))
++# We allow libssp, libatomic and libgomp to fail as they are not available on all systems
++$(eval $(call symlink_system_library,CSL,libssp,0,ALLOW_FAILURE))
++$(eval $(call symlink_system_library,CSL,libatomic,1,ALLOW_FAILURE))
++$(eval $(call symlink_system_library,CSL,libgomp,1,ALLOW_FAILURE))
++$(eval $(call symlink_system_library,PCRE,libpcre2-8))
++$(eval $(call symlink_system_library,DSFMT,libdSFMT))
++$(eval $(call symlink_system_library,BLAS,$(LIBBLASNAME)))
+ ifneq ($(LIBLAPACKNAME),$(LIBBLASNAME))
+-$(eval $(call symlink_system_library,$(LIBLAPACKNAME),LAPACK))
++$(eval $(call symlink_system_library,LAPACK,$(LIBLAPACKNAME)))
+ endif
+-$(eval $(call symlink_system_library,libgmp,GMP))
+-$(eval $(call symlink_system_library,libmpfr,MPFR))
+-$(eval $(call symlink_system_library,libmbedtls,MBEDTLS))
+-$(eval $(call symlink_system_library,libmbedcrypto,MBEDTLS))
+-$(eval $(call symlink_system_library,libmbedx509,MBEDTLS))
+-$(eval $(call symlink_system_library,libssh2,LIBSSH2))
+-$(eval $(call symlink_system_library,libnghttp2,NGHTTP2))
+-$(eval $(call symlink_system_library,libcurl,CURL))
+-$(eval $(call symlink_system_library,libgit2,LIBGIT2))
+-$(eval $(call symlink_system_library,libamd,SUITESPARSE))
+-$(eval $(call symlink_system_library,libcamd,SUITESPARSE))
+-$(eval $(call symlink_system_library,libccolamd,SUITESPARSE))
+-$(eval $(call symlink_system_library,libcholmod,SUITESPARSE))
+-$(eval $(call symlink_system_library,libcolamd,SUITESPARSE))
+-$(eval $(call symlink_system_library,libumfpack,SUITESPARSE))
+-$(eval $(call symlink_system_library,libspqr,SUITESPARSE))
+-$(eval $(call symlink_system_library,libsuitesparseconfig,SUITESPARSE))
++$(eval $(call symlink_system_library,GMP,libgmp))
++$(eval $(call symlink_system_library,MPFR,libmpfr))
++$(eval $(call symlink_system_library,MBEDTLS,libmbedtls))
++$(eval $(call symlink_system_library,MBEDTLS,libmbedcrypto))
++$(eval $(call symlink_system_library,MBEDTLS,libmbedx509))
++$(eval $(call symlink_system_library,LIBSSH2,libssh2))
++$(eval $(call symlink_system_library,NGHTTP2,libnghttp2))
++$(eval $(call symlink_system_library,CURL,libcurl))
++$(eval $(call symlink_system_library,LIBGIT2,libgit2))
++$(eval $(call symlink_system_library,SUITESPARSE,libamd))
++$(eval $(call symlink_system_library,SUITESPARSE,libcamd))
++$(eval $(call symlink_system_library,SUITESPARSE,libccolamd))
++$(eval $(call symlink_system_library,SUITESPARSE,libcholmod))
++$(eval $(call symlink_system_library,SUITESPARSE,libcolamd))
++$(eval $(call symlink_system_library,SUITESPARSE,libumfpack))
++$(eval $(call symlink_system_library,SUITESPARSE,libspqr))
++$(eval $(call symlink_system_library,SUITESPARSE,libsuitesparseconfig))
+ # EXCLUDED LIBRARIES (installed/used, but not vendored for use with dlopen):
+ # libunwind
+ endif # WINNT
+diff --git a/deps/csl.mk b/deps/csl.mk
+index 095d4ceec4a1..423201cbb5a0 100644
+--- a/deps/csl.mk
++++ b/deps/csl.mk
+@@ -19,48 +19,34 @@ $$(build_shlibdir)/$(1): | $$(build_shlibdir)
+ [ -n "$$$${SRC_LIB}" ] && cp $$$${SRC_LIB} $$(build_shlibdir)
+ endef
+
+-ifeq ($(OS),WINNT)
+-define gen_libname
+-$$(if $(2),lib$(1)-$(2).$(SHLIB_EXT),lib$(1).$(SHLIB_EXT))
+-endef
+-else ifeq ($(OS),Darwin)
+-define gen_libname
+-$$(if $(2),lib$(1).$(2).$(SHLIB_EXT),lib$(1).$(SHLIB_EXT))
+-endef
+-else
+-define gen_libname
+-$$(if $(2),lib$(1).$(SHLIB_EXT).$(2),lib$(1).$(SHLIB_EXT))
+-endef
+-endif
+-
+ # libgfortran has multiple names; we're just going to copy any version we can find
+ # Since we're only looking in the location given by `$(FC)` this should only succeed for one.
+-$(eval $(call copy_csl,$(call gen_libname,gfortran,3)))
+-$(eval $(call copy_csl,$(call gen_libname,gfortran,4)))
+-$(eval $(call copy_csl,$(call gen_libname,gfortran,5)))
++$(eval $(call copy_csl,$(call versioned_libname,libgfortran,3)))
++$(eval $(call copy_csl,$(call versioned_libname,libgfortran,4)))
++$(eval $(call copy_csl,$(call versioned_libname,libgfortran,5)))
+
+ # These are all libraries that we should always have
+-$(eval $(call copy_csl,$(call gen_libname,quadmath,0)))
+-$(eval $(call copy_csl,$(call gen_libname,stdc++,6)))
+-$(eval $(call copy_csl,$(call gen_libname,ssp,0)))
+-$(eval $(call copy_csl,$(call gen_libname,atomic,1)))
+-$(eval $(call copy_csl,$(call gen_libname,gomp,1)))
++$(eval $(call copy_csl,$(call versioned_libname,libquadmath,0)))
++$(eval $(call copy_csl,$(call versioned_libname,libstdc++,6)))
++$(eval $(call copy_csl,$(call versioned_libname,libssp,0)))
++$(eval $(call copy_csl,$(call versioned_libname,libatomic,1)))
++$(eval $(call copy_csl,$(call versioned_libname,libgomp,1)))
+
+ ifeq ($(OS),WINNT)
+ # Windwos has special gcc_s names
+ ifeq ($(ARCH),i686)
+-$(eval $(call copy_csl,$(call gen_libname,gcc_s_sjlj,1)))
++$(eval $(call copy_csl,$(call versioned_libname,libgcc_s_sjlj,1)))
+ else
+-$(eval $(call copy_csl,$(call gen_libname,gcc_s_seh,1)))
++$(eval $(call copy_csl,$(call versioned_libname,libgcc_s_seh,1)))
+ endif
+ else
+-$(eval $(call copy_csl,$(call gen_libname,gcc_s,1)))
++$(eval $(call copy_csl,$(call versioned_libname,libgcc_s,1)))
+ endif
+ # winpthread is only Windows, pthread is only others
+ ifeq ($(OS),WINNT)
+-$(eval $(call copy_csl,$(call gen_libname,winpthread,1)))
++$(eval $(call copy_csl,$(call versioned_libname,libwinpthread,1)))
+ else
+-$(eval $(call copy_csl,$(call gen_libname,pthread,0)))
++$(eval $(call copy_csl,$(call versioned_libname,libpthread,0)))
+ endif
+
+ get-csl:
More information about the arch-commits
mailing list