Attachment 213884 Details for Bug 245997 – Linted patch for emulators/qemu emulators/qemu-devel sysutils/dtc devel/valgrind

[patch] Linted patch for emulators/qemu emulators/qemu-devel sysutils/dtc devel/valgrind

patch-qemu++dtc.new.diff (text/plain), 9.05 KB, created by Sean Champ on 2020-04-28 10:37:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sean Champ

Created: 2020-04-28 10:37:02 UTC

Size: 9.05 KB

patch

obsolete

>diff --git a/devel/valgrind/files/patch-include__vki__vki-freebsd.h b/devel/valgrind/files/patch-include__vki__vki-freebsd.h
>index 32d1baaff0..89734f122a 100644
>--- a/devel/valgrind/files/patch-include__vki__vki-freebsd.h
>+++ b/devel/valgrind/files/patch-include__vki__vki-freebsd.h
>@@ -1,6 +1,18 @@
>---- include/vki/vki-freebsd.h.orig	2015-01-26 16:17:32.000000000 -0400
>-+++ include/vki/vki-freebsd.h	2015-08-31 04:55:29.139189000 -0300
>-@@ -684,6 +684,7 @@
>+--- include/vki/vki-freebsd.h.orig	2020-04-28 07:27:40.998968000 +0000
>++++ include/vki/vki-freebsd.h	2020-04-28 07:41:23.465385000 +0000
>+@@ -224,6 +224,11 @@
>+ #define SELFMAG	4		/* magic string size */
>+ #endif
>+ 
>++// see http://bugs.freebsd.org/bugzilla/show_bug.cgi?id=239669
>++#if !defined(ELF_NOTE_GNU)
>++#define ELF_NOTE_GNU "GNU"
>++#endif
>++
>+ //----------------------------------------------------------------------
>+ // From sys/syslimits.h
>+ //----------------------------------------------------------------------
>+@@ -714,6 +719,7 @@
>  
>  #define VKI_SOCK_STREAM	1
>  
>@@ -8,7 +20,7 @@
>  #include <netinet/tcp.h>
>  
>  #define VKI_TCP_NODELAY  TCP_NODELAY
>-@@ -1888,11 +1889,23 @@
>+@@ -1946,11 +1952,23 @@
>  #define VKI_I386_SET_FSBASE     8
>  #define VKI_I386_GET_GSBASE     9
>  #define VKI_I386_SET_GSBASE     10
>diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile
>index 2c20ab55ff..4ef262e565 100644
>--- a/emulators/qemu-devel/Makefile
>+++ b/emulators/qemu-devel/Makefile
>@@ -19,7 +19,8 @@ LIB_DEPENDS=	libnettle.so:security/nettle \
> 		libfontconfig.so:x11-fonts/fontconfig \
> 		libfreetype.so:print/freetype2 \
> 		libepoxy.so:graphics/libepoxy \
>-		libpcre2-8.so:devel/pcre2
>+		libpcre2-8.so:devel/pcre2 \
>+		libfdt.so>=1.6.0:sysutils/dtc
> 
> USES=		bison compiler:c11 cpe gmake gnome iconv:wchar_t perl5 \
> 		pkgconfig python:build tar:xz xorg
>@@ -37,7 +38,7 @@ MAKE_ENV+=	BSD_MAKE="${MAKE}" V=1
> 
> OPTIONS_DEFINE=	SAMBA X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CURL \
> 		VDE CDROM_DMA PCAP USBREDIR X86_TARGETS \
>-		STATIC_LINK DOCS NCURSES
>+		STATIC_LINK DOCS NCURSES DEBUG
> SAMBA_DESC=		samba dependency (for -smb)
> GNUTLS_DESC=		gnutls dependency (vnc encryption)
> SASL_DESC=		cyrus-sasl dependency (vnc encryption)
>@@ -49,7 +50,8 @@ USBREDIR_DESC=		usb device network redirection (experimental!)
> X86_TARGETS_DESC=	Build only x86 system targets
> STATIC_LINK_DESC=	Statically link the executables
> VDE_DESC=		vde dependency (for vde networking)
>-OPTIONS_DEFAULT=X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL PCAP NCURSES VDE
>+DEBUG_DESC=		Build with debugging support
>+OPTIONS_DEFAULT=X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL PCAP NCURSES VDE DEBUG
> OPTIONS_SUB=	yes
> X11_USE=	SDL=sdl2 XORG=x11,xext GNOME=gdkpixbuf2
> X11_USES=	sdl
>@@ -82,27 +84,30 @@ VDE_CONFIGURE_OFF=	--disable-vde
> STATIC_LINK_CONFIGURE_ON=	--static
> STATIC_LINK_PREVENTS=		GTK3 X11
> STATIC_LINK_PREVENTS_MSG=	X11 ui cannot be built static
>-NCURSES_USES=		ncurses:base
>+NCURSES_USES=		ncurses
> SAMBA_USES=		samba:run # smbd
> SAMBA_CONFIGURE_ON=	--smbd=${LOCALBASE}/sbin/smbd
> DOCS_BUILD_DEPENDS=	texi2html:textproc/texi2html \
> 			sphinx-build:textproc/py-sphinx
> DOCS_USES=		makeinfo
> DOCS_MAKE_ARGS_OFF=	NOPORTDOCS=1
>+DEBUG_VARS=		WITH_DEBUG=1 CONFIGURE_ARGS+=--enable-debug
>+DEBUG_VARS+=		CONFIGURE_ARGS+=--enable-debug-info
> 
> PORTDOCS=	docs interop/.buildinfo interop/* qemu-doc.html qemu-doc.txt qemu-ga-ref.html qemu-ga-ref.txt \
> 	       	qemu-qmp-ref.html qemu-qmp-ref.txt specs/.buildinfo specs/*
> 
> WITHOUT_CPU_CFLAGS=yes	#to avoid problems with register allocation
> CFLAGS:=	${CFLAGS:C/-fno-tree-vrp//}
>-CONFIGURE_ARGS=	--localstatedir=/var --extra-ldflags=-L\"/usr/lib\" \
>-		--extra-ldflags=-L\"${LOCALBASE}/lib\" --enable-debug \
>+CONFIGURE_ARGS=	--localstatedir=/var \
>+		--extra-ldflags=-L/usr/lib\ -L${LOCALBASE}/lib \
> 		--prefix=${PREFIX} --cc=${CC} --enable-netmap --enable-docs --disable-kvm \
> 		--disable-linux-user --disable-linux-aio --disable-xen \
>-		--enable-debug-info --python=${PYTHON_CMD} \
>+		 --python=${PYTHON_CMD} \
> 		--extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\"
> INSTALLS_ICONS=	yes
> 
>+
> .include <bsd.port.options.mk>
> 
> .if !defined(STRIP) || ${STRIP} == ""
>diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
>index 294fc737ea..e43f6c71c7 100644
>--- a/emulators/qemu/Makefile
>+++ b/emulators/qemu/Makefile
>@@ -17,7 +17,9 @@ LIB_DEPENDS?=	libnettle.so:security/nettle \
> 		libfontconfig.so:x11-fonts/fontconfig \
> 		libfreetype.so:print/freetype2 \
> 		libepoxy.so:graphics/libepoxy \
>-		libpcre2-8.so:devel/pcre2
>+		libpcre2-8.so:devel/pcre2 \
>+		libfdt.so>=1.6.0:sysutils/dtc
>+
> 
> .if !defined(PKGNAMESUFFIX) || (${PKGNAMESUFFIX} != "-utils" && ${PKGNAMESUFFIX} != "-guest-agent")
> ONLY_FOR_ARCHS=	amd64 i386 powerpc powerpc64
>@@ -36,9 +38,10 @@ MAKE_ENV+=	BSD_MAKE="${MAKE}" V=1
> 
> OPTIONS_DEFINE=	SAMBA X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CURL \
> 		VDE CDROM_DMA PCAP USBREDIR X86_TARGETS \
>-		STATIC_LINK DOCS NCURSES
>+		STATIC_LINK DOCS NCURSES DEBUG
> CDROM_DMA_DESC=		IDE CDROM DMA
> GNUTLS_DESC=		gnutls dependency (vnc encryption)
>+DEBUG_DESC=		Build with debugging support
> JPEG_DESC=		jpeg dependency (vnc lossy compression)
> PCAP_DESC=		pcap dependency (networking with bpf)
> PNG_DESC=		png dependency (vnc compression)
>@@ -52,6 +55,8 @@ OPTIONS_DEFAULT=X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL PCAP NCURSES
> OPTIONS_SUB=	yes
> CURL_CONFIGURE_OFF=	--disable-curl
> CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
>+DEBUG_VARS=		WITH_DEBUG=1 CONFIGURE_ARGS+=--enable-debug
>+DEBUG_VARS+=		CONFIGURE_ARGS+=--enable-debug-info
> DOCS_BUILD_DEPENDS=	texi2html:textproc/texi2html \
> 			sphinx-build:textproc/py-sphinx
> DOCS_MAKE_ARGS_OFF=	NOPORTDOCS=1
>@@ -64,7 +69,7 @@ GTK3_USE=	GNOME=gdkpixbuf2,gtk30,vte3 XORG=x11,xext
> GTK3_USES=	gettext gl
> JPEG_CONFIGURE_OFF=	--disable-vnc-jpeg
> JPEG_USES=		jpeg
>-NCURSES_USES=		ncurses:base
>+NCURSES_USES=		ncurses
> OPENGL_CONFIGURE_OFF=	--disable-opengl
> OPENGL_USE=	GL=gl
> OPENGL_USES=	gl
>@@ -99,13 +104,15 @@ PORTDOCS?=	docs interop/.buildinfo interop/* qemu-doc.html qemu-doc.txt qemu-ga-
> 
> WITHOUT_CPU_CFLAGS=yes	#to avoid problems with register allocation
> CFLAGS:=	${CFLAGS:C/-fno-tree-vrp//}
>-CONFIGURE_ARGS?=	--localstatedir=/var --extra-ldflags=-L\"/usr/lib\" \
>-		--extra-ldflags=-L\"${LOCALBASE}/lib\" --disable-libssh --enable-debug \
>+CONFIGURE_ARGS?=	--localstatedir=/var \
>+		--extra-ldflags=-L/usr/lib\ -L${LOCALBASE}/lib \
>+		--disable-libssh --enable-debug \
> 		--prefix=${PREFIX} --cc=${CC} --enable-netmap --enable-docs --disable-kvm \
> 		--disable-linux-user --disable-linux-aio --disable-xen \
> 		--enable-debug-info --python=${PYTHON_CMD} \
> 		--extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\"
> 
>+
> .include <bsd.port.options.mk>
> 
> .if !defined(STRIP) || ${STRIP} == ""
>diff --git a/sysutils/dtc/Makefile b/sysutils/dtc/Makefile
>index 0604459df9..f074c169ce 100644
>--- a/sysutils/dtc/Makefile
>+++ b/sysutils/dtc/Makefile
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	dtc
>-PORTVERSION=	1.4.7
>+PORTVERSION=	1.6.0
> DISTVERSIONPREFIX=	v
> CATEGORIES=	sysutils
> 
>@@ -10,9 +10,11 @@ COMMENT=	Device Tree Compiler
> 
> LICENSE=	GPLv2
> 
>-USES=		bison gmake shebangfix
>+USES=		bison gmake shebangfix pkgconfig
> USE_LDCONFIG=	yes
> SHEBANG_FILES=	dtdiff
>+PLIST_SUB+=	VERSION=${PORTVERSION}
>+PLIST_SUB+=	MVERSION=${PORTVERSION:S/./ /:[1]}
> 
> TEST_TARGET=	check
> TEST_ENV=	STATSZ="stat -f %Uz"
>@@ -25,4 +27,30 @@ MAKE_ARGS+=	PREFIX=${PREFIX} NO_PYTHON=yes \
> 		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
> 		INSTALL_LIB="${INSTALL_LIB}"
> 
>+OPTIONS_DEFINE=		YAML
>+
>+YAML_DESC=		Support YAML output format for dtc
>+YAML_LIB_DEPENDS=	libyaml.so:textproc/libyaml
>+YAML_VARS_OFF=		CFLAGS+=-DNO_YAML
>+
>+_MK_VALGRIND_ARCH?=	i386 amd64
>+.for .A. in ${_MK_VALGRIND_ARCH}
>+OPTIONS_DEFINE_${.A.}+=	VALGRIND
>+.endfor
>+
>+VALGRIND_DESC=		Use valgrind in tests
>+VALGRIND_VARS_OFF=	CFLAGS+=-DNO_VALGRIND
>+VALGRIND_VARS=		TEST_DEPENDS+=valgrind:devel/valgrind
>+
>+TEST_TARGET=		check
>+
>+.include <bsd.port.options.mk>
>+
>+## FIXME a hack on the Makefile dependency management under *.d files
>+## These symlinks should be unused, otherwise.
>+post-patch:
>+	@${LN} -sf ${LOCALBASE}/include/yaml.h ${WRKSRC}/yaml.h
>+	@${MKDIR} ${WRKSRC}/valgrind
>+	@${LN} -sf ${LOCALBASE}/include/valgrind/memcheck.h ${WRKSRC}/valgrind/memcheck.h
>+
> .include <bsd.port.mk>
>diff --git a/sysutils/dtc/distinfo b/sysutils/dtc/distinfo
>index 34bbb51df8..12d222e613 100644
>--- a/sysutils/dtc/distinfo
>+++ b/sysutils/dtc/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1551032373
>-SHA256 (dgibson-dtc-v1.4.7_GH0.tar.gz) = 603d6f4f5f34921b368e6febe6690c89022d098edda77187a758b8eeeeff53ea
>-SIZE (dgibson-dtc-v1.4.7_GH0.tar.gz) = 191568
>+TIMESTAMP = 1587946412
>+SHA256 (dgibson-dtc-v1.6.0_GH0.tar.gz) = 3d15dee7126a6c4a015ab47ec908cab13e39774b0315efaaebb223cb4a4d349c
>+SIZE (dgibson-dtc-v1.6.0_GH0.tar.gz) = 200316
>diff --git a/sysutils/dtc/pkg-plist b/sysutils/dtc/pkg-plist
>index daea3bf40a..ade05e51ed 100644
>--- a/sysutils/dtc/pkg-plist
>+++ b/sysutils/dtc/pkg-plist
>@@ -8,7 +8,7 @@ bin/fdtput
> include/fdt.h
> include/libfdt.h
> include/libfdt_env.h
>-lib/libfdt-1.4.7.so
>+lib/libfdt-%%VERSION%%.so
> lib/libfdt.a
> lib/libfdt.so
>-lib/libfdt.so.1
>+lib/libfdt.so.%%MVERSION%%

Actions: View | Diff

Attachments on bug 245997: 213883 | 213884