Attachment #155647 for bug #199485

View | Details | Raw Unified | Return to bug 199485
Collapse All | Expand All




# $FreeBSD: head/net/dpdk/Makefile 375235 2014-12-22 12:18:25Z vanilla $

PORTNAME=	dpdk
PORTVERSION=	2.0.0
CATEGORIES=	net
MASTER_SITES=	http://www.dpdk.org/browse/dpdk/snapshot/


ALL_TARGET=	install T=${RTE_TARGET}

# build up the list of files in the compiled directory that should be executable
EXEC_FILES=	app/cmdline_test \
		app/cmdline_test \
		app/testpipeline \
		app/testpmd \
		app/testacl \
		app/test

post-patch:
	@${REINPLACE_CMD} -e 's/-fdirectives-only//' ${WRKSRC}/mk/rte.sdkconfig.mk

do-install:
	${MKDIR} ${STAGEDIR}${DATADIR}/${RTE_TARGET}/app \
	  ${STAGEDIR}${DATADIR}/${RTE_TARGET}/lib \

Lines 1-2 Link Here

(-)b/distinfo (-2 / +2 lines)
1	SHA256 (dpdk-1.8.0.tar.gz) = 9f5386830bd999355182e20408f3fc2cfa0802a4497fdded8d43202feede1939	1	SHA256 (dpdk-2.0.0.tar.gz) = 643789a3be5ba44dd84d6b248cdf5471b260f8736dada177dadf076aebfbff3f
2	SIZE (dpdk-1.8.0.tar.gz) = 14706839	2	SIZE (dpdk-2.0.0.tar.gz) = 14960022




--- lib/librte_eal/bsdapp/nic_uio/nic_uio.c.orig	2015-01-09 11:56:48.000000000 -0500
+++ lib/librte_eal/bsdapp/nic_uio/nic_uio.c	2015-01-09 11:57:05.000000000 -0500
@@ -175,13 +175,13 @@
 
 
 int
-nic_uio_open(struct cdev *dev, int oflags, int devtype, d_thread_t *td)
+nic_uio_open(struct cdev *dev, int oflags, int devtype, struct thread *td)
 {
 	return 0;
 }
 
 int
-nic_uio_close(struct cdev *dev, int fflag, int devtype, d_thread_t *td)
+nic_uio_close(struct cdev *dev, int fflag, int devtype, struct thread *td)
 {
 	return 0;
 }

Return to bug 199485

Lines 1-7 Link Here

(-)b/Makefile (-6 / +3 lines)
1	# $FreeBSD: head/net/dpdk/Makefile 375235 2014-12-22 12:18:25Z vanilla $	1	# $FreeBSD: head/net/dpdk/Makefile 375235 2014-12-22 12:18:25Z vanilla $
2		2
3	PORTNAME= dpdk	3	PORTNAME= dpdk
4	PORTVERSION= 1.8.0	4	PORTVERSION= 2.0.0
5	CATEGORIES= net	5	CATEGORIES= net
6	MASTER_SITES= http://www.dpdk.org/browse/dpdk/snapshot/	6	MASTER_SITES= http://www.dpdk.org/browse/dpdk/snapshot/
7		7
Lines 21-35 WRKBUILD= ${WRKSRC}/${RTE_TARGET} Link Here
21	ALL_TARGET= install T=${RTE_TARGET}	21	ALL_TARGET= install T=${RTE_TARGET}
22		22
23	# build up the list of files in the compiled directory that should be executable	23	# build up the list of files in the compiled directory that should be executable
24	EXEC_FILES= hostapp/testhost \	24	EXEC_FILES= app/cmdline_test \
25	app/cmdline_test \
26	app/testpipeline \	25	app/testpipeline \
27	app/testpmd \	26	app/testpmd \
		27	app/testacl \
28	app/test	28	app/test
29		29
30	post-patch:
31	@${REINPLACE_CMD} -e 's/-fdirectives-only//' ${WRKSRC}/mk/rte.sdkconfig.mk
32
33	do-install:	30	do-install:
34	${MKDIR} ${STAGEDIR}${DATADIR}/${RTE_TARGET}/app \	31	${MKDIR} ${STAGEDIR}${DATADIR}/${RTE_TARGET}/app \
35	${STAGEDIR}${DATADIR}/${RTE_TARGET}/lib \	32	${STAGEDIR}${DATADIR}/${RTE_TARGET}/lib \

Removed Link Here

(-)a/files/patch-lib-librte_eal-bsdapp-nic_uio-nic_uio.c (-18 lines)
1	--- lib/librte_eal/bsdapp/nic_uio/nic_uio.c.orig 2015-01-09 11:56:48.000000000 -0500
2	+++ lib/librte_eal/bsdapp/nic_uio/nic_uio.c 2015-01-09 11:57:05.000000000 -0500
3	@@ -175,13 +175,13 @@
4
5
6	int
7	-nic_uio_open(struct cdev dev, int oflags, int devtype, d_thread_t td)
8	+nic_uio_open(struct cdev dev, int oflags, int devtype, struct thread td)
9	{
10	return 0;
11	}
12
13	int
14	-nic_uio_close(struct cdev dev, int fflag, int devtype, d_thread_t td)
15	+nic_uio_close(struct cdev dev, int fflag, int devtype, struct thread td)
16	{
17	return 0;
18	}

Lines 3-8 Link Here

(-)b/pkg-plist (-5 / +20 lines)
3	include/dpdk	3	include/dpdk
4	lib/dpdk	4	lib/dpdk
5	%%DATADIR%%/examples/Makefile	5	%%DATADIR%%/examples/Makefile
		6	%%DATADIR%%/examples/bond/Makefile
		7	%%DATADIR%%/examples/bond/main.c
		8	%%DATADIR%%/examples/bond/main.h
6	%%DATADIR%%/examples/cmdline/Makefile	9	%%DATADIR%%/examples/cmdline/Makefile
7	%%DATADIR%%/examples/cmdline/commands.c	10	%%DATADIR%%/examples/cmdline/commands.c
8	%%DATADIR%%/examples/cmdline/commands.h	11	%%DATADIR%%/examples/cmdline/commands.h
Lines 53-58 lib/dpdk Link Here
53	%%DATADIR%%/examples/l2fwd-ivshmem/host/Makefile	56	%%DATADIR%%/examples/l2fwd-ivshmem/host/Makefile
54	%%DATADIR%%/examples/l2fwd-ivshmem/host/host.c	57	%%DATADIR%%/examples/l2fwd-ivshmem/host/host.c
55	%%DATADIR%%/examples/l2fwd-ivshmem/include/common.h	58	%%DATADIR%%/examples/l2fwd-ivshmem/include/common.h
		59	%%DATADIR%%/examples/l2fwd-jobstats/Makefile
		60	%%DATADIR%%/examples/l2fwd-jobstats/main.c
56	%%DATADIR%%/examples/l2fwd/Makefile	61	%%DATADIR%%/examples/l2fwd/Makefile
57	%%DATADIR%%/examples/l2fwd/main.c	62	%%DATADIR%%/examples/l2fwd/main.c
58	%%DATADIR%%/examples/l3fwd-acl/Makefile	63	%%DATADIR%%/examples/l3fwd-acl/Makefile
Lines 99-104 lib/dpdk Link Here
99	%%DATADIR%%/examples/netmap_compat/lib/compat_netmap.h	104	%%DATADIR%%/examples/netmap_compat/lib/compat_netmap.h
100	%%DATADIR%%/examples/netmap_compat/netmap/netmap.h	105	%%DATADIR%%/examples/netmap_compat/netmap/netmap.h
101	%%DATADIR%%/examples/netmap_compat/netmap/netmap_user.h	106	%%DATADIR%%/examples/netmap_compat/netmap/netmap_user.h
		107	%%DATADIR%%/examples/packet_ordering/Makefile
		108	%%DATADIR%%/examples/packet_ordering/main.c
102	%%DATADIR%%/examples/qos_meter/Makefile	109	%%DATADIR%%/examples/qos_meter/Makefile
103	%%DATADIR%%/examples/qos_meter/main.c	110	%%DATADIR%%/examples/qos_meter/main.c
104	%%DATADIR%%/examples/qos_meter/main.h	111	%%DATADIR%%/examples/qos_meter/main.h
Lines 130-135 lib/dpdk Link Here
130	%%DATADIR%%/examples/quota_watermark/qwctl/commands.h	137	%%DATADIR%%/examples/quota_watermark/qwctl/commands.h
131	%%DATADIR%%/examples/quota_watermark/qwctl/qwctl.c	138	%%DATADIR%%/examples/quota_watermark/qwctl/qwctl.c
132	%%DATADIR%%/examples/quota_watermark/qwctl/qwctl.h	139	%%DATADIR%%/examples/quota_watermark/qwctl/qwctl.h
		140	%%DATADIR%%/examples/rxtx_callbacks/Makefile
		141	%%DATADIR%%/examples/rxtx_callbacks/main.c
133	%%DATADIR%%/examples/skeleton/Makefile	142	%%DATADIR%%/examples/skeleton/Makefile
134	%%DATADIR%%/examples/skeleton/basicfwd.c	143	%%DATADIR%%/examples/skeleton/basicfwd.c
135	%%DATADIR%%/examples/timer/Makefile	144	%%DATADIR%%/examples/timer/Makefile
Lines 165-170 lib/dpdk Link Here
165	%%DATADIR%%/mk/arch/i686/rte.vars.mk	174	%%DATADIR%%/mk/arch/i686/rte.vars.mk
166	%%DATADIR%%/mk/arch/ppc_64/rte.vars.mk	175	%%DATADIR%%/mk/arch/ppc_64/rte.vars.mk
167	%%DATADIR%%/mk/arch/x86_64/rte.vars.mk	176	%%DATADIR%%/mk/arch/x86_64/rte.vars.mk
		177	%%DATADIR%%/mk/arch/x86_x32/rte.vars.mk
168	%%DATADIR%%/mk/exec-env/bsdapp/rte.app.mk	178	%%DATADIR%%/mk/exec-env/bsdapp/rte.app.mk
169	%%DATADIR%%/mk/exec-env/bsdapp/rte.vars.mk	179	%%DATADIR%%/mk/exec-env/bsdapp/rte.vars.mk
170	%%DATADIR%%/mk/exec-env/linuxapp/rte.app.mk	180	%%DATADIR%%/mk/exec-env/linuxapp/rte.app.mk
Lines 177-182 lib/dpdk Link Here
177	%%DATADIR%%/mk/internal/rte.compile-pre.mk	187	%%DATADIR%%/mk/internal/rte.compile-pre.mk
178	%%DATADIR%%/mk/internal/rte.depdirs-post.mk	188	%%DATADIR%%/mk/internal/rte.depdirs-post.mk
179	%%DATADIR%%/mk/internal/rte.depdirs-pre.mk	189	%%DATADIR%%/mk/internal/rte.depdirs-pre.mk
		190	%%DATADIR%%/mk/internal/rte.extvars.mk
180	%%DATADIR%%/mk/internal/rte.install-post.mk	191	%%DATADIR%%/mk/internal/rte.install-post.mk
181	%%DATADIR%%/mk/internal/rte.install-pre.mk	192	%%DATADIR%%/mk/internal/rte.install-pre.mk
182	%%DATADIR%%/mk/machine/atm/rte.vars.mk	193	%%DATADIR%%/mk/machine/atm/rte.vars.mk
Lines 196-202 lib/dpdk Link Here
196	%%DATADIR%%/mk/rte.extobj.mk	207	%%DATADIR%%/mk/rte.extobj.mk
197	%%DATADIR%%/mk/rte.extshared.mk	208	%%DATADIR%%/mk/rte.extshared.mk
198	%%DATADIR%%/mk/rte.extsubdir.mk	209	%%DATADIR%%/mk/rte.extsubdir.mk
199	%%DATADIR%%/mk/rte.extvars.mk
200	%%DATADIR%%/mk/rte.gnuconfigure.mk	210	%%DATADIR%%/mk/rte.gnuconfigure.mk
201	%%DATADIR%%/mk/rte.hostapp.mk	211	%%DATADIR%%/mk/rte.hostapp.mk
202	%%DATADIR%%/mk/rte.hostlib.mk	212	%%DATADIR%%/mk/rte.hostlib.mk
Lines 229-235 lib/dpdk Link Here
229	%%DATADIR%%/x86_64-native-bsdapp-clang/.config	239	%%DATADIR%%/x86_64-native-bsdapp-clang/.config
230	%%DATADIR%%/x86_64-native-bsdapp-clang/app/cmdline_test	240	%%DATADIR%%/x86_64-native-bsdapp-clang/app/cmdline_test
231	%%DATADIR%%/x86_64-native-bsdapp-clang/app/test	241	%%DATADIR%%/x86_64-native-bsdapp-clang/app/test
232	%%DATADIR%%/x86_64-native-bsdapp-clang/app/testhost	242	%%DATADIR%%/x86_64-native-bsdapp-clang/app/testacl
233	%%DATADIR%%/x86_64-native-bsdapp-clang/app/testpipeline	243	%%DATADIR%%/x86_64-native-bsdapp-clang/app/testpipeline
234	%%DATADIR%%/x86_64-native-bsdapp-clang/app/testpmd	244	%%DATADIR%%/x86_64-native-bsdapp-clang/app/testpmd
235	%%DATADIR%%/x86_64-native-bsdapp-clang/include/generic/rte_atomic.h	245	%%DATADIR%%/x86_64-native-bsdapp-clang/include/generic/rte_atomic.h
Lines 266-272 lib/dpdk Link Here
266	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_byteorder_64.h	276	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_byteorder_64.h
267	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_cfgfile.h	277	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_cfgfile.h
268	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_common.h	278	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_common.h
269	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_common_vect.h	279	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_compat.h
270	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_config.h	280	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_config.h
271	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_cpuflags.h	281	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_cpuflags.h
272	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_cycles.h	282	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_cycles.h
Lines 292-297 lib/dpdk Link Here
292	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_ip.h	302	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_ip.h
293	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_ip_frag.h	303	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_ip_frag.h
294	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_jhash.h	304	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_jhash.h
		305	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_jobstats.h
295	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_kvargs.h	306	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_kvargs.h
296	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_launch.h	307	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_launch.h
297	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_lcore.h	308	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_lcore.h
Lines 323-328 lib/dpdk Link Here
323	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_prefetch.h	334	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_prefetch.h
324	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_random.h	335	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_random.h
325	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_red.h	336	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_red.h
		337	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_reorder.h
326	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_ring.h	338	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_ring.h
327	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_rwlock.h	339	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_rwlock.h
328	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_sched.h	340	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_sched.h
Lines 338-347 lib/dpdk Link Here
338	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_table_lpm_ipv6.h	350	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_table_lpm_ipv6.h
339	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_table_stub.h	351	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_table_stub.h
340	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_tailq.h	352	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_tailq.h
341	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_tailq_elem.h
342	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_tcp.h	353	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_tcp.h
343	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_timer.h	354	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_timer.h
344	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_udp.h	355	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_udp.h
		356	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_vect.h
345	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_version.h	357	%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_version.h
346	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/libethdev.a	358	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/libethdev.a
347	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_acl.a	359	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_acl.a
Lines 351-356 lib/dpdk Link Here
351	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_eal.a	363	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_eal.a
352	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_hash.a	364	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_hash.a
353	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_ip_frag.a	365	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_ip_frag.a
		366	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_jobstats.a
354	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_kvargs.a	367	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_kvargs.a
355	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_lpm.a	368	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_lpm.a
356	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_malloc.a	369	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_malloc.a
Lines 361-373 lib/dpdk Link Here
361	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_bond.a	374	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_bond.a
362	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_e1000.a	375	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_e1000.a
363	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_enic.a	376	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_enic.a
		377	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_fm10k.a
364	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_i40e.a	378	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_i40e.a
365	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_ixgbe.a	379	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_ixgbe.a
		380	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_null.a
366	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_pcap.a	381	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_pcap.a
367	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_ring.a	382	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_ring.a
368	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_virtio_uio.a	383	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_virtio_uio.a
369	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_vmxnet3_uio.a	384	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_vmxnet3_uio.a
370	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_port.a	385	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_port.a
		386	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_reorder.a
371	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_ring.a	387	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_ring.a
372	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_sched.a	388	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_sched.a
373	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_table.a	389	%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_table.a
374	-