From 9e428b76c36127a7eeff49cd223b62442deec07c Mon Sep 17 00:00:00 2001 From: Cassandra Watergate <55339220+saltedcoffii@users.noreply.github.com> Date: Thu, 17 Mar 2022 13:56:06 -0700 Subject: [PATCH] recompile samurai for latest envvars --- packages/samurai.rb | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/packages/samurai.rb b/packages/samurai.rb index a942586ee..722d480b3 100644 --- a/packages/samurai.rb +++ b/packages/samurai.rb @@ -2,25 +2,13 @@ require 'package' class Samurai < Package description 'Samurai is a ninja compatible build tool written in C.' - homepage 'https://github.com/michaelforney/samurai' - version '1.2' + homepage 'https://github.com/michaelforney/samurai/' + @_ver = '1.2' + version @_ver + '-1' license 'Apache-2.0 and MIT' compatibility 'all' - source_url 'https://github.com/michaelforney/samurai/releases/download/1.2/samurai-1.2.tar.gz' - source_sha256 '3b8cf51548dfc49b7efe035e191ff5e1963ebc4fe8f6064a5eefc5343eaf78a5' - - binary_url ({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/samurai/1.2_armv7l/samurai-1.2-chromeos-armv7l.tar.xz', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/samurai/1.2_armv7l/samurai-1.2-chromeos-armv7l.tar.xz', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/samurai/1.2_i686/samurai-1.2-chromeos-i686.tar.xz', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/samurai/1.2_x86_64/samurai-1.2-chromeos-x86_64.tar.xz', - }) - binary_sha256 ({ - aarch64: 'bf38ed51c2b3ade1b3879a09ae2962660a7c89c88ac6dcbf673378e58b04d33c', - armv7l: 'bf38ed51c2b3ade1b3879a09ae2962660a7c89c88ac6dcbf673378e58b04d33c', - i686: '2e79ba64fe6e772aea6520b026d5564baaa7420e3b3b2fd344a39fdb18988381', - x86_64: 'a91fba00b13f46aabd60a96b652b8e4629fcd209eb18692c15f3dac1595fd9d4', - }) + source_url 'https://github.com/michaelforney/samurai.git' + git_hashtag @_ver def self.patch system "sed -i 's:PREFIX=/usr/local:PREFIX=#{CREW_PREFIX}:' Makefile" @@ -28,12 +16,16 @@ class Samurai < Package end def self.build - system "make CFLAGS='-pipe -O2 -flto=auto -fuse-ld=gold' \ - LDFLAGS='-flto=auto -fuse-ld=gold' \ + system "make CFLAGS='#{CREW_COMMON_FLAGS}' \ + LDFLAGS='#{CREW_LDFLAGS}' \ CC='#{CREW_TGT}-gcc'" end def self.install system "make", "DESTDIR=#{CREW_DEST_DIR}", "install" end + + def self.check + # no checks + end end