From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] dpdk: update to 22.11.
Date: Mon, 05 Dec 2022 15:53:03 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40918@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1222 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages dpdk
https://github.com/void-linux/void-packages/pull/40918
dpdk: update to 22.11.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40918.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dpdk-40918.patch --]
[-- Type: text/x-diff, Size: 4528 bytes --]
From 0c2bdcb8d4e62301b2a8671973195eded296ce99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 5 Dec 2022 21:35:38 +0700
Subject: [PATCH] dpdk: update to 22.11.
---
srcpkgs/dpdk/patches/arm.patch | 17 -----------------
srcpkgs/dpdk/patches/cross-build.patch | 13 +++++++++++++
srcpkgs/dpdk/patches/sphinx-4.0.patch | 10 ----------
srcpkgs/dpdk/template | 18 +++++++++---------
4 files changed, 22 insertions(+), 36 deletions(-)
delete mode 100644 srcpkgs/dpdk/patches/arm.patch
create mode 100644 srcpkgs/dpdk/patches/cross-build.patch
delete mode 100644 srcpkgs/dpdk/patches/sphinx-4.0.patch
diff --git a/srcpkgs/dpdk/patches/arm.patch b/srcpkgs/dpdk/patches/arm.patch
deleted file mode 100644
index 5a30e4d4fc16..000000000000
--- a/srcpkgs/dpdk/patches/arm.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git config/meson.build config/meson.build
-index 2bafea5..6b15f13 100644
---- a/config/meson.build
-+++ b/config/meson.build
-@@ -50,11 +50,7 @@ meson.add_install_script('../buildtools/symlink-drivers-solibs.sh',
- pmd_subdir_opt)
-
- # set the machine type and cflags for it
--if meson.is_cross_build()
-- machine = host_machine.cpu()
--else
-- machine = get_option('machine')
--endif
-+machine = get_option('machine')
-
- # machine type 'default' is special, it defaults to the per arch agreed common
- # minimal baseline needed for DPDK.
diff --git a/srcpkgs/dpdk/patches/cross-build.patch b/srcpkgs/dpdk/patches/cross-build.patch
new file mode 100644
index 000000000000..167a9f35bbe0
--- /dev/null
+++ b/srcpkgs/dpdk/patches/cross-build.patch
@@ -0,0 +1,13 @@
+Index: dpdk-22.11/config/meson.build
+===================================================================
+--- dpdk-22.11.orig/config/meson.build
++++ dpdk-22.11/config/meson.build
+@@ -74,7 +74,7 @@ enable_drivers = ''
+ platform = get_option('platform')
+
+ # set the cpu_instruction_set and cflags for it
+-if meson.is_cross_build()
++if false
+ cpu_instruction_set = host_machine.cpu()
+ else
+ cpu_instruction_set = get_option('cpu_instruction_set')
diff --git a/srcpkgs/dpdk/patches/sphinx-4.0.patch b/srcpkgs/dpdk/patches/sphinx-4.0.patch
deleted file mode 100644
index cdee0fe98c1a..000000000000
--- a/srcpkgs/dpdk/patches/sphinx-4.0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: dpdk-19.08/doc/guides/conf.py
-===================================================================
---- dpdk-19.08.orig/doc/guides/conf.py
-+++ dpdk-19.08/doc/guides/conf.py
-@@ -410,4 +410,4 @@ def setup(app):
- # Process the numref references once the doctree has been created.
- app.connect('doctree-resolved', process_numref)
-
-- app.add_stylesheet('css/custom.css')
-+ app.add_css_file('css/custom.css')
diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 0f74b4c99d64..13337e72b2aa 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -1,12 +1,12 @@
# Template file for 'dpdk'
pkgname=dpdk
-version=19.08
-revision=5
+version=22.11
+revision=1
# no musl - uses error.h, execinfo.h and argp.h
archs="x86_64 aarch64 ppc64le i686 armv7l"
build_style=meson
configure_args="-Denable_kmods=false -Denable_docs=true -Db_lto=false"
-hostmakedepends="doxygen python3-Sphinx pkg-config elfutils"
+hostmakedepends="doxygen python3-Sphinx pkg-config elfutils python3-pyelftools"
makedepends="libnuma-devel jansson-devel libpcap-devel
zlib-devel openssl-devel libbsd-devel libelf libmnl"
depends="python3-pyelftools"
@@ -15,18 +15,18 @@ maintainer="Hans-J. Schmid <knock@myopendoor.de>"
license="BSD-3-Clause, GPL-2.0-only"
homepage="https://www.dpdk.org/"
distfiles="https://github.com/DPDK/${pkgname}/archive/v${version}.tar.gz"
-checksum=1ceff1a6f4f8d5f6f62c1682097249227ac5225ccd9638e0af09f5411c681038
+checksum=ed8b2a2b153f0311ffa065d35af29a098367af44a22b3c33e191e1a74211f2e3
# import py3compat
python_version=3
case "${XBPS_TARGET_MACHINE}" in
- armv7l*) configure_args+=" -Dmachine=armv7-a";;
- aarch64*) configure_args+=" -Dmachine=armv8-a";;
- ppc64le*) configure_args+=" -Dmachine=power8";;
- *) configure_args+=" -Dmachine=default"
+ armv7l*) configure_args+=" -Dcpu_instruction_set=armv7-a";;
+ aarch64*) configure_args+=" -Dcpu_instruction_set=armv8-a";;
+ ppc64le*) configure_args+=" -Dcpu_instruction_set=power8";;
+ *) configure_args+=" -Dcpu_instruction_set=generic"
esac
-CFLAGS="-fcommon"
+# CFLAGS="-fcommon"
post_install() {
vmkdir usr/lib/modules-load.d
next reply other threads:[~2022-12-05 14:53 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-05 14:53 sgn [this message]
2022-12-05 15:00 ` [PR PATCH] [Updated] " sgn
2022-12-05 15:11 ` sgn
2022-12-05 15:31 ` sgn
2022-12-05 16:03 ` sgn
2022-12-05 16:04 ` sgn
2023-03-06 2:04 ` github-actions
2023-03-21 1:52 ` [PR PATCH] [Closed]: " github-actions
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40918@inbox.vuxu.org \
--to=sgn@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).