From f8feaaa464907586328e13ca51746c04ffd85506 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= Date: Thu, 5 Dec 2024 12:03:37 +0100 Subject: [PATCH] omnibus: remove libelf & glib recipes (#31783) --- omnibus/config/software/glib.rb | 58 ------------------------------- omnibus/config/software/libelf.rb | 45 ------------------------ 2 files changed, 103 deletions(-) delete mode 100644 omnibus/config/software/glib.rb delete mode 100644 omnibus/config/software/libelf.rb diff --git a/omnibus/config/software/glib.rb b/omnibus/config/software/glib.rb deleted file mode 100644 index ba57dcbd7d4c4..0000000000000 --- a/omnibus/config/software/glib.rb +++ /dev/null @@ -1,58 +0,0 @@ -# -# Copyright:: Chef Software, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -name "glib" -default_version "2.78.0" - -license "LGPL-2.1" -license_file "COPYING" -skip_transitive_dependency_licensing true - -dependency "libffi" -dependency "pcre" -dependency "elfutils" - -version("2.78.0") { source sha256: "a12ecee4622bc193bf32d683101ac486c74f1918abeb25ed0c8f644eedc5b5d4" } - -ship_source_offer true - -source url: "https://gitlab.gnome.org/GNOME/glib/-/archive/#{version}/glib-#{version}.tar.bz2" - -relative_path "glib-#{version}" - -build do - env = with_standard_compiler_flags(with_embedded_path) - - env["LDFLAGS"] << " -Wl,--no-as-needed -ldl" - - patch source: "0001-Set-dependency-method-to-pkg-config.patch", env: env - patch source: "0002-Disable-build-tests.patch", env: env - - meson_command = [ - "meson", - "_build", - "--prefix=#{install_dir}/embedded", - "--libdir=lib", - "-Dlibmount=disabled", - "-Dselinux=disabled", - "-Ddefault_library=static" - ] - - command meson_command.join(" "), env: env - - command "ninja -C _build", env: env - command "ninja -C _build install", env: env -end diff --git a/omnibus/config/software/libelf.rb b/omnibus/config/software/libelf.rb deleted file mode 100644 index 04ec768a36db8..0000000000000 --- a/omnibus/config/software/libelf.rb +++ /dev/null @@ -1,45 +0,0 @@ -# Unless explicitly stated otherwise all files in this repository are licensed -# under the Apache License Version 2.0. -# This product includes software developed at Datadog (https:#www.datadoghq.com/). -# Copyright 2016-present Datadog, Inc. - -name 'libelf' -default_version '0.178' - -version '0.178' do - source url: 'https://sourceware.org/elfutils/ftp/0.178/elfutils-0.178.tar.bz2', - sha512: '356656ad0db8f6877b461de1a11280de16a9cc5d8dde4381a938a212e828e32755135e5e3171d311c4c9297b728fbd98123048e2e8fbf7fe7de68976a2daabe5' -end - -dependency 'zlib' - -relative_path "elfutils-#{version}" - -build do - command %q(patch -p 1 <<"EOF" ---- elfutils-0.178/src/elfclassify.c 2019-11-26 22:48:42.000000000 +0000 -+++ elfutils-0.178.patched/src/elfclassify.c 2020-01-28 09:22:28.066520000 +0000 -@@ -827,7 +827,10 @@ - break; - case do_print0: - if (checks_passed == flag_print_matching) -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wunused-result" - fwrite (current_path, strlen (current_path) + 1, 1, stdout); -+#pragma GCC diagnostic pop - break; - case no_print: - if (!checks_passed) -EOF -) - env = with_standard_compiler_flags(with_embedded_path) - configure_options = [ - " --disable-static", - " --disable-debuginfod", - " --disable-dependency-tracking", - ] - configure(*configure_options, env: env) - make "-j #{workers}", :env => env - make 'install', :env => env - delete "#{install_dir}/embedded/bin/eu-*" -end