diff --git a/core b/core deleted file mode 100644 index 3c7bb918a..000000000 Binary files a/core and /dev/null differ diff --git a/lib/buildsystems/autotools.rb b/lib/buildsystems/autotools.rb index dc257231c..157a26d61 100644 --- a/lib/buildsystems/autotools.rb +++ b/lib/buildsystems/autotools.rb @@ -19,10 +19,7 @@ class Autotools < Package end abort 'configure script not found!'.lightred unless File.file?('configure') FileUtils.chmod('+x', 'configure') - if Kernel.system('grep -q /usr/bin/file configure') - puts 'Using filefix.'.orange - system 'filefix' - end + system 'filefix', exception: false system "#{@pre_configure_options} ./configure #{CREW_CONFIGURE_OPTIONS} #{@configure_options}" end system 'make' diff --git a/lib/convenience_functions.rb b/lib/convenience_functions.rb index a151903a4..49e932d38 100644 --- a/lib/convenience_functions.rb +++ b/lib/convenience_functions.rb @@ -7,17 +7,17 @@ require_relative 'crewlog' require_relative 'downloader' class ConvenienceFunctions - def self.determine_conflicts(pkgName, filelist = File.join(CREW_META_PATH, "#{pkgName}.filelist"), excludeSuffix = nil, verbose: false) + def self.determine_conflicts(pkg_name, filelist = File.join(CREW_META_PATH, "#{pkg_name}.filelist"), exclude_suffix = nil, verbose: false) conflicts = {} target_filelist = File.readlines(filelist, chomp: true) puts 'Checking for conflicts with files from installed packages...'.orange if verbose - Dir[File.join(CREW_META_PATH, "*.filelist")].each do |filelist| - filelist_name = File.basename(filelist, ".filelist") + Dir[File.join(CREW_META_PATH, '*.filelist')].each do |filelist| + filelist_name = File.basename(filelist, '.filelist') # skip filelist belongs to the same package/explicitly excluded - next if pkgName == filelist_name || (excludeSuffix && filelist_name.end_with?(excludeSuffix)) + next if pkg_name == filelist_name || (exclude_suffix && filelist_name.end_with?(exclude_suffix)) # find out identical file paths with intersection conflict = (target_filelist & File.readlines(filelist, chomp: true)).reject(&:empty?) diff --git a/lib/deb_utils.rb b/lib/deb_utils.rb index 32fa321d7..2a06abc8e 100644 --- a/lib/deb_utils.rb +++ b/lib/deb_utils.rb @@ -47,7 +47,7 @@ module DebUtils # if target is passed as string, write matched file to filesyetem and exit function # write to filesystem return File.binwrite(name, file_content, perm: mode.to_i(8)) - elsif target.is_a?(Regexp) && name =~ (target) + elsif target.is_a?(Regexp) && name =~ target # if target is passed as regex, write matched file to filesyetem and continue # searching for another matched file until EOF # write to filesystem diff --git a/lib/fixup.rb b/lib/fixup.rb index bdcc3250e..206fa769e 100644 --- a/lib/fixup.rb +++ b/lib/fixup.rb @@ -110,6 +110,8 @@ renamed_packages = Set[ { pkg_name: 'codium', pkg_rename: 'vscodium', comments: 'Renamed to better match upstream.' }, { pkg_name: 'dstat', pkg_rename: 'py3_dool', comments: 'Following upstream rename.' }, { pkg_name: 'ffcall', pkg_rename: 'libffcall', comments: 'Renamed to better match upstream.' }, + { pkg_name: 'glibc_dev', pkg_rename: 'glibc', comments: 'Renamed to better match upstream.' }, + { pkg_name: 'glibc_lib', pkg_rename: 'glibc', comments: 'Renamed to better match upstream.' }, { pkg_name: 'glibc_standalone', pkg_rename: 'glibc', comments: 'Renamed to better match upstream.' }, { pkg_name: 'itstool', pkg_rename: 'py3_itstool', comments: 'Renamed to indicate switch to pip buildsystem.' }, { pkg_name: 'jsonc', pkg_rename: 'json_c', comments: 'Renamed to better match upstream.' }, diff --git a/manifest/armv7l/l/lrzip.filelist b/manifest/armv7l/l/lrzip.filelist new file mode 100644 index 000000000..c7bf72a23 --- /dev/null +++ b/manifest/armv7l/l/lrzip.filelist @@ -0,0 +1,33 @@ +/usr/local/bin/lrunzip +/usr/local/bin/lrz +/usr/local/bin/lrzcat +/usr/local/bin/lrzip +/usr/local/bin/lrztar +/usr/local/bin/lrzuntar +/usr/local/share/doc/lrzip/AUTHORS +/usr/local/share/doc/lrzip/BUGS +/usr/local/share/doc/lrzip/COPYING +/usr/local/share/doc/lrzip/ChangeLog +/usr/local/share/doc/lrzip/README-NOT-BACKWARD-COMPATIBLE +/usr/local/share/doc/lrzip/README.Assembler +/usr/local/share/doc/lrzip/README.benchmarks +/usr/local/share/doc/lrzip/README.lzo_compresses.test.txt +/usr/local/share/doc/lrzip/README.md +/usr/local/share/doc/lrzip/TODO +/usr/local/share/doc/lrzip/WHATS-NEW +/usr/local/share/doc/lrzip/lrzip.conf.example +/usr/local/share/doc/lrzip/lzma/7zC.txt +/usr/local/share/doc/lrzip/lzma/7zFormat.txt +/usr/local/share/doc/lrzip/lzma/Methods.txt +/usr/local/share/doc/lrzip/lzma/README +/usr/local/share/doc/lrzip/lzma/README-Alloc +/usr/local/share/doc/lrzip/lzma/history.txt +/usr/local/share/doc/lrzip/lzma/lzma.txt +/usr/local/share/doc/lrzip/magic.header.txt +/usr/local/share/man/man1/lrunzip.1.zst +/usr/local/share/man/man1/lrz.1.zst +/usr/local/share/man/man1/lrzcat.1.zst +/usr/local/share/man/man1/lrzip.1.zst +/usr/local/share/man/man1/lrztar.1.zst +/usr/local/share/man/man1/lrzuntar.1.zst +/usr/local/share/man/man5/lrzip.conf.5.zst diff --git a/manifest/armv7l/n/nasm.filelist b/manifest/armv7l/n/nasm.filelist index bf98e78fc..68ff8f8e5 100644 --- a/manifest/armv7l/n/nasm.filelist +++ b/manifest/armv7l/n/nasm.filelist @@ -1,4 +1,4 @@ /usr/local/bin/nasm /usr/local/bin/ndisasm -/usr/local/share/man/man1/nasm.1.gz -/usr/local/share/man/man1/ndisasm.1.gz +/usr/local/share/man/man1/nasm.1.zst +/usr/local/share/man/man1/ndisasm.1.zst diff --git a/manifest/i686/l/lrzip.filelist b/manifest/i686/l/lrzip.filelist new file mode 100644 index 000000000..c7bf72a23 --- /dev/null +++ b/manifest/i686/l/lrzip.filelist @@ -0,0 +1,33 @@ +/usr/local/bin/lrunzip +/usr/local/bin/lrz +/usr/local/bin/lrzcat +/usr/local/bin/lrzip +/usr/local/bin/lrztar +/usr/local/bin/lrzuntar +/usr/local/share/doc/lrzip/AUTHORS +/usr/local/share/doc/lrzip/BUGS +/usr/local/share/doc/lrzip/COPYING +/usr/local/share/doc/lrzip/ChangeLog +/usr/local/share/doc/lrzip/README-NOT-BACKWARD-COMPATIBLE +/usr/local/share/doc/lrzip/README.Assembler +/usr/local/share/doc/lrzip/README.benchmarks +/usr/local/share/doc/lrzip/README.lzo_compresses.test.txt +/usr/local/share/doc/lrzip/README.md +/usr/local/share/doc/lrzip/TODO +/usr/local/share/doc/lrzip/WHATS-NEW +/usr/local/share/doc/lrzip/lrzip.conf.example +/usr/local/share/doc/lrzip/lzma/7zC.txt +/usr/local/share/doc/lrzip/lzma/7zFormat.txt +/usr/local/share/doc/lrzip/lzma/Methods.txt +/usr/local/share/doc/lrzip/lzma/README +/usr/local/share/doc/lrzip/lzma/README-Alloc +/usr/local/share/doc/lrzip/lzma/history.txt +/usr/local/share/doc/lrzip/lzma/lzma.txt +/usr/local/share/doc/lrzip/magic.header.txt +/usr/local/share/man/man1/lrunzip.1.zst +/usr/local/share/man/man1/lrz.1.zst +/usr/local/share/man/man1/lrzcat.1.zst +/usr/local/share/man/man1/lrzip.1.zst +/usr/local/share/man/man1/lrztar.1.zst +/usr/local/share/man/man1/lrzuntar.1.zst +/usr/local/share/man/man5/lrzip.conf.5.zst diff --git a/manifest/i686/n/nasm.filelist b/manifest/i686/n/nasm.filelist index bf98e78fc..68ff8f8e5 100644 --- a/manifest/i686/n/nasm.filelist +++ b/manifest/i686/n/nasm.filelist @@ -1,4 +1,4 @@ /usr/local/bin/nasm /usr/local/bin/ndisasm -/usr/local/share/man/man1/nasm.1.gz -/usr/local/share/man/man1/ndisasm.1.gz +/usr/local/share/man/man1/nasm.1.zst +/usr/local/share/man/man1/ndisasm.1.zst diff --git a/manifest/x86_64/l/lrzip.filelist b/manifest/x86_64/l/lrzip.filelist new file mode 100644 index 000000000..c7bf72a23 --- /dev/null +++ b/manifest/x86_64/l/lrzip.filelist @@ -0,0 +1,33 @@ +/usr/local/bin/lrunzip +/usr/local/bin/lrz +/usr/local/bin/lrzcat +/usr/local/bin/lrzip +/usr/local/bin/lrztar +/usr/local/bin/lrzuntar +/usr/local/share/doc/lrzip/AUTHORS +/usr/local/share/doc/lrzip/BUGS +/usr/local/share/doc/lrzip/COPYING +/usr/local/share/doc/lrzip/ChangeLog +/usr/local/share/doc/lrzip/README-NOT-BACKWARD-COMPATIBLE +/usr/local/share/doc/lrzip/README.Assembler +/usr/local/share/doc/lrzip/README.benchmarks +/usr/local/share/doc/lrzip/README.lzo_compresses.test.txt +/usr/local/share/doc/lrzip/README.md +/usr/local/share/doc/lrzip/TODO +/usr/local/share/doc/lrzip/WHATS-NEW +/usr/local/share/doc/lrzip/lrzip.conf.example +/usr/local/share/doc/lrzip/lzma/7zC.txt +/usr/local/share/doc/lrzip/lzma/7zFormat.txt +/usr/local/share/doc/lrzip/lzma/Methods.txt +/usr/local/share/doc/lrzip/lzma/README +/usr/local/share/doc/lrzip/lzma/README-Alloc +/usr/local/share/doc/lrzip/lzma/history.txt +/usr/local/share/doc/lrzip/lzma/lzma.txt +/usr/local/share/doc/lrzip/magic.header.txt +/usr/local/share/man/man1/lrunzip.1.zst +/usr/local/share/man/man1/lrz.1.zst +/usr/local/share/man/man1/lrzcat.1.zst +/usr/local/share/man/man1/lrzip.1.zst +/usr/local/share/man/man1/lrztar.1.zst +/usr/local/share/man/man1/lrzuntar.1.zst +/usr/local/share/man/man5/lrzip.conf.5.zst diff --git a/manifest/x86_64/l/lrzip_next.filelist b/manifest/x86_64/l/lrzip_next.filelist new file mode 100644 index 000000000..1690e752f --- /dev/null +++ b/manifest/x86_64/l/lrzip_next.filelist @@ -0,0 +1,48 @@ +/usr/local/bin/lrzip-next +/usr/local/bin/lrzn +/usr/local/bin/lrzncat +/usr/local/bin/lrzntar +/usr/local/bin/lrznuntar +/usr/local/bin/lrznunzip +/usr/local/share/doc/lrzip-next/AUTHORS +/usr/local/share/doc/lrzip-next/BUGS +/usr/local/share/doc/lrzip-next/COPYING +/usr/local/share/doc/lrzip-next/CURRENT_ENCMETHODS +/usr/local/share/doc/lrzip-next/CURRENT_HASHES +/usr/local/share/doc/lrzip-next/ChangeLog +/usr/local/share/doc/lrzip-next/FEATURES +/usr/local/share/doc/lrzip-next/LICENSES/README +/usr/local/share/doc/lrzip-next/LICENSES/lrzip-next/GNU-GPL-2.0 +/usr/local/share/doc/lrzip-next/LICENSES/lzma/GNU-LGPL-2.0 +/usr/local/share/doc/lrzip-next/LICENSES/rzip/GNU-GPL-2.0 +/usr/local/share/doc/lrzip-next/LICENSES/zpaq/PUBLIC-DOMAIN +/usr/local/share/doc/lrzip-next/README-NOT-BACKWARD-COMPATIBLE +/usr/local/share/doc/lrzip-next/README.Assembler +/usr/local/share/doc/lrzip-next/README.NEW.BENCHMARK.ALGO.md +/usr/local/share/doc/lrzip-next/README.SDK19_COMPARISON.md +/usr/local/share/doc/lrzip-next/README.benchmarks +/usr/local/share/doc/lrzip-next/README.filters +/usr/local/share/doc/lrzip-next/README.lzo_compresses.test.txt +/usr/local/share/doc/lrzip-next/README.md +/usr/local/share/doc/lrzip-next/TODO +/usr/local/share/doc/lrzip-next/WHATS-NEW +/usr/local/share/doc/lrzip-next/lrzip.conf.example +/usr/local/share/doc/lrzip-next/lzma/Methods.txt +/usr/local/share/doc/lrzip-next/lzma/README +/usr/local/share/doc/lrzip-next/lzma/README-Alloc +/usr/local/share/doc/lrzip-next/lzma/README.ASM +/usr/local/share/doc/lrzip-next/lzma/README.threading +/usr/local/share/doc/lrzip-next/lzma/lzma-history.txt +/usr/local/share/doc/lrzip-next/lzma/lzma-sdk.txt +/usr/local/share/doc/lrzip-next/lzma/lzma-specification.txt +/usr/local/share/doc/lrzip-next/lzma/lzma.txt +/usr/local/share/doc/lrzip-next/magic.header.txt +/usr/local/share/doc/lrzip-next/zpaq/COPYING +/usr/local/share/doc/lrzip-next/zpaq/readme.txt +/usr/local/share/doc/lrzip-next/zpaq/zpaq206.pdf +/usr/local/share/man/man1/lrzip-next.1.zst +/usr/local/share/man/man1/lrzncat.1.zst +/usr/local/share/man/man1/lrzntar.1.zst +/usr/local/share/man/man1/lrznuntar.1.zst +/usr/local/share/man/man1/lrznunzip.1.zst +/usr/local/share/man/man5/lrzip-next.conf.5.zst diff --git a/manifest/x86_64/n/nasm.filelist b/manifest/x86_64/n/nasm.filelist index bf98e78fc..68ff8f8e5 100644 --- a/manifest/x86_64/n/nasm.filelist +++ b/manifest/x86_64/n/nasm.filelist @@ -1,4 +1,4 @@ /usr/local/bin/nasm /usr/local/bin/ndisasm -/usr/local/share/man/man1/nasm.1.gz -/usr/local/share/man/man1/ndisasm.1.gz +/usr/local/share/man/man1/nasm.1.zst +/usr/local/share/man/man1/ndisasm.1.zst diff --git a/packages/binutils.rb b/packages/binutils.rb index 7df2a2ff6..8efef5f72 100644 --- a/packages/binutils.rb +++ b/packages/binutils.rb @@ -13,23 +13,12 @@ class Binutils < Package source_sha256 '79cb120b39a195ad588cd354aed886249bfab36c808e746b30208d15271cc95c' binary_compression 'tar.zst' - case CREW_GCC_VER - when 'gcc14' - binary_sha256({ - aarch64: 'e5c64aca4584a2c275d37e58a9afc6c6c5fdf32d6e2edcff0df2bf38fb7311d2', - armv7l: 'e5c64aca4584a2c275d37e58a9afc6c6c5fdf32d6e2edcff0df2bf38fb7311d2', - i686: '67ce1feb3920893481eca99b0cb2a26a5b3192abdcea8311d3515a8d435e0da9', - x86_64: 'b7397812e623ee019376fe436d839c093ba59afab64d39555457536eeae8fe0e' - }) - when 'gcc15' - - binary_sha256({ - aarch64: '7a245c3f45a525d89204c94b6c0426be522eda1c98e703c46fb89c57a7ac5a66', - armv7l: '7a245c3f45a525d89204c94b6c0426be522eda1c98e703c46fb89c57a7ac5a66', - i686: '191651baffb2152ed544edf3747556ef7f9c4177f3ccecae93c783578b6488f5', - x86_64: 'c93ee7fa7cfc31fdb4a30438fa051ffefab18912fd6a35398dda741bebe25e32' - }) - end + binary_sha256({ + aarch64: '7a245c3f45a525d89204c94b6c0426be522eda1c98e703c46fb89c57a7ac5a66', + armv7l: '7a245c3f45a525d89204c94b6c0426be522eda1c98e703c46fb89c57a7ac5a66', + i686: '191651baffb2152ed544edf3747556ef7f9c4177f3ccecae93c783578b6488f5', + x86_64: 'c93ee7fa7cfc31fdb4a30438fa051ffefab18912fd6a35398dda741bebe25e32' + }) depends_on 'elfutils' # R depends_on 'flex' # R @@ -44,11 +33,6 @@ class Binutils < Package def self.patch system 'filefix' - # make sure we are using our shell instead of /bin/sh - system "grep -rlZ '/bin/sh ' . | xargs -0 sed -i 's,/bin/sh ,#{CREW_PREFIX}/bin/sh ,g'" - system "grep -rlZ \"/bin/sh\\\"\" . | xargs -0 sed -i 's,/bin/sh\",#{CREW_PREFIX}/bin/sh\",g'" - system "grep -rlZ \"/bin/sh'\" . | xargs -0 sed -i \"s,/bin/sh',#{CREW_PREFIX}/bin/sh',g\"" - system "sed -i 's,scriptdir = $(tooldir)/lib,scriptdir = $(tooldir)/#{ARCH_LIB},g' ld/Makefile.am" Dir.chdir 'ld' do system 'aclocal && automake' diff --git a/packages/crew_profile_base.rb b/packages/crew_profile_base.rb index db37e186e..01fd66f0f 100644 --- a/packages/crew_profile_base.rb +++ b/packages/crew_profile_base.rb @@ -3,11 +3,11 @@ require 'package' class Crew_profile_base < Package description 'Crew-profile-base sets up Chromebrew\'s environment capabilities.' homepage 'https://github.com/chromebrew/crew-profile-base' - version '0.0.26' + version '0.0.28' license 'GPL-3+' compatibility 'all' source_url "https://github.com/chromebrew/crew-profile-base/archive/refs/tags/#{version}.tar.gz" - source_sha256 '93f306c9b847cda5ec2a9a6fe675c746670f57ac7a0fe57772b3a25498a99a7c' + source_sha256 'f89b428b9ae7539bc9b10c91f8db4aaac11284ae3364a3e287e07d9fb64a0d25' no_compile_needed print_source_bashrc diff --git a/packages/filecmd.rb b/packages/filecmd.rb index ac3059df5..fc5c0305e 100644 --- a/packages/filecmd.rb +++ b/packages/filecmd.rb @@ -3,22 +3,21 @@ require 'package' class Filecmd < Package description 'file and libmagic determine file type' homepage 'https://darwinsys.com/file/' - version '5.46' + version '5.46-1' license 'BSD-2 and GPL-3+' # Chromebrew's filefix is GPL-3+, file itself is BSD-2 compatibility 'all' source_url 'https://github.com/file/file.git' - git_hashtag "FILE#{version.gsub('.', '_')}" + git_hashtag "FILE#{version.split('-').first.gsub('.', '_')}" binary_compression 'tar.zst' binary_sha256({ - aarch64: 'a39059b9d23a4edc65ce4bd4862c2bc266913dad5390a188246b397af205c99b', - armv7l: 'a39059b9d23a4edc65ce4bd4862c2bc266913dad5390a188246b397af205c99b', - i686: '280384bb1d71cc5fe88c71a7f7b80bf6dd774adb1e72acdaac5ea56c8bc589b5', - x86_64: '1eb7b2f5966d987cda130a0f9c6cf220614f4bd126a02764af68c1c860dad6d2' + aarch64: 'a9356b92cc06dfe05adf0df04dc157af9b37a668c164714658fffa05d15120b4', + armv7l: 'a9356b92cc06dfe05adf0df04dc157af9b37a668c164714658fffa05d15120b4', + i686: '17f1ca5965430ed9913af2c0747a6924ffb171103c36a1b76255317c47bdb87c', + x86_64: '8b4302f3b0c151193d1c176a02d0efa0a3db93f4ffee956ba14f984957c1cd66' }) depends_on 'bzip2' # R - depends_on 'gcc_lib' # R depends_on 'glibc' # R depends_on 'lzlib' # R Fixes checking lzlib.h usability... no depends_on 'xzutils' # R @@ -34,9 +33,19 @@ class Filecmd < Package File.write 'filefix', <<~FILEFIX_EOF #!/usr/bin/env bash + # Fix Error: /usr/bin/file file not found. + echo "filefix: Checking for scripts using: '/usr/bin/file' ..." while IFS= read -r -d '' f; do sed -i 's,/usr/bin/file,#{CREW_PREFIX}/bin/file,g' "${f}" done < <(find . -name configure -print0) + # Make sure we are using the Chromebrew bash shell instead of + # /bin/sh which in ChromeOS is actually dash. + echo "filefix: Checking for scripts using: '/bin/sh ' ..." + grep -rlZ '/bin/sh ' . | xargs -r -0 sed -i 's,/bin/sh ,#{CREW_PREFIX}/bin/sh ,g' + echo "filefix: Checking for scripts using: '/bin/sh \\\"' ..." + grep -rlZ "/bin/sh\\\"" . | xargs -r -0 sed -i 's,/bin/sh",#{CREW_PREFIX}/bin/sh",g' + echo "filefix: Checking for scripts using: \\\"'/bin/sh '\\\" ..." + grep -rlZ "/bin/sh\\\'" . | xargs -r -0 sed -i "s,/bin/sh',#{CREW_PREFIX}/bin/sh',g" FILEFIX_EOF end diff --git a/packages/gcc_build.rb b/packages/gcc_build.rb index db38049a2..15ec0fb14 100644 --- a/packages/gcc_build.rb +++ b/packages/gcc_build.rb @@ -33,18 +33,11 @@ class Gcc_build < Package depends_on 'zstd' # R conflicts_ok - # no_env_options no_mold @gcc_version = version.split('-')[0].partition('.')[0] @glibc_flags = '' - # @gcc_version = `gcc -dumpversion`.chomp - # @gcc_arch = `gcc -dumpmachine`.chomp - # @gcc_dir = "gcc/#{@gcc_arch}/#{@gcc_version}" - # @cflags = @cxxflags = "-fPIC -pipe #{@glibc_flags} -I#{CREW_PREFIX}/include" - # @cflags = @cxxflags = "-fPIC -pipe #{@glibc_flags} -fno-stack-protector -D_FORTIFY_SOURCE=0" - # @cflags = @cxxflags = "-fPIC -pipe #{@glibc_flags} -fcf-protection=none" @cflags = @cxxflags = "-fPIC -pipe #{@glibc_flags}" @languages = 'c,c++,jit,objc,fortran,go,rust' case ARCH @@ -59,10 +52,7 @@ class Gcc_build < Package @path = "#{CREW_PREFIX}/share/cargo/bin:" + ENV.fetch('PATH', nil) def self.patch - # make sure we are using our shell instead of /bin/sh - system "grep -rlZ '/bin/sh ' . | xargs -0 sed -i 's,/bin/sh ,#{CREW_PREFIX}/bin/sh ,g'" - system "grep -rlZ \"/bin/sh\\\"\" . | xargs -0 sed -i 's,/bin/sh\",#{CREW_PREFIX}/bin/sh\",g'" - system "grep -rlZ \"/bin/sh'\" . | xargs -0 sed -i \"s,/bin/sh',#{CREW_PREFIX}/bin/sh',g\"" + system 'filefix' # This fixes a PATH_MAX undefined error which breaks libsanitizer # "libsanitizer/asan/asan_linux.cpp:217:21: error: ‘PATH_MAX’ was not declared in this scope" diff --git a/packages/gdb.rb b/packages/gdb.rb index 66866b855..a4b07df28 100644 --- a/packages/gdb.rb +++ b/packages/gdb.rb @@ -13,12 +13,22 @@ class Gdb < Autotools source_sha256 'bcfcd095528a987917acf9fff3f1672181694926cc18d609c99d0042c00224c5' binary_compression 'tar.zst' - binary_sha256({ - aarch64: '877bea13576e5b36931d69624bef3471b69c4637b10ede10ac34cf79164f6167', - armv7l: '877bea13576e5b36931d69624bef3471b69c4637b10ede10ac34cf79164f6167', - i686: '432295e34df829235f1a66e8c7573a6bfa4e50261e1f9d0c98bcaea9836c7206', - x86_64: 'ccc89a610cdfff8e227dec2c1557c5c896dd6ca1878e29c8c148cf6371d8c611' - }) + case CREW_GCC_VER + when 'gcc14' + binary_sha256({ + aarch64: '877bea13576e5b36931d69624bef3471b69c4637b10ede10ac34cf79164f6167', + armv7l: '877bea13576e5b36931d69624bef3471b69c4637b10ede10ac34cf79164f6167', + i686: '432295e34df829235f1a66e8c7573a6bfa4e50261e1f9d0c98bcaea9836c7206', + x86_64: 'ccc89a610cdfff8e227dec2c1557c5c896dd6ca1878e29c8c148cf6371d8c611' + }) + when 'gcc15' + binary_sha256({ + aarch64: '619f11cd47645148aaecd0337fc9b76a3217a7fbdf5415a0a808829acc3fac21', + armv7l: '619f11cd47645148aaecd0337fc9b76a3217a7fbdf5415a0a808829acc3fac21', + i686: 'e6e92b19b0a47bec1dc643c97087195fe830faaec5d92d7517c6a6c62d08d429', + x86_64: '79ebdb1d26255898a3fb23303c61196a390d7bfa54307dc19ba47684008e7416' + }) + end depends_on 'binutils' # R depends_on 'boost' # R diff --git a/packages/lrzip.rb b/packages/lrzip.rb new file mode 100644 index 000000000..5d34dd4b1 --- /dev/null +++ b/packages/lrzip.rb @@ -0,0 +1,30 @@ +# Adapted from Arch Linux lrzip PKGBUILD at: +# https://gitlab.archlinux.org/archlinux/packaging/packages/lrzip/-/blob/main/PKGBUILD?ref_type=heads + +require 'buildsystems/autotools' + +class Lrzip < Autotools + description 'Multi-threaded compression with rzip/lzma, lzo, and zpaq' + homepage 'https://github.com/ckolivas/lrzip' + version '0.651-1242aec' + license 'GPL' + compatibility 'all' + source_url 'https://github.com/ckolivas/lrzip.git' + git_hashtag '1242aecfed4c8f10b52204d66e2daafcc53f92ac' + binary_compression 'tar.zst' + + binary_sha256({ + aarch64: '206babaa1900a768911b8c592876233afe4e2ac478228cd393aa78ca10aac1a4', + armv7l: '206babaa1900a768911b8c592876233afe4e2ac478228cd393aa78ca10aac1a4', + i686: '10452825c0b56fe013cdb217a24b2f0cf2eef9eafabfa120644b961f07c1b09c', + x86_64: 'd429d68035f3fb70e43d6fff77acd6819576abeff0fce1150d63e9b107ea72fe' + }) + + depends_on 'bzip2' # R + depends_on 'gcc_lib' # R + depends_on 'lz4' # R + depends_on 'lzo' # R + depends_on 'zlib' # R + + git_fetchtags +end diff --git a/packages/lrzip_next.rb b/packages/lrzip_next.rb new file mode 100644 index 000000000..cef20749e --- /dev/null +++ b/packages/lrzip_next.rb @@ -0,0 +1,34 @@ +# Adapted from Arch Linux lrzip-next PKGBUILD at: +# https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=lrzip-next + +require 'buildsystems/autotools' + +class Lrzip_next < Autotools + description 'Next generation multi-threaded compression with rzip' + homepage 'https://github.com/pete4abw/lrzip-next' + version '0.14.1' + license 'GPL-2.0-or-later' + compatibility 'x86_64' + source_url 'https://github.com/pete4abw/lrzip-next.git' + git_hashtag "v#{version}" + binary_compression 'tar.zst' + + binary_sha256({ + x86_64: '272ee5ebd46b39262931c9fa922f8d0eeabcef3a250fa84badae9104a088fd60' + }) + + depends_on 'nasm' => :build + depends_on 'bzip2' # R + depends_on 'bzip3' # R + depends_on 'gcc_lib' # R + depends_on 'libgcrypt' # R + depends_on 'libgpg_error' # R + depends_on 'lz4' # R + depends_on 'lzo' # R + depends_on 'zlib' # R + depends_on 'zstd' # R + + git_fetchtags + + configure_options '--enable-asm' +end diff --git a/packages/nasm.rb b/packages/nasm.rb index 8c374c99d..9122b8efa 100644 --- a/packages/nasm.rb +++ b/packages/nasm.rb @@ -1,31 +1,26 @@ -require 'package' +require 'buildsystems/autotools' -class Nasm < Package +class Nasm < Autotools description 'The Netwide Assembler' homepage 'https://www.nasm.us/' - version '2.15.05' + version '2.16.03' license 'BSD' compatibility 'all' - source_url 'https://www.nasm.us/pub/nasm/releasebuilds/2.15.05/nasm-2.15.05.tar.xz' - source_sha256 '3caf6729c1073bf96629b57cee31eeb54f4f8129b01902c73428836550b30a3f' - binary_compression 'tar.xz' + source_url 'https://github.com/netwide-assembler/nasm.git' + git_hashtag "nasm-#{version}" + binary_compression 'tar.zst' binary_sha256({ - aarch64: '341d485bb248ed27fa1deaf10d361ab13eb9ac8332298cb45d3c2199e01aca25', - armv7l: '341d485bb248ed27fa1deaf10d361ab13eb9ac8332298cb45d3c2199e01aca25', - i686: 'e78c9d471c116b2ced338a800b84a01346e964b377b0fd66f260ef517da8e801', - x86_64: '920e5d3591a66153b45d68c3e67bca8ef74cfc6cf3d71e2c4c57c5624a2b5111' + aarch64: '4204ae6b77ec62351c6e2df2b0f3cb508bbed8eaa2801fd51b0a5841048834ed', + armv7l: '4204ae6b77ec62351c6e2df2b0f3cb508bbed8eaa2801fd51b0a5841048834ed', + i686: 'f3a19c92edae475b96484e5baeb2213325a7bac352301f93b9c726e918188015', + x86_64: 'eeeeff278664d40c21fb4a06ef6157fc8e7bdfd7503fc66db840b1557c3ef779' }) - def self.build - system "env CFLAGS='-flto=auto' \ - CXXFLAGS='-flto=auto' LDFLAGS='-flto=auto' \ - ./configure \ - #{CREW_CONFIGURE_OPTIONS}" - system 'make' - end + depends_on 'py3_asciidoc' => :build + depends_on 'xmlto' => :build - def self.install - system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install' + configure_build_extras do + system 'make manpages' end end diff --git a/packages/ruby_rubygems_update.rb b/packages/ruby_rubygems_update.rb index f088373f1..fd62249e8 100644 --- a/packages/ruby_rubygems_update.rb +++ b/packages/ruby_rubygems_update.rb @@ -3,7 +3,7 @@ require 'buildsystems/ruby' class Ruby_rubygems_update < RUBY description 'RubyGems is a package management framework for Ruby.' homepage 'https://github.com/rubygems/rubygems' - version "3.6.8-#{CREW_RUBY_VER}" + version "3.6.9-#{CREW_RUBY_VER}" license 'MIT' compatibility 'all' source_url 'SKIP' diff --git a/tools/build_updated_packages.rb b/tools/build_updated_packages.rb index dc45feafe..a4fc2ff56 100755 --- a/tools/build_updated_packages.rb +++ b/tools/build_updated_packages.rb @@ -130,7 +130,7 @@ updated_packages.each do |pkg| puts "#{name.capitalize} #{@pkg_obj.version} needs builds uploaded for: #{builds_needed.join(' ')}".lightblue if builds_needed.include?(ARCH) && !File.file?("release/#{ARCH}/#{name}-#{@pkg_obj.version}-chromeos-#{ARCH}.#{@pkg_obj.binary_compression}") && agree_default_yes("\nWould you like to build #{name} #{@pkg_obj.version}") - system({ 'CREW_CACHE_ENABLED' => '1', 'LIBRARY_PATH' => "#{CREW_GLIBC_PREFIX}:#{ENV.fetch('LD_LIBRARY_PATH', "#{CREW_LIB_PREFIX}:/usr/#{ARCH_LIB}:/#{ARCH_LIB}")}" }, "yes | nice -n 20 crew build -f #{pkg}") + system "yes | nice -n 20 crew build -f #{pkg}" abort "#{pkg} build failed!".lightred unless $CHILD_STATUS.success? # Reinvoke this script to take just built packages that have been built and # installed into account, attempting uploads of just built packages immediately. diff --git a/tools/packages.yaml b/tools/packages.yaml index 64d079ecc..f0f04840d 100644 --- a/tools/packages.yaml +++ b/tools/packages.yaml @@ -5685,6 +5685,16 @@ url: https://github.com/kristapsdz/releases activity: medium --- kind: url +name: lrzip +url: https://github.com/ckolivas/lrzip/releases +activity: low +--- +kind: url +name: lrzip_next +url: https://github.com/pete4abw/lrzip-next/releases +activity: medium +--- +kind: url name: lsb_release url: https://sourceforge.net/projects/lsb/files/lsb_release/ activity: none