Update libxcrypt, and allow changing linker again — libxcrypt → 4.5.1-1 (#13374)

* Test libxcrypt with https://github.com/besser82/libxcrypt/pull/215

Signed-off-by: Satadru Pramanik <satadru@gmail.com>

* Adjust libxcrypt build.

Signed-off-by: Satadru Pramanik <satadru@gmail.com>

* Adjust linker options.

Signed-off-by: Satadru Pramanik <satadru@gmail.com>

* xcryptest: Package File Update Run on linux/386 container.

* xcryptest: Package File Update Run on linux/amd64 container.

* xcryptest: Package File Update Run on linux/arm/v7 container.

* Remove workaround code.

Signed-off-by: Satadru Pramanik <satadru@gmail.com>

---------

Signed-off-by: Satadru Pramanik <satadru@gmail.com>
Co-authored-by: Satadru Pramanik <satadru@gmail.com>
Co-authored-by: chromebrew-actions[bot] <chromebrew-actions[bot]@users.noreply.github.com>
This commit is contained in:
chromebrew-actions[bot]
2025-11-08 12:13:04 -06:00
committed by GitHub
parent 115c84a743
commit 63acdbcf7f
5 changed files with 14 additions and 14 deletions

View File

@@ -4,7 +4,7 @@ require 'etc'
require 'open3'
OLD_CREW_VERSION ||= defined?(CREW_VERSION) ? CREW_VERSION : '1.0'
CREW_VERSION ||= '1.67.18' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION
CREW_VERSION ||= '1.67.19' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION
# Kernel architecture.
KERN_ARCH ||= Etc.uname[:machine]
@@ -244,9 +244,10 @@ end
# and if so, is it empty?
CREW_BUILD_NO_PACKAGE_FILE_HASH_UPDATES ||= ([true, false].include?(ENV.fetch('CREW_BUILD_NO_PACKAGE_FILE_HASH_UPDATES', false)) ? false : !ENV.fetch('CREW_BUILD_NO_PACKAGE_FILE_HASH_UPDATES').empty?) unless defined?(CREW_BUILD_NO_PACKAGE_FILE_HASH_UPDATES)
CREW_LINKER ||= ENV.fetch('CREW_LINKER', 'mold') unless defined?(CREW_LINKER)
CREW_LINKER_FLAGS ||= ENV.fetch('CREW_LINKER_FLAGS', '-flto=auto') unless defined?(CREW_LINKER_FLAGS)
CREW_CORE_FLAGS ||= "-O3 -pipe -ffat-lto-objects -fPIC -fuse-ld=mold #{CREW_ARCH_FLAGS} #{CREW_LINKER_FLAGS}"
CREW_CORE_FLAGS ||= "-O3 -pipe -ffat-lto-objects -fPIC -fuse-ld=#{CREW_LINKER} #{CREW_ARCH_FLAGS} #{CREW_LINKER_FLAGS}"
CREW_COMMON_FLAGS ||= "#{CREW_CORE_FLAGS} -flto=auto"
CREW_COMMON_FNO_LTO_FLAGS ||= "#{CREW_CORE_FLAGS} -fno-lto"
CREW_FNO_LTO_LDFLAGS ||= '-fno-lto'

View File

@@ -1,4 +1,4 @@
# Total size: 586489
# Total size: 1310237
/usr/local/include/crypt.h
/usr/local/include/xcrypt.h
/usr/local/lib/libcrypt.a

View File

@@ -1,4 +1,4 @@
# Total size: 640553
# Total size: 1319137
/usr/local/include/crypt.h
/usr/local/include/xcrypt.h
/usr/local/lib/libcrypt.a

View File

@@ -1,4 +1,4 @@
# Total size: 613969
# Total size: 1317569
/usr/local/include/crypt.h
/usr/local/include/xcrypt.h
/usr/local/lib64/libcrypt.a

View File

@@ -3,26 +3,25 @@ require 'buildsystems/autotools'
class Libxcrypt < Autotools
description 'Modern library for one-way hashing of passwords'
homepage 'https://github.com/besser82/libxcrypt/'
version '4.5.0'
version '4.5.1-1'
license 'LGPL-2.1+, public-domain, BSD and BSD-2'
compatibility 'all'
source_url "https://github.com/besser82/libxcrypt/releases/download/v#{version.split('-').first}/libxcrypt-#{version.split('-').first}.tar.xz"
source_sha256 '825e764e4ff2e6304adb814cda297074b222d54a04edbd8ebc7cf58fc3af857d'
source_sha256 'e9b46a62397c15372935f6a75dc3929c62161f2620be7b7f57f03d69102c1a86'
binary_compression 'tar.zst'
binary_sha256({
aarch64: '9d05e41212deaaf128aefbea85878ff9fdc20546d73a1fa90b2bf4d889f4ec06',
armv7l: '9d05e41212deaaf128aefbea85878ff9fdc20546d73a1fa90b2bf4d889f4ec06',
i686: 'd56a4db8e46c68e2d99035cb7f70339f894c206e736994dbf4100a29aec6fb21',
x86_64: '302ac5779bd28f5d54eac4b3e944faf27c5e7d4ad3f9b82304fa571950a53919'
aarch64: '0c918ceb9e8fcf139ad62088e0544362b4719f8b7e78073e7c2954b668d25e1c',
armv7l: '0c918ceb9e8fcf139ad62088e0544362b4719f8b7e78073e7c2954b668d25e1c',
i686: 'b26af1777dfb19b7ca6bf71f1d41c7fa8da9b16e0224b01c16fdf0f0c6edbce2',
x86_64: '07a0f00b62f322e9dedea378b300933163ecf067e9f334c33399428b084d6a4c'
})
depends_on 'glibc' # R
depends_on 'llvm_dev' => :build
conflicts_ok
no_lto
# Handle https://github.com/besser82/libxcrypt/issues/181
ENV['CREW_LINKER_FLAGS'] = '-Wl,--undefined-version'
ENV['CREW_LINKER'] = 'lld'
# run_tests
end