From c9f188faf8297190d4a16d0a01aa6d3260fa90ae Mon Sep 17 00:00:00 2001 From: Ed Reel Date: Mon, 28 Oct 2019 10:01:25 -0500 Subject: [PATCH] Add meson build dependency (#3585) Move sed lines to patch section Add pre-built binaries --- packages/neovim.rb | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/packages/neovim.rb b/packages/neovim.rb index 0e4cbe109..568d36030 100644 --- a/packages/neovim.rb +++ b/packages/neovim.rb @@ -8,17 +8,28 @@ class Neovim < Package source_sha256 '9f874d3d2a74f33b931db62adebe28f8d2ec116270d1e13998b58a73348b6e56' binary_url ({ + aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/neovim-0.4.2-chromeos-armv7l.tar.xz', + armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/neovim-0.4.2-chromeos-armv7l.tar.xz', + x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/neovim-0.4.2-chromeos-x86_64.tar.xz', }) binary_sha256 ({ + aarch64: '4f34e7ec984b6e5e9ea0c71780b475157b7d158b4d4887e92d96f12531a6e4a2', + armv7l: '4f34e7ec984b6e5e9ea0c71780b475157b7d158b4d4887e92d96f12531a6e4a2', + x86_64: 'e5a5461efeab2b27240dbaa7908ceb874982d1094fafd01d5d75b0af1df7118e', }) - def self.build + depends_on 'meson' => :build + + def self.patch system "sed -i 's,add_compile_options(-fstack-protector-strong),add_compile_options(-fstack-protector-strong)\\n link_libraries(-fstack-protector-strong),g' CMakeLists.txt" system "sed -i 's,add_compile_options(-fstack-protector --param ssp-buffer-size=4),add_compile_options(-fstack-protector --param ssp-buffer-size=4)\\n link_libraries(-fstack-protector --param ssp-buffer-size=4),g' CMakeLists.txt" - system "make", "CMAKE_BUILD_TYPE=RelWithDebInfo" + end + + def self.build + system 'make', 'CMAKE_BUILD_TYPE=RelWithDebInfo' end def self.install - system "make", "DESTDIR=#{CREW_DEST_DIR}", "install" + system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install' end end