From 61b9796ce43b650c33bb56c85e3c2de86c413cc7 Mon Sep 17 00:00:00 2001 From: "Satadru Pramanik, DO, MPH, MEng" Date: Wed, 14 Feb 2024 13:46:51 -0500 Subject: [PATCH] valgrind => 3.22 (#9336) Signed-off-by: Satadru Pramanik --- lib/const.rb | 9 ++-- lib/package.rb | 4 +- manifest/armv7l/v/valgrind.filelist | 67 ++++------------------------- manifest/i686/v/valgrind.filelist | 67 ++++------------------------- manifest/x86_64/v/valgrind.filelist | 67 ++++------------------------- packages/valgrind.rb | 38 +++++++--------- 6 files changed, 50 insertions(+), 202 deletions(-) diff --git a/lib/const.rb b/lib/const.rb index d667ee82c..99ba2bc13 100644 --- a/lib/const.rb +++ b/lib/const.rb @@ -1,7 +1,7 @@ # lib/const.rb # Defines common constants used in different parts of crew -CREW_VERSION = '1.43.4' +CREW_VERSION = '1.43.5' # kernel architecture KERN_ARCH = `uname -m`.chomp @@ -174,21 +174,22 @@ SSL_CERT_DIR = if ENV['SSL_CERT_DIR'] && Dir.exist?(ENV['SSL_CERT_DIR']) '/etc/ssl/certs' end +CREW_ARCH_FLAGS_OVERRIDE = ENV.fetch('CREW_ARCH_FLAGS_OVERRIDE', '') case ARCH when 'aarch64', 'armv7l' CREW_TGT = 'armv7l-cros-linux-gnueabihf' CREW_BUILD = 'armv7l-cros-linux-gnueabihf' # These settings have been selected to match debian armhf. # Using -mfpu=neon breaks builds such as webkit2gtk. - CREW_ARCH_FLAGS = '-mfloat-abi=hard -mthumb -mfpu=vfpv3-d16 -march=armv7-a+fp' + CREW_ARCH_FLAGS = CREW_ARCH_FLAGS_OVERRIDE.to_s.empty? ? '-mfloat-abi=hard -mthumb -mfpu=vfpv3-d16 -march=armv7-a+fp' : CREW_ARCH_FLAGS_OVERRIDE when 'i686' CREW_TGT = 'i686-cros-linux-gnu' CREW_BUILD = 'i686-cros-linux-gnu' - CREW_ARCH_FLAGS = '' + CREW_ARCH_FLAGS = CREW_ARCH_FLAGS_OVERRIDE.to_s.empty? ? '' : CREW_ARCH_FLAGS_OVERRIDE when 'x86_64' CREW_TGT = 'x86_64-cros-linux-gnu' CREW_BUILD = 'x86_64-cros-linux-gnu' - CREW_ARCH_FLAGS = '' + CREW_ARCH_FLAGS = CREW_ARCH_FLAGS_OVERRIDE.to_s.empty? ? '' : CREW_ARCH_FLAGS_OVERRIDE end CREW_LINKER = ENV.fetch('CREW_LINKER', 'mold') diff --git a/lib/package.rb b/lib/package.rb index 56bac4ec6..7c5b8856f 100644 --- a/lib/package.rb +++ b/lib/package.rb @@ -9,7 +9,7 @@ class Package :binary_compression, :binary_url, :binary_sha256, :source_url, :source_sha256, :git_branch, :git_hashtag, :min_glibc - boolean_property :conflicts_ok, :git_clone_deep, :git_fetchtags, :gnome, :is_fake, :is_musl, :is_static, + boolean_property :arch_flags_override, :conflicts_ok, :git_clone_deep, :git_fetchtags, :gnome, :is_fake, :is_musl, :is_static, :no_compile_needed, :no_compress, :no_env_options, :no_fhs, :no_git_submodules, :no_links, :no_lto, :no_patchelf, :no_shrink, :no_strip, :no_zstd, :patchelf, :print_source_bashrc, :run_tests @@ -238,6 +238,8 @@ class Package else CREW_ENV_OPTIONS_HASH end + # Replace CREW_ARCH_FLAGS if @arch_flags_override is true. + @crew_env_options_hash = @arch_flags_override ? @crew_env_options_hash.each { |k, v| @crew_env_options_hash[k] = v.gsub(CREW_ARCH_FLAGS, CREW_ARCH_FLAGS_OVERRIDE) } : @crew_env_options_hash # add "-j#" argument to "make" at compile-time, if necessary diff --git a/manifest/armv7l/v/valgrind.filelist b/manifest/armv7l/v/valgrind.filelist index a14cc0db8..65eeb71ed 100644 --- a/manifest/armv7l/v/valgrind.filelist +++ b/manifest/armv7l/v/valgrind.filelist @@ -8,6 +8,7 @@ /usr/local/bin/valgrind-di-server /usr/local/bin/valgrind-listener /usr/local/bin/vgdb +/usr/local/include/valgrind/cachegrind.h /usr/local/include/valgrind/callgrind.h /usr/local/include/valgrind/config.h /usr/local/include/valgrind/dhat.h @@ -75,13 +76,17 @@ /usr/local/include/valgrind/pub_tool_xtmemory.h /usr/local/include/valgrind/pub_tool_xtree.h /usr/local/include/valgrind/valgrind.h +/usr/local/include/valgrind/vki/vki-amd64-freebsd.h /usr/local/include/valgrind/vki/vki-amd64-linux.h /usr/local/include/valgrind/vki/vki-arm64-linux.h /usr/local/include/valgrind/vki/vki-arm-linux.h /usr/local/include/valgrind/vki/vki-darwin.h +/usr/local/include/valgrind/vki/vki-freebsd.h /usr/local/include/valgrind/vki/vki-linux-drm.h /usr/local/include/valgrind/vki/vki-linux.h /usr/local/include/valgrind/vki/vki-linux-io_uring.h +/usr/local/include/valgrind/vki/vki-machine-types-amd64-freebsd.h +/usr/local/include/valgrind/vki/vki-machine-types-x86-freebsd.h /usr/local/include/valgrind/vki/vki-mips32-linux.h /usr/local/include/valgrind/vki/vki-mips64-linux.h /usr/local/include/valgrind/vki/vki-nanomips-linux.h @@ -103,6 +108,7 @@ /usr/local/include/valgrind/vki/vki-scnums-arm64-linux.h /usr/local/include/valgrind/vki/vki-scnums-arm-linux.h /usr/local/include/valgrind/vki/vki-scnums-darwin.h +/usr/local/include/valgrind/vki/vki-scnums-freebsd.h /usr/local/include/valgrind/vki/vki-scnums-mips32-linux.h /usr/local/include/valgrind/vki/vki-scnums-mips64-linux.h /usr/local/include/valgrind/vki/vki-scnums-nanomips-linux.h @@ -114,6 +120,7 @@ /usr/local/include/valgrind/vki/vki-scnums-x86-linux.h /usr/local/include/valgrind/vki/vki-solaris.h /usr/local/include/valgrind/vki/vki-solaris-repcache.h +/usr/local/include/valgrind/vki/vki-x86-freebsd.h /usr/local/include/valgrind/vki/vki-x86-linux.h /usr/local/include/valgrind/vki/vki-xen-domctl.h /usr/local/include/valgrind/vki/vki-xen-evtchn.h @@ -249,6 +256,8 @@ /usr/local/libexec/valgrind/s390x-linux64.xml /usr/local/libexec/valgrind/s390x-vx-linux-valgrind.xml /usr/local/libexec/valgrind/s390x-vx-linux.xml +/usr/local/libexec/valgrind/valgrind-monitor-def.py +/usr/local/libexec/valgrind/valgrind-monitor.py /usr/local/libexec/valgrind/vgpreload_core-arm-linux.so /usr/local/libexec/valgrind/vgpreload_dhat-arm-linux.so /usr/local/libexec/valgrind/vgpreload_drd-arm-linux.so @@ -261,61 +270,3 @@ /usr/local/lib/valgrind/libreplacemalloc_toolpreload-arm-linux.a /usr/local/lib/valgrind/libvex-arm-linux.a /usr/local/lib/valgrind/libvexmultiarch-arm-linux.a -/usr/local/share/doc/valgrind/html/bbv-manual.html -/usr/local/share/doc/valgrind/html/cg-manual.html -/usr/local/share/doc/valgrind/html/cl-format.html -/usr/local/share/doc/valgrind/html/cl-manual.html -/usr/local/share/doc/valgrind/html/design-impl.html -/usr/local/share/doc/valgrind/html/dh-manual.html -/usr/local/share/doc/valgrind/html/dist.authors.html -/usr/local/share/doc/valgrind/html/dist.html -/usr/local/share/doc/valgrind/html/dist.news.html -/usr/local/share/doc/valgrind/html/dist.news.old.html -/usr/local/share/doc/valgrind/html/dist.readme-android_emulator.html -/usr/local/share/doc/valgrind/html/dist.readme-android.html -/usr/local/share/doc/valgrind/html/dist.readme-developers.html -/usr/local/share/doc/valgrind/html/dist.readme.html -/usr/local/share/doc/valgrind/html/dist.readme-mips.html -/usr/local/share/doc/valgrind/html/dist.readme-missing.html -/usr/local/share/doc/valgrind/html/dist.readme-packagers.html -/usr/local/share/doc/valgrind/html/dist.readme-s390.html -/usr/local/share/doc/valgrind/html/dist.readme-solaris.html -/usr/local/share/doc/valgrind/html/drd-manual.html -/usr/local/share/doc/valgrind/html/faq.html -/usr/local/share/doc/valgrind/html/FAQ.html -/usr/local/share/doc/valgrind/html/hg-manual.html -/usr/local/share/doc/valgrind/html/images/dh-tree.png -/usr/local/share/doc/valgrind/html/images/home.png -/usr/local/share/doc/valgrind/html/images/kcachegrind_xtree.png -/usr/local/share/doc/valgrind/html/images/next.png -/usr/local/share/doc/valgrind/html/images/prev.png -/usr/local/share/doc/valgrind/html/images/up.png -/usr/local/share/doc/valgrind/html/index.html -/usr/local/share/doc/valgrind/html/license.gfdl.html -/usr/local/share/doc/valgrind/html/license.gpl.html -/usr/local/share/doc/valgrind/html/licenses.html -/usr/local/share/doc/valgrind/html/lk-manual.html -/usr/local/share/doc/valgrind/html/manual-core-adv.html -/usr/local/share/doc/valgrind/html/manual-core.html -/usr/local/share/doc/valgrind/html/manual.html -/usr/local/share/doc/valgrind/html/manual-intro.html -/usr/local/share/doc/valgrind/html/manual-writing-tools.html -/usr/local/share/doc/valgrind/html/mc-manual.html -/usr/local/share/doc/valgrind/html/ms-manual.html -/usr/local/share/doc/valgrind/html/nl-manual.html -/usr/local/share/doc/valgrind/html/quick-start.html -/usr/local/share/doc/valgrind/html/QuickStart.html -/usr/local/share/doc/valgrind/html/tech-docs.html -/usr/local/share/doc/valgrind/html/vg_basic.css -/usr/local/share/doc/valgrind/valgrind_manual.pdf -/usr/local/share/doc/valgrind/valgrind_manual.ps -/usr/local/share/man/man1/callgrind_annotate.1.gz -/usr/local/share/man/man1/callgrind_control.1.gz -/usr/local/share/man/man1/cg_annotate.1.gz -/usr/local/share/man/man1/cg_diff.1.gz -/usr/local/share/man/man1/cg_merge.1.gz -/usr/local/share/man/man1/ms_print.1.gz -/usr/local/share/man/man1/valgrind.1.gz -/usr/local/share/man/man1/valgrind-di-server.1.gz -/usr/local/share/man/man1/valgrind-listener.1.gz -/usr/local/share/man/man1/vgdb.1.gz diff --git a/manifest/i686/v/valgrind.filelist b/manifest/i686/v/valgrind.filelist index 3aa9c51f9..08e7a312d 100644 --- a/manifest/i686/v/valgrind.filelist +++ b/manifest/i686/v/valgrind.filelist @@ -8,6 +8,7 @@ /usr/local/bin/valgrind-di-server /usr/local/bin/valgrind-listener /usr/local/bin/vgdb +/usr/local/include/valgrind/cachegrind.h /usr/local/include/valgrind/callgrind.h /usr/local/include/valgrind/config.h /usr/local/include/valgrind/dhat.h @@ -75,13 +76,17 @@ /usr/local/include/valgrind/pub_tool_xtmemory.h /usr/local/include/valgrind/pub_tool_xtree.h /usr/local/include/valgrind/valgrind.h +/usr/local/include/valgrind/vki/vki-amd64-freebsd.h /usr/local/include/valgrind/vki/vki-amd64-linux.h /usr/local/include/valgrind/vki/vki-arm64-linux.h /usr/local/include/valgrind/vki/vki-arm-linux.h /usr/local/include/valgrind/vki/vki-darwin.h +/usr/local/include/valgrind/vki/vki-freebsd.h /usr/local/include/valgrind/vki/vki-linux-drm.h /usr/local/include/valgrind/vki/vki-linux.h /usr/local/include/valgrind/vki/vki-linux-io_uring.h +/usr/local/include/valgrind/vki/vki-machine-types-amd64-freebsd.h +/usr/local/include/valgrind/vki/vki-machine-types-x86-freebsd.h /usr/local/include/valgrind/vki/vki-mips32-linux.h /usr/local/include/valgrind/vki/vki-mips64-linux.h /usr/local/include/valgrind/vki/vki-nanomips-linux.h @@ -103,6 +108,7 @@ /usr/local/include/valgrind/vki/vki-scnums-arm64-linux.h /usr/local/include/valgrind/vki/vki-scnums-arm-linux.h /usr/local/include/valgrind/vki/vki-scnums-darwin.h +/usr/local/include/valgrind/vki/vki-scnums-freebsd.h /usr/local/include/valgrind/vki/vki-scnums-mips32-linux.h /usr/local/include/valgrind/vki/vki-scnums-mips64-linux.h /usr/local/include/valgrind/vki/vki-scnums-nanomips-linux.h @@ -114,6 +120,7 @@ /usr/local/include/valgrind/vki/vki-scnums-x86-linux.h /usr/local/include/valgrind/vki/vki-solaris.h /usr/local/include/valgrind/vki/vki-solaris-repcache.h +/usr/local/include/valgrind/vki/vki-x86-freebsd.h /usr/local/include/valgrind/vki/vki-x86-linux.h /usr/local/include/valgrind/vki/vki-xen-domctl.h /usr/local/include/valgrind/vki/vki-xen-evtchn.h @@ -249,6 +256,8 @@ /usr/local/libexec/valgrind/s390x-linux64.xml /usr/local/libexec/valgrind/s390x-vx-linux-valgrind.xml /usr/local/libexec/valgrind/s390x-vx-linux.xml +/usr/local/libexec/valgrind/valgrind-monitor-def.py +/usr/local/libexec/valgrind/valgrind-monitor.py /usr/local/libexec/valgrind/vgpreload_core-x86-linux.so /usr/local/libexec/valgrind/vgpreload_dhat-x86-linux.so /usr/local/libexec/valgrind/vgpreload_drd-x86-linux.so @@ -261,61 +270,3 @@ /usr/local/lib/valgrind/libreplacemalloc_toolpreload-x86-linux.a /usr/local/lib/valgrind/libvexmultiarch-x86-linux.a /usr/local/lib/valgrind/libvex-x86-linux.a -/usr/local/share/doc/valgrind/html/bbv-manual.html -/usr/local/share/doc/valgrind/html/cg-manual.html -/usr/local/share/doc/valgrind/html/cl-format.html -/usr/local/share/doc/valgrind/html/cl-manual.html -/usr/local/share/doc/valgrind/html/design-impl.html -/usr/local/share/doc/valgrind/html/dh-manual.html -/usr/local/share/doc/valgrind/html/dist.authors.html -/usr/local/share/doc/valgrind/html/dist.html -/usr/local/share/doc/valgrind/html/dist.news.html -/usr/local/share/doc/valgrind/html/dist.news.old.html -/usr/local/share/doc/valgrind/html/dist.readme-android_emulator.html -/usr/local/share/doc/valgrind/html/dist.readme-android.html -/usr/local/share/doc/valgrind/html/dist.readme-developers.html -/usr/local/share/doc/valgrind/html/dist.readme.html -/usr/local/share/doc/valgrind/html/dist.readme-mips.html -/usr/local/share/doc/valgrind/html/dist.readme-missing.html -/usr/local/share/doc/valgrind/html/dist.readme-packagers.html -/usr/local/share/doc/valgrind/html/dist.readme-s390.html -/usr/local/share/doc/valgrind/html/dist.readme-solaris.html -/usr/local/share/doc/valgrind/html/drd-manual.html -/usr/local/share/doc/valgrind/html/faq.html -/usr/local/share/doc/valgrind/html/FAQ.html -/usr/local/share/doc/valgrind/html/hg-manual.html -/usr/local/share/doc/valgrind/html/images/dh-tree.png -/usr/local/share/doc/valgrind/html/images/home.png -/usr/local/share/doc/valgrind/html/images/kcachegrind_xtree.png -/usr/local/share/doc/valgrind/html/images/next.png -/usr/local/share/doc/valgrind/html/images/prev.png -/usr/local/share/doc/valgrind/html/images/up.png -/usr/local/share/doc/valgrind/html/index.html -/usr/local/share/doc/valgrind/html/license.gfdl.html -/usr/local/share/doc/valgrind/html/license.gpl.html -/usr/local/share/doc/valgrind/html/licenses.html -/usr/local/share/doc/valgrind/html/lk-manual.html -/usr/local/share/doc/valgrind/html/manual-core-adv.html -/usr/local/share/doc/valgrind/html/manual-core.html -/usr/local/share/doc/valgrind/html/manual.html -/usr/local/share/doc/valgrind/html/manual-intro.html -/usr/local/share/doc/valgrind/html/manual-writing-tools.html -/usr/local/share/doc/valgrind/html/mc-manual.html -/usr/local/share/doc/valgrind/html/ms-manual.html -/usr/local/share/doc/valgrind/html/nl-manual.html -/usr/local/share/doc/valgrind/html/quick-start.html -/usr/local/share/doc/valgrind/html/QuickStart.html -/usr/local/share/doc/valgrind/html/tech-docs.html -/usr/local/share/doc/valgrind/html/vg_basic.css -/usr/local/share/doc/valgrind/valgrind_manual.pdf -/usr/local/share/doc/valgrind/valgrind_manual.ps -/usr/local/share/man/man1/callgrind_annotate.1.gz -/usr/local/share/man/man1/callgrind_control.1.gz -/usr/local/share/man/man1/cg_annotate.1.gz -/usr/local/share/man/man1/cg_diff.1.gz -/usr/local/share/man/man1/cg_merge.1.gz -/usr/local/share/man/man1/ms_print.1.gz -/usr/local/share/man/man1/valgrind.1.gz -/usr/local/share/man/man1/valgrind-di-server.1.gz -/usr/local/share/man/man1/valgrind-listener.1.gz -/usr/local/share/man/man1/vgdb.1.gz diff --git a/manifest/x86_64/v/valgrind.filelist b/manifest/x86_64/v/valgrind.filelist index 3401dc15f..a2d7878dd 100644 --- a/manifest/x86_64/v/valgrind.filelist +++ b/manifest/x86_64/v/valgrind.filelist @@ -8,6 +8,7 @@ /usr/local/bin/valgrind-di-server /usr/local/bin/valgrind-listener /usr/local/bin/vgdb +/usr/local/include/valgrind/cachegrind.h /usr/local/include/valgrind/callgrind.h /usr/local/include/valgrind/config.h /usr/local/include/valgrind/dhat.h @@ -75,13 +76,17 @@ /usr/local/include/valgrind/pub_tool_xtmemory.h /usr/local/include/valgrind/pub_tool_xtree.h /usr/local/include/valgrind/valgrind.h +/usr/local/include/valgrind/vki/vki-amd64-freebsd.h /usr/local/include/valgrind/vki/vki-amd64-linux.h /usr/local/include/valgrind/vki/vki-arm64-linux.h /usr/local/include/valgrind/vki/vki-arm-linux.h /usr/local/include/valgrind/vki/vki-darwin.h +/usr/local/include/valgrind/vki/vki-freebsd.h /usr/local/include/valgrind/vki/vki-linux-drm.h /usr/local/include/valgrind/vki/vki-linux.h /usr/local/include/valgrind/vki/vki-linux-io_uring.h +/usr/local/include/valgrind/vki/vki-machine-types-amd64-freebsd.h +/usr/local/include/valgrind/vki/vki-machine-types-x86-freebsd.h /usr/local/include/valgrind/vki/vki-mips32-linux.h /usr/local/include/valgrind/vki/vki-mips64-linux.h /usr/local/include/valgrind/vki/vki-nanomips-linux.h @@ -103,6 +108,7 @@ /usr/local/include/valgrind/vki/vki-scnums-arm64-linux.h /usr/local/include/valgrind/vki/vki-scnums-arm-linux.h /usr/local/include/valgrind/vki/vki-scnums-darwin.h +/usr/local/include/valgrind/vki/vki-scnums-freebsd.h /usr/local/include/valgrind/vki/vki-scnums-mips32-linux.h /usr/local/include/valgrind/vki/vki-scnums-mips64-linux.h /usr/local/include/valgrind/vki/vki-scnums-nanomips-linux.h @@ -114,6 +120,7 @@ /usr/local/include/valgrind/vki/vki-scnums-x86-linux.h /usr/local/include/valgrind/vki/vki-solaris.h /usr/local/include/valgrind/vki/vki-solaris-repcache.h +/usr/local/include/valgrind/vki/vki-x86-freebsd.h /usr/local/include/valgrind/vki/vki-x86-linux.h /usr/local/include/valgrind/vki/vki-xen-domctl.h /usr/local/include/valgrind/vki/vki-xen-evtchn.h @@ -255,67 +262,11 @@ /usr/local/libexec/valgrind/s390x-linux64.xml /usr/local/libexec/valgrind/s390x-vx-linux-valgrind.xml /usr/local/libexec/valgrind/s390x-vx-linux.xml +/usr/local/libexec/valgrind/valgrind-monitor-def.py +/usr/local/libexec/valgrind/valgrind-monitor.py /usr/local/libexec/valgrind/vgpreload_core-amd64-linux.so /usr/local/libexec/valgrind/vgpreload_dhat-amd64-linux.so /usr/local/libexec/valgrind/vgpreload_drd-amd64-linux.so /usr/local/libexec/valgrind/vgpreload_helgrind-amd64-linux.so /usr/local/libexec/valgrind/vgpreload_massif-amd64-linux.so /usr/local/libexec/valgrind/vgpreload_memcheck-amd64-linux.so -/usr/local/share/doc/valgrind/html/bbv-manual.html -/usr/local/share/doc/valgrind/html/cg-manual.html -/usr/local/share/doc/valgrind/html/cl-format.html -/usr/local/share/doc/valgrind/html/cl-manual.html -/usr/local/share/doc/valgrind/html/design-impl.html -/usr/local/share/doc/valgrind/html/dh-manual.html -/usr/local/share/doc/valgrind/html/dist.authors.html -/usr/local/share/doc/valgrind/html/dist.html -/usr/local/share/doc/valgrind/html/dist.news.html -/usr/local/share/doc/valgrind/html/dist.news.old.html -/usr/local/share/doc/valgrind/html/dist.readme-android_emulator.html -/usr/local/share/doc/valgrind/html/dist.readme-android.html -/usr/local/share/doc/valgrind/html/dist.readme-developers.html -/usr/local/share/doc/valgrind/html/dist.readme.html -/usr/local/share/doc/valgrind/html/dist.readme-mips.html -/usr/local/share/doc/valgrind/html/dist.readme-missing.html -/usr/local/share/doc/valgrind/html/dist.readme-packagers.html -/usr/local/share/doc/valgrind/html/dist.readme-s390.html -/usr/local/share/doc/valgrind/html/dist.readme-solaris.html -/usr/local/share/doc/valgrind/html/drd-manual.html -/usr/local/share/doc/valgrind/html/faq.html -/usr/local/share/doc/valgrind/html/FAQ.html -/usr/local/share/doc/valgrind/html/hg-manual.html -/usr/local/share/doc/valgrind/html/images/dh-tree.png -/usr/local/share/doc/valgrind/html/images/home.png -/usr/local/share/doc/valgrind/html/images/kcachegrind_xtree.png -/usr/local/share/doc/valgrind/html/images/next.png -/usr/local/share/doc/valgrind/html/images/prev.png -/usr/local/share/doc/valgrind/html/images/up.png -/usr/local/share/doc/valgrind/html/index.html -/usr/local/share/doc/valgrind/html/license.gfdl.html -/usr/local/share/doc/valgrind/html/license.gpl.html -/usr/local/share/doc/valgrind/html/licenses.html -/usr/local/share/doc/valgrind/html/lk-manual.html -/usr/local/share/doc/valgrind/html/manual-core-adv.html -/usr/local/share/doc/valgrind/html/manual-core.html -/usr/local/share/doc/valgrind/html/manual.html -/usr/local/share/doc/valgrind/html/manual-intro.html -/usr/local/share/doc/valgrind/html/manual-writing-tools.html -/usr/local/share/doc/valgrind/html/mc-manual.html -/usr/local/share/doc/valgrind/html/ms-manual.html -/usr/local/share/doc/valgrind/html/nl-manual.html -/usr/local/share/doc/valgrind/html/quick-start.html -/usr/local/share/doc/valgrind/html/QuickStart.html -/usr/local/share/doc/valgrind/html/tech-docs.html -/usr/local/share/doc/valgrind/html/vg_basic.css -/usr/local/share/doc/valgrind/valgrind_manual.pdf -/usr/local/share/doc/valgrind/valgrind_manual.ps -/usr/local/share/man/man1/callgrind_annotate.1.gz -/usr/local/share/man/man1/callgrind_control.1.gz -/usr/local/share/man/man1/cg_annotate.1.gz -/usr/local/share/man/man1/cg_diff.1.gz -/usr/local/share/man/man1/cg_merge.1.gz -/usr/local/share/man/man1/ms_print.1.gz -/usr/local/share/man/man1/valgrind.1.gz -/usr/local/share/man/man1/valgrind-di-server.1.gz -/usr/local/share/man/man1/valgrind-listener.1.gz -/usr/local/share/man/man1/vgdb.1.gz diff --git a/packages/valgrind.rb b/packages/valgrind.rb index 3f2dc17db..70a7eda07 100644 --- a/packages/valgrind.rb +++ b/packages/valgrind.rb @@ -1,35 +1,27 @@ -require 'package' +require 'buildsystems/autotools' -class Valgrind < Package +class Valgrind < Autotools description 'Valgrind is an instrumentation framework for building dynamic analysis tools.' homepage 'https://valgrind.org/' - version '3.17' + version '3.22-41ff9aa' license 'GPL-2' compatibility 'all' - source_url 'https://sourceware.org/pub/valgrind/valgrind-3.17.0.tar.bz2' - source_sha256 'ad3aec668e813e40f238995f60796d9590eee64a16dff88421430630e69285a2' - binary_compression 'tar.xz' + source_url 'https://sourceware.org/git/valgrind.git' + git_hashtag '41ff9aa49f6c54c66d0e6b37f265fd9cb0176057' + binary_compression 'tar.zst' binary_sha256({ - aarch64: '0cf8ca23893761153fee6ffb58af0a731244fc5e36d3686fb2d9dcd870b2e250', - armv7l: '0cf8ca23893761153fee6ffb58af0a731244fc5e36d3686fb2d9dcd870b2e250', - i686: 'd2bca1735bc552d38a905ac27bd667067f9ed435c42bced73f5390711320c51a', - x86_64: 'ac13fa3ae34fdcd2284fbc866b2959c89e9287e60b6704e3dd8d73a165a54956' + aarch64: 'e3c3d347b45971e24cac11925197cc24a2ce43ac25b1131ada88fcc2bb2c94e0', + armv7l: 'e3c3d347b45971e24cac11925197cc24a2ce43ac25b1131ada88fcc2bb2c94e0', + i686: 'e097e4042c6ae9230b3cbe4ec9e759bc0b6d3a77ed0e7319c4459358a6332998', + x86_64: 'e3993dab53a717956627fcc39f6050c24852dd72e096158d40ca782d83581418' }) depends_on 'glibc' # R - - def self.build - system 'autoreconf -fvi' - system "env #{CREW_ENV_OPTIONS} - RANLIB=gcc-ranlib \ - AR=gcc-ar \ - ./configure #{CREW_OPTIONS} \ - --enable-lto" - system 'make' - end - - def self.install - system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install' + no_lto + case ARCH + when 'aarch64', 'armv7l' + arch_flags_override end + configure_options (ARCH == 'x86_64' ? '--enable-only64bit' : '--enable-only32bit').to_s end