Attachment #213883 for bug #245997

Lines 1-6 Link Here

(-)b/devel/valgrind/files/patch-include__vki__vki-freebsd.h (-4 / +16 lines)
1	--- include/vki/vki-freebsd.h.orig 2015-01-26 16:17:32.000000000 -0400	1	--- include/vki/vki-freebsd.h.orig 2020-04-28 07:27:40.998968000 +0000
2	+++ include/vki/vki-freebsd.h 2015-08-31 04:55:29.139189000 -0300	2	+++ include/vki/vki-freebsd.h 2020-04-28 07:41:23.465385000 +0000
3	@@ -684,6 +684,7 @@	3	@@ -224,6 +224,11 @@
		4	#define SELFMAG 4 /* magic string size */
		5	#endif
		6
		7	+// see http://bugs.freebsd.org/bugzilla/show_bug.cgi?id=239669
		8	+#if !defined(ELF_NOTE_GNU)
		9	+#define ELF_NOTE_GNU "GNU"
		10	+#endif
		11	+
		12	//----------------------------------------------------------------------
		13	// From sys/syslimits.h
		14	//----------------------------------------------------------------------
		15	@@ -714,6 +719,7 @@
4		16
5	#define VKI_SOCK_STREAM 1	17	#define VKI_SOCK_STREAM 1
6		18
Lines 8-14 Link Here
8	#include <netinet/tcp.h>	20	#include <netinet/tcp.h>
9		21
10	#define VKI_TCP_NODELAY TCP_NODELAY	22	#define VKI_TCP_NODELAY TCP_NODELAY
11	@@ -1888,11 +1889,23 @@	23	@@ -1946,11 +1952,23 @@
12	#define VKI_I386_SET_FSBASE 8	24	#define VKI_I386_SET_FSBASE 8
13	#define VKI_I386_GET_GSBASE 9	25	#define VKI_I386_GET_GSBASE 9
14	#define VKI_I386_SET_GSBASE 10	26	#define VKI_I386_SET_GSBASE 10




		libfontconfig.so:x11-fonts/fontconfig \
		libfreetype.so:print/freetype2 \
		libepoxy.so:graphics/libepoxy \
		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


OPTIONS_DEFINE=	SAMBA X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CURL \
		VDE CDROM_DMA PCAP USBREDIR X86_TARGETS \
		STATIC_LINK DOCS NCURSES DEBUG
SAMBA_DESC=		samba dependency (for -smb)
GNUTLS_DESC=		gnutls dependency (vnc encryption)
SASL_DESC=		cyrus-sasl dependency (vnc encryption)

X86_TARGETS_DESC=	Build only x86 system targets
STATIC_LINK_DESC=	Statically link the executables
VDE_DESC=		vde dependency (for vde networking)
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

STATIC_LINK_CONFIGURE_ON=	--static
STATIC_LINK_PREVENTS=		GTK3 X11
STATIC_LINK_PREVENTS_MSG=	X11 ui cannot be built static
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/*

## NB specify extra-ldflags only once w/ no quote marks,
## or it will miss the system libfdt

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\ -L${LOCALBASE}/lib \
		--prefix=${PREFIX} --cc=${CC} --enable-netmap --enable-docs --disable-kvm \
		--disable-linux-user --disable-linux-aio --disable-xen \
		 --python=${PYTHON_CMD} \
		--extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\"
INSTALLS_ICONS=	yes


.include <bsd.port.options.mk>

.if !defined(STRIP) || ${STRIP} == ""

Lines 17-23 LIB_DEPENDS?= libnettle.so:security/nettle \ Link Here

(-)b/emulators/qemu/Makefile (-5 / +15 lines)
17	libfontconfig.so:x11-fonts/fontconfig \	17	libfontconfig.so:x11-fonts/fontconfig \
18	libfreetype.so:print/freetype2 \	18	libfreetype.so:print/freetype2 \
19	libepoxy.so:graphics/libepoxy \	19	libepoxy.so:graphics/libepoxy \
20	libpcre2-8.so:devel/pcre2	20	libpcre2-8.so:devel/pcre2 \
		21	libfdt.so>=1.6.0:sysutils/dtc
		22
21		23
22	.if !defined(PKGNAMESUFFIX) \|\| (${PKGNAMESUFFIX} != "-utils" && ${PKGNAMESUFFIX} != "-guest-agent")	24	.if !defined(PKGNAMESUFFIX) \|\| (${PKGNAMESUFFIX} != "-utils" && ${PKGNAMESUFFIX} != "-guest-agent")
23	ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64	25	ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64
Lines 36-44 MAKE_ENV+= BSD_MAKE="${MAKE}" V=1 Link Here
36		38
37	OPTIONS_DEFINE= SAMBA X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CURL \	39	OPTIONS_DEFINE= SAMBA X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CURL \
38	VDE CDROM_DMA PCAP USBREDIR X86_TARGETS \	40	VDE CDROM_DMA PCAP USBREDIR X86_TARGETS \
39	STATIC_LINK DOCS NCURSES	41	STATIC_LINK DOCS NCURSES DEBUG
40	CDROM_DMA_DESC= IDE CDROM DMA	42	CDROM_DMA_DESC= IDE CDROM DMA
41	GNUTLS_DESC= gnutls dependency (vnc encryption)	43	GNUTLS_DESC= gnutls dependency (vnc encryption)
		44	DEBUG_DESC= Build with debugging support
42	JPEG_DESC= jpeg dependency (vnc lossy compression)	45	JPEG_DESC= jpeg dependency (vnc lossy compression)
43	PCAP_DESC= pcap dependency (networking with bpf)	46	PCAP_DESC= pcap dependency (networking with bpf)
44	PNG_DESC= png dependency (vnc compression)	47	PNG_DESC= png dependency (vnc compression)
Lines 52-57 OPTIONS_DEFAULT=X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL PCAP NCURSES Link Here
52	OPTIONS_SUB= yes	55	OPTIONS_SUB= yes
53	CURL_CONFIGURE_OFF= --disable-curl	56	CURL_CONFIGURE_OFF= --disable-curl
54	CURL_LIB_DEPENDS= libcurl.so:ftp/curl	57	CURL_LIB_DEPENDS= libcurl.so:ftp/curl
		58	DEBUG_VARS= WITH_DEBUG=1 CONFIGURE_ARGS+=--enable-debug
		59	DEBUG_VARS+= CONFIGURE_ARGS+=--enable-debug-info
55	DOCS_BUILD_DEPENDS= texi2html:textproc/texi2html \	60	DOCS_BUILD_DEPENDS= texi2html:textproc/texi2html \
56	sphinx-build:textproc/py-sphinx	61	sphinx-build:textproc/py-sphinx
57	DOCS_MAKE_ARGS_OFF= NOPORTDOCS=1	62	DOCS_MAKE_ARGS_OFF= NOPORTDOCS=1
Lines 64-70 GTK3_USE= GNOME=gdkpixbuf2,gtk30,vte3 XORG=x11,xext Link Here
64	GTK3_USES= gettext gl	69	GTK3_USES= gettext gl
65	JPEG_CONFIGURE_OFF= --disable-vnc-jpeg	70	JPEG_CONFIGURE_OFF= --disable-vnc-jpeg
66	JPEG_USES= jpeg	71	JPEG_USES= jpeg
67	NCURSES_USES= ncurses:base	72	NCURSES_USES= ncurses
68	OPENGL_CONFIGURE_OFF= --disable-opengl	73	OPENGL_CONFIGURE_OFF= --disable-opengl
69	OPENGL_USE= GL=gl	74	OPENGL_USE= GL=gl
70	OPENGL_USES= gl	75	OPENGL_USES= gl
Lines 97-111 INSTALLS_ICONS= yes Link Here
97	PORTDOCS?= docs interop/.buildinfo interop/* qemu-doc.html qemu-doc.txt qemu-ga-ref.html qemu-ga-ref.txt \	102	PORTDOCS?= docs interop/.buildinfo interop/* qemu-doc.html qemu-doc.txt qemu-ga-ref.html qemu-ga-ref.txt \
98	qemu-qmp-ref.html qemu-qmp-ref.txt specs/.buildinfo specs/*	103	qemu-qmp-ref.html qemu-qmp-ref.txt specs/.buildinfo specs/*
99		104
		105	## NB specify extra-ldflags only once w/ no quote marks,
		106	## or it will miss the system libfdt
		107
100	WITHOUT_CPU_CFLAGS=yes #to avoid problems with register allocation	108	WITHOUT_CPU_CFLAGS=yes #to avoid problems with register allocation
101	CFLAGS:= ${CFLAGS:C/-fno-tree-vrp//}	109	CFLAGS:= ${CFLAGS:C/-fno-tree-vrp//}
102	CONFIGURE_ARGS?= --localstatedir=/var --extra-ldflags=-L\"/usr/lib\" \	110	CONFIGURE_ARGS?= --localstatedir=/var \
103	--extra-ldflags=-L\"${LOCALBASE}/lib\" --disable-libssh --enable-debug \	111	--extra-ldflags=-L/usr/lib\ -L${LOCALBASE}/lib \
		112	--disable-libssh --enable-debug \
104	--prefix=${PREFIX} --cc=${CC} --enable-netmap --enable-docs --disable-kvm \	113	--prefix=${PREFIX} --cc=${CC} --enable-netmap --enable-docs --disable-kvm \
105	--disable-linux-user --disable-linux-aio --disable-xen \	114	--disable-linux-user --disable-linux-aio --disable-xen \
106	--enable-debug-info --python=${PYTHON_CMD} \	115	--enable-debug-info --python=${PYTHON_CMD} \
107	--extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\"	116	--extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\"
108		117
		118
109	.include <bsd.port.options.mk>	119	.include <bsd.port.options.mk>
110		120
111	.if !defined(STRIP) \|\| ${STRIP} == ""	121	.if !defined(STRIP) \|\| ${STRIP} == ""

Lines 1-7 Link Here

(-)b/sysutils/dtc/Makefile (-2 / +30 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= dtc	3	PORTNAME= dtc
4	PORTVERSION= 1.4.7	4	PORTVERSION= 1.6.0
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
6	CATEGORIES= sysutils	6	CATEGORIES= sysutils
7		7
Lines 10-18 COMMENT= Device Tree Compiler Link Here
10		10
11	LICENSE= GPLv2	11	LICENSE= GPLv2
12		12
13	USES= bison gmake shebangfix	13	USES= bison gmake shebangfix pkgconfig
14	USE_LDCONFIG= yes	14	USE_LDCONFIG= yes
15	SHEBANG_FILES= dtdiff	15	SHEBANG_FILES= dtdiff
		16	PLIST_SUB+= VERSION=${PORTVERSION}
		17	PLIST_SUB+= MVERSION=${PORTVERSION:S/./ /:[1]}
16		18
17	TEST_TARGET= check	19	TEST_TARGET= check
18	TEST_ENV= STATSZ="stat -f %Uz"	20	TEST_ENV= STATSZ="stat -f %Uz"
Lines 25-28 MAKE_ARGS+= PREFIX=${PREFIX} NO_PYTHON=yes \ Link Here
25	INSTALL_PROGRAM="${INSTALL_PROGRAM}" \	27	INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
26	INSTALL_LIB="${INSTALL_LIB}"	28	INSTALL_LIB="${INSTALL_LIB}"
27		29
		30	OPTIONS_DEFINE= YAML
		31
		32	YAML_DESC= Support YAML output format for dtc
		33	YAML_LIB_DEPENDS= libyaml.so:textproc/libyaml
		34	YAML_VARS_OFF= CFLAGS+=-DNO_YAML
		35
		36	_MK_VALGRIND_ARCH?= i386 amd64
		37	.for .A. in ${_MK_VALGRIND_ARCH}
		38	OPTIONS_DEFINE_${.A.}+= VALGRIND
		39	.endfor
		40
		41	VALGRIND_DESC= Use valgrind in tests
		42	VALGRIND_VARS_OFF= CFLAGS+=-DNO_VALGRIND
		43	VALGRIND_VARS= TEST_DEPENDS+=valgrind:devel/valgrind
		44
		45	TEST_TARGET= check
		46
		47	.include <bsd.port.options.mk>
		48
		49	## FIXME a hack on the Makefile dependency management under *.d files
		50	## These symlinks should be unused, otherwise.
		51	post-patch:
		52	@${LN} -sf ${LOCALBASE}/include/yaml.h ${WRKSRC}/yaml.h
		53	@${MKDIR} ${WRKSRC}/valgrind
		54	@${LN} -sf ${LOCALBASE}/include/valgrind/memcheck.h ${WRKSRC}/valgrind/memcheck.h
		55
28	.include <bsd.port.mk>	56	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/sysutils/dtc/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1551032373	1	TIMESTAMP = 1587946412
2	SHA256 (dgibson-dtc-v1.4.7_GH0.tar.gz) = 603d6f4f5f34921b368e6febe6690c89022d098edda77187a758b8eeeeff53ea	2	SHA256 (dgibson-dtc-v1.6.0_GH0.tar.gz) = 3d15dee7126a6c4a015ab47ec908cab13e39774b0315efaaebb223cb4a4d349c
3	SIZE (dgibson-dtc-v1.4.7_GH0.tar.gz) = 191568	3	SIZE (dgibson-dtc-v1.6.0_GH0.tar.gz) = 200316

Lines 8-14 bin/fdtput Link Here

(-)b/sysutils/dtc/pkg-plist (-2 / +2 lines)
8	include/fdt.h	8	include/fdt.h
9	include/libfdt.h	9	include/libfdt.h
10	include/libfdt_env.h	10	include/libfdt_env.h
11	lib/libfdt-1.4.7.so	11	lib/libfdt-%%VERSION%%.so
12	lib/libfdt.a	12	lib/libfdt.a
13	lib/libfdt.so	13	lib/libfdt.so
14	lib/libfdt.so.1	14	lib/libfdt.so.%%MVERSION%%

Return to bug 245997

Lines 19-25 LIB_DEPENDS= libnettle.so:security/nettle \ Link Here

(-)b/emulators/qemu-devel/Makefile (-7 / +15 lines)
19	libfontconfig.so:x11-fonts/fontconfig \	19	libfontconfig.so:x11-fonts/fontconfig \
20	libfreetype.so:print/freetype2 \	20	libfreetype.so:print/freetype2 \
21	libepoxy.so:graphics/libepoxy \	21	libepoxy.so:graphics/libepoxy \
22	libpcre2-8.so:devel/pcre2	22	libpcre2-8.so:devel/pcre2 \
		23	libfdt.so>=1.6.0:sysutils/dtc
23		24
24	USES= bison compiler:c11 cpe gmake gnome iconv:wchar_t perl5 \	25	USES= bison compiler:c11 cpe gmake gnome iconv:wchar_t perl5 \
25	pkgconfig python:build tar:xz xorg	26	pkgconfig python:build tar:xz xorg
Lines 37-43 MAKE_ENV+= BSD_MAKE="${MAKE}" V=1 Link Here
37		38
38	OPTIONS_DEFINE= SAMBA X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CURL \	39	OPTIONS_DEFINE= SAMBA X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CURL \
39	VDE CDROM_DMA PCAP USBREDIR X86_TARGETS \	40	VDE CDROM_DMA PCAP USBREDIR X86_TARGETS \
40	STATIC_LINK DOCS NCURSES	41	STATIC_LINK DOCS NCURSES DEBUG
41	SAMBA_DESC= samba dependency (for -smb)	42	SAMBA_DESC= samba dependency (for -smb)
42	GNUTLS_DESC= gnutls dependency (vnc encryption)	43	GNUTLS_DESC= gnutls dependency (vnc encryption)
43	SASL_DESC= cyrus-sasl dependency (vnc encryption)	44	SASL_DESC= cyrus-sasl dependency (vnc encryption)
Lines 49-55 USBREDIR_DESC= usb device network redirection (experimental!) Link Here
49	X86_TARGETS_DESC= Build only x86 system targets	50	X86_TARGETS_DESC= Build only x86 system targets
50	STATIC_LINK_DESC= Statically link the executables	51	STATIC_LINK_DESC= Statically link the executables
51	VDE_DESC= vde dependency (for vde networking)	52	VDE_DESC= vde dependency (for vde networking)
52	OPTIONS_DEFAULT=X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL PCAP NCURSES VDE	53	DEBUG_DESC= Build with debugging support
		54	OPTIONS_DEFAULT=X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL PCAP NCURSES VDE DEBUG
53	OPTIONS_SUB= yes	55	OPTIONS_SUB= yes
54	X11_USE= SDL=sdl2 XORG=x11,xext GNOME=gdkpixbuf2	56	X11_USE= SDL=sdl2 XORG=x11,xext GNOME=gdkpixbuf2
55	X11_USES= sdl	57	X11_USES= sdl
Lines 82-108 VDE_CONFIGURE_OFF= --disable-vde Link Here
82	STATIC_LINK_CONFIGURE_ON= --static	84	STATIC_LINK_CONFIGURE_ON= --static
83	STATIC_LINK_PREVENTS= GTK3 X11	85	STATIC_LINK_PREVENTS= GTK3 X11
84	STATIC_LINK_PREVENTS_MSG= X11 ui cannot be built static	86	STATIC_LINK_PREVENTS_MSG= X11 ui cannot be built static
85	NCURSES_USES= ncurses:base	87	NCURSES_USES= ncurses
86	SAMBA_USES= samba:run # smbd	88	SAMBA_USES= samba:run # smbd
87	SAMBA_CONFIGURE_ON= --smbd=${LOCALBASE}/sbin/smbd	89	SAMBA_CONFIGURE_ON= --smbd=${LOCALBASE}/sbin/smbd
88	DOCS_BUILD_DEPENDS= texi2html:textproc/texi2html \	90	DOCS_BUILD_DEPENDS= texi2html:textproc/texi2html \
89	sphinx-build:textproc/py-sphinx	91	sphinx-build:textproc/py-sphinx
90	DOCS_USES= makeinfo	92	DOCS_USES= makeinfo
91	DOCS_MAKE_ARGS_OFF= NOPORTDOCS=1	93	DOCS_MAKE_ARGS_OFF= NOPORTDOCS=1
		94	DEBUG_VARS= WITH_DEBUG=1 CONFIGURE_ARGS+=--enable-debug
		95	DEBUG_VARS+= CONFIGURE_ARGS+=--enable-debug-info
92		96
93	PORTDOCS= docs interop/.buildinfo interop/* qemu-doc.html qemu-doc.txt qemu-ga-ref.html qemu-ga-ref.txt \	97	PORTDOCS= docs interop/.buildinfo interop/* qemu-doc.html qemu-doc.txt qemu-ga-ref.html qemu-ga-ref.txt \
94	qemu-qmp-ref.html qemu-qmp-ref.txt specs/.buildinfo specs/*	98	qemu-qmp-ref.html qemu-qmp-ref.txt specs/.buildinfo specs/*
95		99
		100	## NB specify extra-ldflags only once w/ no quote marks,
		101	## or it will miss the system libfdt
		102
96	WITHOUT_CPU_CFLAGS=yes #to avoid problems with register allocation	103	WITHOUT_CPU_CFLAGS=yes #to avoid problems with register allocation
97	CFLAGS:= ${CFLAGS:C/-fno-tree-vrp//}	104	CFLAGS:= ${CFLAGS:C/-fno-tree-vrp//}
98	CONFIGURE_ARGS= --localstatedir=/var --extra-ldflags=-L\"/usr/lib\" \	105	CONFIGURE_ARGS= --localstatedir=/var \
99	--extra-ldflags=-L\"${LOCALBASE}/lib\" --enable-debug \	106	--extra-ldflags=-L/usr/lib\ -L${LOCALBASE}/lib \
100	--prefix=${PREFIX} --cc=${CC} --enable-netmap --enable-docs --disable-kvm \	107	--prefix=${PREFIX} --cc=${CC} --enable-netmap --enable-docs --disable-kvm \
101	--disable-linux-user --disable-linux-aio --disable-xen \	108	--disable-linux-user --disable-linux-aio --disable-xen \
102	--enable-debug-info --python=${PYTHON_CMD} \	109	--python=${PYTHON_CMD} \
103	--extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\"	110	--extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\"
104	INSTALLS_ICONS= yes	111	INSTALLS_ICONS= yes
105		112
		113
106	.include <bsd.port.options.mk>	114	.include <bsd.port.options.mk>
107		115
108	.if !defined(STRIP) \|\| ${STRIP} == ""	116	.if !defined(STRIP) \|\| ${STRIP} == ""