Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump(main/valgrind): 3.22.0 -> 3.24.0 #22758

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
+15 −164
Draft

bump(main/valgrind): 3.22.0 -> 3.24.0 #22758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
40f1b86
bump(main/valgrind): 3.22.0 -> 3.24.0
mbekkomo Jan 5, 2025
81420cd
fix libgcc
mbekkomo Jan 5, 2025
bef9ee0
remove aarch64 setjmp patch
mbekkomo Jan 5, 2025
7f9c6e5
fix cp invocation
mbekkomo Jan 5, 2025
5703998
remove several code
mbekkomo Jan 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions packages/valgrind/Makefile.all.am.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
--- a/Makefile.all.am
+++ b/Makefile.all.am
@@ -335,13 +335,13 @@
--- valgrind-3.24.0/Makefile.all.am 2024-11-01 13:07:00.000000000 +0800
+++ valgrind-3.24.0.mod/Makefile.all.am 2025-01-05 20:33:44.924788548 +0800
@@ -336,13 +336,16 @@
PRELOAD_LDFLAGS_COMMON_LINUX += -nostdlib
endif

-PRELOAD_LDFLAGS_X86_LINUX = $(PRELOAD_LDFLAGS_COMMON_LINUX) @FLAG_M32@
-PRELOAD_LDFLAGS_AMD64_LINUX = $(PRELOAD_LDFLAGS_COMMON_LINUX) @FLAG_M64@
+PRELOAD_LDFLAGS_X86_LINUX = $(PRELOAD_LDFLAGS_COMMON_LINUX) @FLAG_M32@ $(shell $(CC) @FLAG_M32@ -print-libgcc-file-name)
+PRELOAD_LDFLAGS_AMD64_LINUX = $(PRELOAD_LDFLAGS_COMMON_LINUX) @FLAG_M64@ $(shell $(CC) @FLAG_M64@ -print-libgcc-file-name)
+LIBGCC32 := $(shell $(CC) @FLAG_M32@ -print-libgcc-file-name)
+LIBGCC64 := $(shell $(CC) @FLAG_M64@ -print-libgcc-file-name)
+
+PRELOAD_LDFLAGS_X86_LINUX = $(PRELOAD_LDFLAGS_COMMON_LINUX) @FLAG_M32@ $(LIBGCC32)
+PRELOAD_LDFLAGS_AMD64_LINUX = $(PRELOAD_LDFLAGS_COMMON_LINUX) @FLAG_M64@ $(LIBGCC64)
PRELOAD_LDFLAGS_PPC32_LINUX = $(PRELOAD_LDFLAGS_COMMON_LINUX) @FLAG_M32@
PRELOAD_LDFLAGS_PPC64BE_LINUX = $(PRELOAD_LDFLAGS_COMMON_LINUX) @FLAG_M64@
PRELOAD_LDFLAGS_PPC64LE_LINUX = $(PRELOAD_LDFLAGS_COMMON_LINUX) @FLAG_M64@
-PRELOAD_LDFLAGS_ARM_LINUX = $(PRELOAD_LDFLAGS_COMMON_LINUX) @FLAG_M32@
-PRELOAD_LDFLAGS_ARM64_LINUX = $(PRELOAD_LDFLAGS_COMMON_LINUX) @FLAG_M64@
+PRELOAD_LDFLAGS_ARM_LINUX = $(PRELOAD_LDFLAGS_COMMON_LINUX) @FLAG_M32@ $(shell $(CC) @FLAG_M32@ -print-libgcc-file-name)
+PRELOAD_LDFLAGS_ARM64_LINUX = $(PRELOAD_LDFLAGS_COMMON_LINUX) @FLAG_M64@ $(shell $(CC) @FLAG_M64@ -print-libgcc-file-name)
PRELOAD_LDFLAGS_X86_FREEBSD = $(PRELOAD_LDFLAGS_COMMON_FREEBSD) @FLAG_M32@
PRELOAD_LDFLAGS_AMD64_FREEBSD= $(PRELOAD_LDFLAGS_COMMON_FREEBSD) @FLAG_M64@
PRELOAD_LDFLAGS_X86_DARWIN = $(PRELOAD_LDFLAGS_COMMON_DARWIN) -arch i386
+PRELOAD_LDFLAGS_ARM_LINUX = $(PRELOAD_LDFLAGS_COMMON_LINUX) @FLAG_M32@ $(LIBGCC32)
+PRELOAD_LDFLAGS_ARM64_LINUX = $(PRELOAD_LDFLAGS_COMMON_LINUX) @FLAG_M64@ $(LIBGCC64)
PRELOAD_LDFLAGS_X86_FREEBSD = $(PRELOAD_LDFLAGS_COMMON_FREEBSD) @FLAG_M32@
PRELOAD_LDFLAGS_AMD64_FREEBSD = $(PRELOAD_LDFLAGS_COMMON_FREEBSD) @FLAG_M64@
PRELOAD_LDFLAGS_ARM64_FREEBSD = $(PRELOAD_LDFLAGS_COMMON_FREEBSD) @FLAG_M64@
128 changes: 0 additions & 128 deletions packages/valgrind/aarch64-setjmp.S
View file
Open in desktop

This file was deleted.

8 changes: 2 additions & 6 deletions packages/valgrind/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://valgrind.org/
TERMUX_PKG_DESCRIPTION="Instrumentation framework for building dynamic analysis tools"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="3.22.0"
TERMUX_PKG_REVISION=1
TERMUX_PKG_VERSION="3.24.0"
TERMUX_PKG_SRCURL=http://sourceware.org/pub/valgrind/valgrind-${TERMUX_PKG_VERSION}.tar.bz2
TERMUX_PKG_SHA256=c811db5add2c5f729944caf47c4e7a65dcaabb9461e472b578765dd7bf6d2d4c
TERMUX_PKG_SHA256=71aee202bdef1ae73898ccf7e9c315134fa7db6c246063afc503aef702ec03bd
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_BUILD_DEPENDS="binutils-cross"
TERMUX_PKG_BREAKS="valgrind-dev"
Expand All @@ -16,9 +15,6 @@ termux_step_pre_configure() {
CFLAGS=${CFLAGS/-fstack-protector-strong/}

if [ "$TERMUX_ARCH" == "aarch64" ]; then
cp $TERMUX_PKG_BUILDER_DIR/aarch64-setjmp.S $TERMUX_PKG_SRCDIR
patch --silent -p1 < $TERMUX_PKG_BUILDER_DIR/coregrindmake.am.diff
patch --silent -p1 < $TERMUX_PKG_BUILDER_DIR/memcheckmake.am.diff
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --enable-only64bit"
elif [ "$TERMUX_ARCH" == "arm" ]; then
# valgrind doesn't like arm; armv7 works, though.
Expand Down
10 changes: 0 additions & 10 deletions packages/valgrind/coregrindmake.am.diff
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions packages/valgrind/memcheckmake.am.diff
View file
Open in desktop

This file was deleted.

Loading