From 10718928a5744551d5562930cffc1196902e95b1 Mon Sep 17 00:00:00 2001 From: Ed Reel Date: Sun, 5 Aug 2018 12:00:11 -0500 Subject: [PATCH] Update crew to provide support for lzip compressed source code (#2505) * Update crew to support lzip compressed source code --- crew | 5 +++-- lib/const.rb | 2 +- packages/buildessential.rb | 21 ++++++++++++--------- tools/core_packages.txt | 1 + 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/crew b/crew index 757645e29..91be4a726 100755 --- a/crew +++ b/crew @@ -438,7 +438,8 @@ def unpack (meta) Dir.chdir CREW_BREW_DIR do puts "Unpacking archive, this may take awhile..." Dir.mkdir("#{extract_dir}") unless Dir.exist?("#{extract_dir}") - if meta[:filename][-4,4] == ".zip" + case File.extname meta[:filename] + when '.zip' if @opt_verbose then system "unzip", "-v", "-d", "#{extract_dir}", meta[:filename] else @@ -579,7 +580,7 @@ def install_package (pkgdir) strip_find_files "find . -type f -name 'lib*.so*' -print", "-S" # Strip binaries but not compressed archives - strip_find_files "find . -type f ! -iname '*\.bz2' ! -iname '*\.gz' ! -iname '*\.lha' ! -iname '*\.rar' ! -iname '*\.tar' ! -iname '*\.tgz' ! -iname '*\.xz' ! -iname '*\.zip' -perm /111 -print | sed -e '/lib.*\.a$/d' -e '/lib.*\.so/d'" + strip_find_files "find . -type f ! -iname '*\.bz2' ! -iname '*\.gz' ! -iname '*\.lha' ! -iname '*\.lz' ! -iname '*\.rar' ! -iname '*\.tar' ! -iname '*\.tgz' ! -iname '*\.xz' ! -iname '*\.zip' -perm /111 -print | sed -e '/lib.*\.a$/d' -e '/lib.*\.so/d'" if @opt_verbose then system "tar cvf - ./usr/* | (cd /; tar xp --keep-directory-symlink -f -)" diff --git a/lib/const.rb b/lib/const.rb index f2c32954b..432b9de91 100644 --- a/lib/const.rb +++ b/lib/const.rb @@ -1,6 +1,6 @@ # Defines common constants used in different parts of crew -CREW_VERSION = '1.0.1' +CREW_VERSION = '1.0.2' ARCH = `uname -m`.strip ARCH_LIB = if ARCH == 'x86_64' then 'lib64' else 'lib' end diff --git a/packages/buildessential.rb b/packages/buildessential.rb index 5414d5236..06dcd2d47 100644 --- a/packages/buildessential.rb +++ b/packages/buildessential.rb @@ -3,7 +3,7 @@ require 'package' class Buildessential < Package description 'A collection of tools essential to compile and build software.' homepage '' - version '1.2' + version '1.3' is_fake @@ -27,7 +27,7 @@ class Buildessential < Package # override the system version with sandbox mode enabled depends_on 'sed' - # typically required library to compile source code using "./autogen.sh" + # typically required libraries to compile source code using "./autogen.sh" depends_on 'automake' depends_on 'libtool' depends_on 'intltool' @@ -37,21 +37,24 @@ class Buildessential < Package depends_on 'flex' depends_on 'util_macros' depends_on 'gettext' - depends_on 'wget' # in some case, some patches might be required and can be downloaded using wget + depends_on 'wget' # in some cases, patches might be required and can be downloaded using wget + depends_on 'gawk' + + # compression utilities + depends_on 'lzip' depends_on 'unzip' depends_on 'zip' - depends_on 'gawk' - + # cmake depends_on 'cmake' - + # xorg protocols headers #depends_on 'xorg_proto' - + # maybe meson build system ? # depends_on 'meson' ## With python binary fixed, this chould be included here. - + # perl module build ? # depends_on 'perl_module_build' - + end diff --git a/tools/core_packages.txt b/tools/core_packages.txt index febd44285..32d811eb2 100644 --- a/tools/core_packages.txt +++ b/tools/core_packages.txt @@ -30,6 +30,7 @@ libunbound libunistring libxml2 linuxheaders +lzip m4 make most