valgrind -> 3.17 (#5673)

packages/valgrind.rb

@@ -3,79 +3,36 @@ require 'package'
 class Valgrind < Package
   description 'Valgrind is an instrumentation framework for building dynamic analysis tools.'
   homepage 'https://valgrind.org/'
-  version '3.13.0-3'
+  version '3.17'
   license 'GPL-2'
   compatibility 'all'
-  source_url 'ftp://sourceware.org/pub/valgrind/valgrind-3.13.0.tar.bz2'
-  source_sha256 'd76680ef03f00cd5e970bbdcd4e57fb1f6df7d2e2c071635ef2be74790190c3b'
+  source_url 'https://sourceware.org/pub/valgrind/valgrind-3.17.0.tar.bz2'
+  source_sha256 'ad3aec668e813e40f238995f60796d9590eee64a16dff88421430630e69285a2'
 
-  binary_url ({
-    aarch64: 'https://downloads.sourceforge.net/project/chromebrew/armv7l/valgrind-3.13.0-3-chromeos-armv7l.tar.xz',
-     armv7l: 'https://downloads.sourceforge.net/project/chromebrew/armv7l/valgrind-3.13.0-3-chromeos-armv7l.tar.xz',
-       i686: 'https://downloads.sourceforge.net/project/chromebrew/i686/valgrind-3.13.0-3-chromeos-i686.tar.xz',
-     x86_64: 'https://downloads.sourceforge.net/project/chromebrew/x86_64/valgrind-3.13.0-3-chromeos-x86_64.tar.xz',
+  binary_url({
+    aarch64: 'https://github.com/chromebrew/binaries/raw/main/armv7l/valgrind-3.17-chromeos-armv7l.tar.xz',
+     armv7l: 'https://github.com/chromebrew/binaries/raw/main/armv7l/valgrind-3.17-chromeos-armv7l.tar.xz',
+       i686: 'https://github.com/chromebrew/binaries/raw/main/i686/valgrind-3.17-chromeos-i686.tar.xz',
+     x86_64: 'https://github.com/chromebrew/binaries/raw/main/x86_64/valgrind-3.17-chromeos-x86_64.tar.xz'
   })
-  binary_sha256 ({
-    aarch64: '7ed434448c96b37fae3ddc546f3950fc705892179522b16d0210292ecad9d1a4',
-     armv7l: '7ed434448c96b37fae3ddc546f3950fc705892179522b16d0210292ecad9d1a4',
-       i686: 'e332c6d0447e71c54712359d90ae986ddff253a0b2c059d882810d6159766abe',
-     x86_64: 'c468df7dad7a385b6759833b0939f2551804dde400bb3b2629315c8ee80c8b45',
+  binary_sha256({
+    aarch64: '0cf8ca23893761153fee6ffb58af0a731244fc5e36d3686fb2d9dcd870b2e250',
+     armv7l: '0cf8ca23893761153fee6ffb58af0a731244fc5e36d3686fb2d9dcd870b2e250',
+       i686: 'd2bca1735bc552d38a905ac27bd667067f9ed435c42bced73f5390711320c51a',
+     x86_64: 'ac13fa3ae34fdcd2284fbc866b2959c89e9287e60b6704e3dd8d73a165a54956'
   })
 
   def self.build
-    system 'patch -p0 << EOF
---- coregrind/m_redir.c
-+++ coregrind/m_redir.c
-@@ -1340,9 +1340,11 @@
-       add_hardwired_spec(
-          "ld-linux.so.2", "index",
-          (Addr)&VG_(x86_linux_REDIR_FOR_index), mandatory);
-+#if CI_HACK_strlen
-       add_hardwired_spec(
-          "ld-linux.so.2", "strlen",
-          (Addr)&VG_(x86_linux_REDIR_FOR_strlen), mandatory);
-+#endif
-    }
-
- #  elif defined(VGP_amd64_linux)
-@@ -1367,6 +1369,7 @@
-       add_hardwired_spec(
-          "ld-linux-x86-64.so.2", "index",
-          (Addr)&VG_(amd64_linux_REDIR_FOR_index), NULL);
-+#if CI_HACK_strlen
-       add_hardwired_spec(
-          "ld-linux-x86-64.so.2", "strlen",
-          (Addr)&VG_(amd64_linux_REDIR_FOR_strlen),
-@@ -1378,6 +1381,7 @@
-          complain_about_stripped_glibc_ldso
- #        endif
-       );
-+#endif
-    }
-
- #  elif defined(VGP_ppc32_linux)
-@@ -1452,6 +1456,7 @@
-       distros, ld.so\'s soname is ld-linux.so.3, but Ubuntu 14.04 on
-       Odroid uses ld-linux-armhf.so.3 for some reason. */
-    if (0==VG_(strcmp)("Memcheck", VG_(details).name)) {
-+#if CI_HACK_strlen
-       /* strlen */
-       add_hardwired_spec(
-          "ld-linux.so.3", "strlen",
-@@ -1485,6 +1490,7 @@
-          (Addr)&VG_(arm_linux_REDIR_FOR_strcmp),
-          complain_about_stripped_glibc_ldso
-       );
-+#endif
-    }
-
- #  elif defined(VGP_arm64_linux)
-EOF'
-    system "./configure --prefix=#{CREW_PREFIX} --libdir=#{CREW_LIB_PREFIX}"
+    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"
+    system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
   end
 end