Attachment 244958 Details for Bug 273529 – Patch to bump to current git head

[patch] Patch to bump to current git head

patch4 (text/plain), 5.99 KB, created by Paul Floyd on 2023-09-17 11:00:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Floyd

Created: 2023-09-17 11:00:50 UTC

Size: 5.99 KB

patch

obsolete

>diff --git a/devel/valgrind-devel/Makefile b/devel/valgrind-devel/Makefile
>index 35bbe0227cce..6c4e820cf161 100644
>--- a/devel/valgrind-devel/Makefile
>+++ b/devel/valgrind-devel/Makefile
>@@ -1,9 +1,9 @@
> PORTNAME=	valgrind
>-PORTVERSION=	3.21.0.g20230218
>-PORTREVISION=	1
>+PORTVERSION=	3.22.0.g20230917
> DISTVERSIONPREFIX=	freebsd-
>-PORTEPOCH=	1
> CATEGORIES=	devel
>+MASTER_SITES=	https://snapshots.sourceware.org/valgrind/trunk/2023-09-17_09-18_1694942281/
>+DISTNAME=       ${PORTNAME}-3.22.0.GIT
> PKGNAMESUFFIX=	-devel
> 
> MAINTAINER=	pjfloyd@wanadoo.fr
>@@ -15,13 +15,9 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 
> ONLY_FOR_ARCHS=	amd64 i386
> 
>-USES=		autoreconf cpe gmake pathfix perl5 pkgconfig shebangfix
>-USE_GITHUB=	yes
>-GH_ACCOUNT=	paulfloyd
>-GH_PROJECT=	freebsd_valgrind
>-GH_TAGNAME=	3b3d74d9d
>+USES=		autoreconf cpe gmake pathfix perl5 pkgconfig shebangfix python:3.9+,run tar:bz2
> USE_PERL5=	build
>-SHEBANG_FILES=	callgrind/callgrind_annotate.in callgrind/callgrind_control.in
>+SHEBANG_FILES= callgrind/callgrind_annotate.in callgrind/callgrind_control.in cachegrind/cg_merge.in cachegrind/cg_diff.in cachegrind/cg_annotate.in
> GNU_CONFIGURE=	yes
> CONFIGURE_ENV+=	ac_cv_path_PERL=${PERL}
> 
>@@ -29,15 +25,6 @@ SSP_UNSAFE=	yes
> LIB32_PATH?=	/usr/lib32/libc.so
> 
> CONFLICTS=	valgrind
>-
>-# Valgrind needs to read debuginfo from its own preload shared libraries
>-# (quote from README_PACKAGERS
>-#-- Don't strip the debug info off lib/valgrind/$platform/vgpreload*.so
>-#   in the installation tree.  Either Valgrind won't work at all, or it
>-#   will still work if you do, but will generate less helpful error
>-#   messages.)
>-STRIP=          # empty
>-
> PORTDOCS=	html
> 
> OPTIONS_DEFINE=		DOCS MANPAGES MPI
>@@ -48,6 +35,14 @@ OPTIONS_DEFAULT_amd64=	32BIT
> .endif
> OPTIONS_SUB=		yes
> 
>+# Valgrind needs to read debuginfo from its own preload shared libraries
>+# (quote from README_PACKAGERS
>+#-- Don't strip the debug info off lib/valgrind/$platform/vgpreload*.so
>+#   in the installation tree.  Either Valgrind won't work at all, or it
>+#   will still work if you do, but will generate less helpful error
>+#   messages.)
>+STRIP=          # empty
>+
> 32BIT_DESC=	Enable debugging of 32-bit programs (requires lib32)
> MPI_DESC=	Enable build of MPI wrappers
> 
>diff --git a/devel/valgrind-devel/distinfo b/devel/valgrind-devel/distinfo
>index 508c097e14d6..a57cf10c336e 100644
>--- a/devel/valgrind-devel/distinfo
>+++ b/devel/valgrind-devel/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1676740397
>-SHA256 (paulfloyd-freebsd_valgrind-freebsd-3.21.0.g20230218-3b3d74d9d_GH0.tar.gz) = 97f611a8c1f697b8a66fb2e78453d35526f1507dae5735802a73a61a56a2ab73
>-SIZE (paulfloyd-freebsd_valgrind-freebsd-3.21.0.g20230218-3b3d74d9d_GH0.tar.gz) = 16028409
>+TIMESTAMP = 1694947789
>+SHA256 (valgrind-3.22.0.GIT.tar.bz2) = ba9c13b27c6246b715cba1f614676158c9610e9e70426da89081f38cff790e8e
>+SIZE (valgrind-3.22.0.GIT.tar.bz2) = 16287833
>diff --git a/devel/valgrind-devel/pkg-plist b/devel/valgrind-devel/pkg-plist
>index 1604e46f61aa..c2e725a96c33 100644
>--- a/devel/valgrind-devel/pkg-plist
>+++ b/devel/valgrind-devel/pkg-plist
>@@ -8,6 +8,7 @@ bin/valgrind
> bin/valgrind-di-server
> bin/valgrind-listener
> bin/vgdb
>+include/valgrind/cachegrind.h
> include/valgrind/callgrind.h
> include/valgrind/config.h
> include/valgrind/dhat.h
>@@ -135,6 +136,17 @@ include/valgrind/vki/vki-xen-version.h
> include/valgrind/vki/vki-xen-x86.h
> include/valgrind/vki/vki-xen-xsm.h
> include/valgrind/vki/vki-xen.h
>+%%AMD64%%lib/valgrind/libcoregrind-amd64-freebsd.a
>+%%X86%%lib/valgrind/libcoregrind-x86-freebsd.a
>+%%AMD64%%lib/valgrind/libgcc-sup-amd64-freebsd.a
>+%%X86%%lib/valgrind/libgcc-sup-x86-freebsd.a
>+%%AMD64%%lib/valgrind/libreplacemalloc_toolpreload-amd64-freebsd.a
>+%%X86%%lib/valgrind/libreplacemalloc_toolpreload-x86-freebsd.a
>+%%AMD64%%lib/valgrind/libvex-amd64-freebsd.a
>+%%X86%%lib/valgrind/libvex-x86-freebsd.a
>+%%AMD64%%lib/valgrind/libvexmultiarch-amd64-freebsd.a
>+%%X86%%lib/valgrind/libvexmultiarch-x86-freebsd.a
>+libdata/pkgconfig/valgrind.pc
> libexec/valgrind/32bit-core-valgrind-s1.xml
> libexec/valgrind/32bit-core-valgrind-s2.xml
> libexec/valgrind/32bit-core.xml
>@@ -175,6 +187,9 @@ libexec/valgrind/arm-with-vfpv3.xml
> %%AMD64%%libexec/valgrind/callgrind-amd64-freebsd
> %%X86%%libexec/valgrind/callgrind-x86-freebsd
> libexec/valgrind/default.supp
>+libexec/valgrind/dh_view.css
>+libexec/valgrind/dh_view.html
>+libexec/valgrind/dh_view.js
> %%AMD64%%libexec/valgrind/dhat-amd64-freebsd
> %%X86%%libexec/valgrind/dhat-x86-freebsd
> %%AMD64%%libexec/valgrind/drd-amd64-freebsd
>@@ -189,16 +204,6 @@ libexec/valgrind/i386-coresse-valgrind.xml
> libexec/valgrind/i386-linux-valgrind.xml
> %%AMD64%%libexec/valgrind/lackey-amd64-freebsd
> %%X86%%libexec/valgrind/lackey-x86-freebsd
>-%%AMD64%%lib/valgrind/libcoregrind-amd64-freebsd.a
>-%%X86%%lib/valgrind/libcoregrind-x86-freebsd.a
>-%%AMD64%%lib/valgrind/libgcc-sup-amd64-freebsd.a
>-%%X86%%lib/valgrind/libgcc-sup-x86-freebsd.a
>-%%AMD64%%lib/valgrind/libreplacemalloc_toolpreload-amd64-freebsd.a
>-%%X86%%lib/valgrind/libreplacemalloc_toolpreload-x86-freebsd.a
>-%%AMD64%%lib/valgrind/libvex-amd64-freebsd.a
>-%%X86%%lib/valgrind/libvex-x86-freebsd.a
>-%%AMD64%%lib/valgrind/libvexmultiarch-amd64-freebsd.a
>-%%X86%%lib/valgrind/libvexmultiarch-x86-freebsd.a
> %%AMD64%%libexec/valgrind/massif-amd64-freebsd
> %%X86%%libexec/valgrind/massif-x86-freebsd
> %%AMD64%%libexec/valgrind/memcheck-amd64-freebsd
>@@ -287,10 +292,6 @@ libexec/valgrind/valgrind-monitor.py
> %%X86%%libexec/valgrind/vgpreload_massif-x86-freebsd.so
> %%AMD64%%libexec/valgrind/vgpreload_memcheck-amd64-freebsd.so
> %%X86%%libexec/valgrind/vgpreload_memcheck-x86-freebsd.so
>-libdata/pkgconfig/valgrind.pc
>-libexec/valgrind/dh_view.css
>-libexec/valgrind/dh_view.html
>-libexec/valgrind/dh_view.js
> %%MANPAGES%%man/man1/callgrind_annotate.1.gz
> %%MANPAGES%%man/man1/callgrind_control.1.gz
> %%MANPAGES%%man/man1/cg_annotate.1.gz
>@@ -301,3 +302,5 @@ libexec/valgrind/dh_view.js
> %%MANPAGES%%man/man1/valgrind-listener.1.gz
> %%MANPAGES%%man/man1/valgrind.1.gz
> %%MANPAGES%%man/man1/vgdb.1.gz
>+%%PORTDOCS%%%%DOCSDIR%%/valgrind_manual.pdf
>+%%PORTDOCS%%%%DOCSDIR%%/valgrind_manual.ps

Actions: View | Diff

Attachments on bug 273529: 244600 | 244751 | 244958 | 244980 | 245003