* [PR PATCH] WIP New package: dtrace-utils-2.0.1.1.9999
@ 2024-12-11 22:57 leahneukirchen
2025-02-12 11:29 ` [PR PATCH] [Updated] " leahneukirchen
2025-02-12 22:28 ` leahneukirchen
0 siblings, 2 replies; 3+ messages in thread
From: leahneukirchen @ 2024-12-11 22:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1534 bytes --]
There is a new pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages dtrace
https://github.com/void-linux/void-packages/pull/53479
WIP New package: dtrace-utils-2.0.1.1.9999
<!-- Uncomment relevant sections and delete options which are not applicable -->
This is WIP.
Issues to fix before merging:
- binutils needs to be at least 2.42 because of a PIE linking bug:
https://sourceware.org/bugzilla/show_bug.cgi?id=31047
- bpf-binutils must be not newer than 2.41 unless we move bpf-gcc to 14.x
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**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/53479.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dtrace-53479.patch --]
[-- Type: text/x-diff, Size: 8062 bytes --]
From 696ae5cb94a500eba50c56c8b8f7ea09e886267f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 11 Dec 2024 23:16:23 +0100
Subject: [PATCH 1/4] New package: cross-bpf-binutils-2.41
---
srcpkgs/cross-bpf-binutils/template | 37 +++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
create mode 100644 srcpkgs/cross-bpf-binutils/template
diff --git a/srcpkgs/cross-bpf-binutils/template b/srcpkgs/cross-bpf-binutils/template
new file mode 100644
index 00000000000000..866eb3b0ecb28b
--- /dev/null
+++ b/srcpkgs/cross-bpf-binutils/template
@@ -0,0 +1,37 @@
+# Template file for 'cross-${_triplet}-${_pkgname}'
+_triplet=bpf
+_pkgname=binutils
+pkgname=cross-${_triplet}-${_pkgname}
+version=2.41
+revision=1
+build_style=gnu-configure
+configure_args="
+ --disable-nls
+ --enable-deterministic-archives
+ --enable-interwork
+ --enable-ld
+ --enable-multilib
+ --enable-plugins
+ --host=${XBPS_CROSS_TRIPLET}
+ --prefix=/usr
+ --target=${_triplet}
+ --with-gnu-as
+ --with-gnu-ld
+ --with-sysroot=/usr/${_triplet}
+ --with-system-zlib
+ --without-isl
+"
+hostmakedepends="autoconf automake bison flex perl"
+makedepends="zlib-devel"
+depends="binutils-doc"
+short_desc="GNU binary utilities"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-3.0-or-later"
+homepage="https://www.gnu.org/software/binutils/"
+distfiles="${GNU_SITE}/${_pkgname}/${_pkgname}-${version}.tar.xz"
+checksum=ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
+nocross=yes
+
+post_install() {
+ rm -fr ${DESTDIR}/usr/share/info
+}
From eb1c0a0967d3accba3cd4fc5fe16a22f06830d0a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 11 Dec 2024 23:16:27 +0100
Subject: [PATCH 2/4] New package: cross-bpf-gcc-13.2.0
---
srcpkgs/cross-bpf-gcc/template | 84 ++++++++++++++++++++++++++++++++++
1 file changed, 84 insertions(+)
create mode 100644 srcpkgs/cross-bpf-gcc/template
diff --git a/srcpkgs/cross-bpf-gcc/template b/srcpkgs/cross-bpf-gcc/template
new file mode 100644
index 00000000000000..111b1144328333
--- /dev/null
+++ b/srcpkgs/cross-bpf-gcc/template
@@ -0,0 +1,84 @@
+# Template file for 'cross-${_triplet}-gcc'
+_triplet=bpf
+_pkgname=gcc
+pkgname=cross-${_triplet}-gcc
+version=13.2.0
+revision=1
+build_wrksrc=build
+build_style=gnu-configure
+make_build_args="INHIBIT_LIBC_CFLAGS='-DUSE_TM_CLONE_REGISTRY=0'"
+hostmakedepends="autoconf automake cross-bpf-binutils bison flex
+ perl tar texinfo"
+makedepends="gmp-devel isl15-devel libmpc-devel mpfr-devel zlib-devel"
+depends="cross-bpf-binutils"
+short_desc="GNU Compiler Collection"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GFDL-1.2-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
+homepage="https://gcc.gnu.org"
+distfiles="${GNU_SITE}/gcc/gcc-${version}/gcc-${version}.tar.xz"
+checksum=e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da
+alternatives="or1k-none-elf:/usr/bin/or1k-none-elf-cc:/usr/bin/or1k-none-elf-gcc"
+nocross=yes
+nopie=yes
+nostrip_files="libgcc.a libgcov.a"
+
+if [ "$XBPS_TARGET_WORDSIZE" != 64 ]; then
+ broken="https://api.travis-ci.org/v3/job/717355887/log.txt"
+fi
+
+export CFLAGS_FOR_TARGET="-g -Os -ffunction-sections -fdata-sections"
+export CXXFLAGS_FOR_TARGET="-g -Os -ffunction-sections -fdata-sections"
+
+post_extract() {
+ mkdir -p build
+}
+
+do_configure() {
+ ../configure \
+ --disable-decimal-float \
+ --disable-libffi \
+ --disable-libgomp \
+ --disable-libmudflap \
+ --disable-libquadmath \
+ --disable-libssp \
+ --disable-libstdcxx-pch \
+ --disable-libstdc__-v3 \
+ --disable-nls \
+ --disable-shared \
+ --disable-threads \
+ --disable-tls \
+ --disable-werror \
+ --disable-gcov \
+ --enable-__cxa_atexit \
+ --enable-c99 \
+ --enable-gnu-indirect-function \
+ --enable-interwork \
+ --enable-languages=c,c++ \
+ --enable-long-long \
+ --enable-multilib \
+ --enable-plugins \
+ --host=${XBPS_CROSS_TRIPLET} \
+ --libdir=/usr/lib \
+ --libexecdir=/usr/lib \
+ --prefix=/usr \
+ --target=${_triplet} \
+ --with-gmp \
+ --with-gnu-as \
+ --with-gnu-ld \
+ --with-headers=/usr/${_triplet}/include \
+ --with-host-libstdcxx='-static-libgcc -Wl,-Bstatic,-lstdc++,-Bdynamic -lm' \
+ --with-isl \
+ --with-libelf \
+ --with-mpc \
+ --with-mpfr \
+ --with-native-system-header-dir=/include \
+ --with-newlib \
+ --with-python-dir=share/gcc-${_triplet} \
+ --with-sysroot=/usr/${_triplet} \
+ --with-system-zlib
+}
+
+post_install() {
+ rm -fr ${DESTDIR}/usr/share/{info,man/man7}
+ rm -fr ${DESTDIR}/usr/lib/libcc1.*
+}
From 57e990a4fd6119b575a8fa9dda80aed68aa1ce85 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 11 Dec 2024 23:17:13 +0100
Subject: [PATCH 3/4] binutils: update to 2.43.1.
---
srcpkgs/binutils/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template
index 43a457f864c8f0..92142bb6788fda 100644
--- a/srcpkgs/binutils/template
+++ b/srcpkgs/binutils/template
@@ -1,7 +1,7 @@
# Template file for 'binutils'
pkgname=binutils
-version=2.41
-revision=3
+version=2.43.1
+revision=1
bootstrap=yes
hostmakedepends="pkgconf"
makedepends="zlib-devel libzstd-devel"
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://www.gnu.org/software/binutils/"
distfiles="${GNU_SITE}/binutils/binutils-${version}.tar.xz"
-checksum=ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
+checksum=13f74202a3c4c51118b797a39ea4200d3f6cfbe224da6d1d95bb938480132dfd
build_options="all_targets"
desc_option_all_targets="Enable all supported targets"
From 88ace2a7ef5964db832ff4db2759fe3e56d56dad Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 11 Dec 2024 23:17:41 +0100
Subject: [PATCH 4/4] New package: dtrace-utils-2.0.1.1.9999
---
srcpkgs/dtrace-utils/patches/configure.patch | 11 +++++++
srcpkgs/dtrace-utils/template | 34 ++++++++++++++++++++
2 files changed, 45 insertions(+)
create mode 100644 srcpkgs/dtrace-utils/patches/configure.patch
create mode 100644 srcpkgs/dtrace-utils/template
diff --git a/srcpkgs/dtrace-utils/patches/configure.patch b/srcpkgs/dtrace-utils/patches/configure.patch
new file mode 100644
index 00000000000000..36798d245996af
--- /dev/null
+++ b/srcpkgs/dtrace-utils/patches/configure.patch
@@ -0,0 +1,11 @@
+--- a/configure
++++ b/configure
+@@ -173,7 +173,7 @@
+ HAVE_BPFV3=*) write_config_var BPFV3 "$option";;
+ HAVE_BPFMASM=*) write_config_var BPFMASM "$option";;
+ *) echo "Unknown option $option" >&2
+- exit 1;;
++ ;;
+ esac
+ done
+
diff --git a/srcpkgs/dtrace-utils/template b/srcpkgs/dtrace-utils/template
new file mode 100644
index 00000000000000..0849445666e2b3
--- /dev/null
+++ b/srcpkgs/dtrace-utils/template
@@ -0,0 +1,34 @@
+# Template file for 'dtrace-utils'
+pkgname=dtrace-utils
+version=2.0.1.1.9999
+revision=1
+#archs="i686 x86_64"
+#build_wrksrc=
+build_style=gnu-configure
+#configure_args="HAVE_BPFMASM=no"
+make_build_args="-k"
+#make_install_args=""
+#conf_files=""
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends="clang flex libgomp-devel pkg-config shadow lld
+ cross-bpf-gcc cross-bpf-binutils"
+makedepends="binutils-devel elfutils-devel fuse-devel libpcap-devel libpfm4-devel valgrind-devel libbpf-devel"
+depends=""
+short_desc="Linux version of the DTrace tracing tool"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="UPL-1.0"
+homepage="https://github.com/oracle/dtrace-utils"
+#changelog=""
+#distfiles="https://github.com/oracle/dtrace-utils/archive/refs/tags/${version}.tar.gz"
+distfiles="https://github.com/oracle/dtrace-utils/archive/refs/heads/devel.tar.gz"
+checksum=33fa9b34510358e59e6d971cf6dab38300f5c7783f14046d6000beb5f3975cb6
+nostrip_files="bpf_dlib.o"
+
+export BPFC="bpf-gcc"
+export BPFLD="bpf-ld"
+
+post_install() {
+ rm ${DESTDIR}/usr/share/doc/dtrace-2.0.1/showUSDT
+ mv ${DESTDIR}/lib64/* ${DESTDIR}/usr/lib/
+ rmdir ${DESTDIR}/lib64
+}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] WIP New package: dtrace-utils-2.0.1.1.9999
2024-12-11 22:57 [PR PATCH] WIP New package: dtrace-utils-2.0.1.1.9999 leahneukirchen
@ 2025-02-12 11:29 ` leahneukirchen
2025-02-12 22:28 ` leahneukirchen
1 sibling, 0 replies; 3+ messages in thread
From: leahneukirchen @ 2025-02-12 11:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1539 bytes --]
There is an updated pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages dtrace
https://github.com/void-linux/void-packages/pull/53479
WIP New package: dtrace-utils-2.0.1.1.9999
<!-- Uncomment relevant sections and delete options which are not applicable -->
This is WIP.
Issues to fix before merging:
- binutils needs to be at least 2.42 because of a PIE linking bug:
https://sourceware.org/bugzilla/show_bug.cgi?id=31047
- bpf-binutils must be not newer than 2.41 unless we move bpf-gcc to 14.x
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**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/53479.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dtrace-53479.patch --]
[-- Type: text/x-diff, Size: 10188 bytes --]
From 13d562c0a4e4f724a3736c3a0b9e9c8ac637db5a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 11 Dec 2024 23:16:23 +0100
Subject: [PATCH 1/5] New package: cross-bpf-binutils-2.41
---
srcpkgs/cross-bpf-binutils/template | 37 +++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
create mode 100644 srcpkgs/cross-bpf-binutils/template
diff --git a/srcpkgs/cross-bpf-binutils/template b/srcpkgs/cross-bpf-binutils/template
new file mode 100644
index 00000000000000..866eb3b0ecb28b
--- /dev/null
+++ b/srcpkgs/cross-bpf-binutils/template
@@ -0,0 +1,37 @@
+# Template file for 'cross-${_triplet}-${_pkgname}'
+_triplet=bpf
+_pkgname=binutils
+pkgname=cross-${_triplet}-${_pkgname}
+version=2.41
+revision=1
+build_style=gnu-configure
+configure_args="
+ --disable-nls
+ --enable-deterministic-archives
+ --enable-interwork
+ --enable-ld
+ --enable-multilib
+ --enable-plugins
+ --host=${XBPS_CROSS_TRIPLET}
+ --prefix=/usr
+ --target=${_triplet}
+ --with-gnu-as
+ --with-gnu-ld
+ --with-sysroot=/usr/${_triplet}
+ --with-system-zlib
+ --without-isl
+"
+hostmakedepends="autoconf automake bison flex perl"
+makedepends="zlib-devel"
+depends="binutils-doc"
+short_desc="GNU binary utilities"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-3.0-or-later"
+homepage="https://www.gnu.org/software/binutils/"
+distfiles="${GNU_SITE}/${_pkgname}/${_pkgname}-${version}.tar.xz"
+checksum=ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
+nocross=yes
+
+post_install() {
+ rm -fr ${DESTDIR}/usr/share/info
+}
From 77b32550991af3befe7edf2a226aa6e41f770bd7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 11 Dec 2024 23:16:27 +0100
Subject: [PATCH 2/5] New package: cross-bpf-gcc-13.2.0
---
srcpkgs/cross-bpf-gcc/template | 84 ++++++++++++++++++++++++++++++++++
1 file changed, 84 insertions(+)
create mode 100644 srcpkgs/cross-bpf-gcc/template
diff --git a/srcpkgs/cross-bpf-gcc/template b/srcpkgs/cross-bpf-gcc/template
new file mode 100644
index 00000000000000..111b1144328333
--- /dev/null
+++ b/srcpkgs/cross-bpf-gcc/template
@@ -0,0 +1,84 @@
+# Template file for 'cross-${_triplet}-gcc'
+_triplet=bpf
+_pkgname=gcc
+pkgname=cross-${_triplet}-gcc
+version=13.2.0
+revision=1
+build_wrksrc=build
+build_style=gnu-configure
+make_build_args="INHIBIT_LIBC_CFLAGS='-DUSE_TM_CLONE_REGISTRY=0'"
+hostmakedepends="autoconf automake cross-bpf-binutils bison flex
+ perl tar texinfo"
+makedepends="gmp-devel isl15-devel libmpc-devel mpfr-devel zlib-devel"
+depends="cross-bpf-binutils"
+short_desc="GNU Compiler Collection"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GFDL-1.2-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
+homepage="https://gcc.gnu.org"
+distfiles="${GNU_SITE}/gcc/gcc-${version}/gcc-${version}.tar.xz"
+checksum=e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da
+alternatives="or1k-none-elf:/usr/bin/or1k-none-elf-cc:/usr/bin/or1k-none-elf-gcc"
+nocross=yes
+nopie=yes
+nostrip_files="libgcc.a libgcov.a"
+
+if [ "$XBPS_TARGET_WORDSIZE" != 64 ]; then
+ broken="https://api.travis-ci.org/v3/job/717355887/log.txt"
+fi
+
+export CFLAGS_FOR_TARGET="-g -Os -ffunction-sections -fdata-sections"
+export CXXFLAGS_FOR_TARGET="-g -Os -ffunction-sections -fdata-sections"
+
+post_extract() {
+ mkdir -p build
+}
+
+do_configure() {
+ ../configure \
+ --disable-decimal-float \
+ --disable-libffi \
+ --disable-libgomp \
+ --disable-libmudflap \
+ --disable-libquadmath \
+ --disable-libssp \
+ --disable-libstdcxx-pch \
+ --disable-libstdc__-v3 \
+ --disable-nls \
+ --disable-shared \
+ --disable-threads \
+ --disable-tls \
+ --disable-werror \
+ --disable-gcov \
+ --enable-__cxa_atexit \
+ --enable-c99 \
+ --enable-gnu-indirect-function \
+ --enable-interwork \
+ --enable-languages=c,c++ \
+ --enable-long-long \
+ --enable-multilib \
+ --enable-plugins \
+ --host=${XBPS_CROSS_TRIPLET} \
+ --libdir=/usr/lib \
+ --libexecdir=/usr/lib \
+ --prefix=/usr \
+ --target=${_triplet} \
+ --with-gmp \
+ --with-gnu-as \
+ --with-gnu-ld \
+ --with-headers=/usr/${_triplet}/include \
+ --with-host-libstdcxx='-static-libgcc -Wl,-Bstatic,-lstdc++,-Bdynamic -lm' \
+ --with-isl \
+ --with-libelf \
+ --with-mpc \
+ --with-mpfr \
+ --with-native-system-header-dir=/include \
+ --with-newlib \
+ --with-python-dir=share/gcc-${_triplet} \
+ --with-sysroot=/usr/${_triplet} \
+ --with-system-zlib
+}
+
+post_install() {
+ rm -fr ${DESTDIR}/usr/share/{info,man/man7}
+ rm -fr ${DESTDIR}/usr/lib/libcc1.*
+}
From 125a203db3c5c59b2f64b747f7363ae01b342081 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 11 Dec 2024 23:17:13 +0100
Subject: [PATCH 3/5] binutils: update to 2.43.1.
---
srcpkgs/binutils/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template
index 43a457f864c8f0..92142bb6788fda 100644
--- a/srcpkgs/binutils/template
+++ b/srcpkgs/binutils/template
@@ -1,7 +1,7 @@
# Template file for 'binutils'
pkgname=binutils
-version=2.41
-revision=3
+version=2.43.1
+revision=1
bootstrap=yes
hostmakedepends="pkgconf"
makedepends="zlib-devel libzstd-devel"
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://www.gnu.org/software/binutils/"
distfiles="${GNU_SITE}/binutils/binutils-${version}.tar.xz"
-checksum=ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
+checksum=13f74202a3c4c51118b797a39ea4200d3f6cfbe224da6d1d95bb938480132dfd
build_options="all_targets"
desc_option_all_targets="Enable all supported targets"
From cfd67de0c514cd8cce230d34ec4c33fb819d8e83 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 11 Dec 2024 23:17:41 +0100
Subject: [PATCH 4/5] New package: dtrace-utils-2.0.1.1.9999
---
srcpkgs/dtrace-utils/patches/configure.patch | 11 +++++++
srcpkgs/dtrace-utils/template | 34 ++++++++++++++++++++
2 files changed, 45 insertions(+)
create mode 100644 srcpkgs/dtrace-utils/patches/configure.patch
create mode 100644 srcpkgs/dtrace-utils/template
diff --git a/srcpkgs/dtrace-utils/patches/configure.patch b/srcpkgs/dtrace-utils/patches/configure.patch
new file mode 100644
index 00000000000000..36798d245996af
--- /dev/null
+++ b/srcpkgs/dtrace-utils/patches/configure.patch
@@ -0,0 +1,11 @@
+--- a/configure
++++ b/configure
+@@ -173,7 +173,7 @@
+ HAVE_BPFV3=*) write_config_var BPFV3 "$option";;
+ HAVE_BPFMASM=*) write_config_var BPFMASM "$option";;
+ *) echo "Unknown option $option" >&2
+- exit 1;;
++ ;;
+ esac
+ done
+
diff --git a/srcpkgs/dtrace-utils/template b/srcpkgs/dtrace-utils/template
new file mode 100644
index 00000000000000..0849445666e2b3
--- /dev/null
+++ b/srcpkgs/dtrace-utils/template
@@ -0,0 +1,34 @@
+# Template file for 'dtrace-utils'
+pkgname=dtrace-utils
+version=2.0.1.1.9999
+revision=1
+#archs="i686 x86_64"
+#build_wrksrc=
+build_style=gnu-configure
+#configure_args="HAVE_BPFMASM=no"
+make_build_args="-k"
+#make_install_args=""
+#conf_files=""
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends="clang flex libgomp-devel pkg-config shadow lld
+ cross-bpf-gcc cross-bpf-binutils"
+makedepends="binutils-devel elfutils-devel fuse-devel libpcap-devel libpfm4-devel valgrind-devel libbpf-devel"
+depends=""
+short_desc="Linux version of the DTrace tracing tool"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="UPL-1.0"
+homepage="https://github.com/oracle/dtrace-utils"
+#changelog=""
+#distfiles="https://github.com/oracle/dtrace-utils/archive/refs/tags/${version}.tar.gz"
+distfiles="https://github.com/oracle/dtrace-utils/archive/refs/heads/devel.tar.gz"
+checksum=33fa9b34510358e59e6d971cf6dab38300f5c7783f14046d6000beb5f3975cb6
+nostrip_files="bpf_dlib.o"
+
+export BPFC="bpf-gcc"
+export BPFLD="bpf-ld"
+
+post_install() {
+ rm ${DESTDIR}/usr/share/doc/dtrace-2.0.1/showUSDT
+ mv ${DESTDIR}/lib64/* ${DESTDIR}/usr/lib/
+ rmdir ${DESTDIR}/lib64
+}
From 324039f7bdfdc9c1c1e66a8206a3a85049e02735 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 5 Feb 2025 12:05:32 +0100
Subject: [PATCH 5/5] dtrace-utils: update to 2.0.2.
---
srcpkgs/dtrace-utils/template | 22 +++++++---------------
1 file changed, 7 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/dtrace-utils/template b/srcpkgs/dtrace-utils/template
index 0849445666e2b3..eba754c01728c2 100644
--- a/srcpkgs/dtrace-utils/template
+++ b/srcpkgs/dtrace-utils/template
@@ -1,34 +1,26 @@
# Template file for 'dtrace-utils'
pkgname=dtrace-utils
-version=2.0.1.1.9999
+version=2.0.2
revision=1
-#archs="i686 x86_64"
-#build_wrksrc=
build_style=gnu-configure
#configure_args="HAVE_BPFMASM=no"
make_build_args="-k"
-#make_install_args=""
-#conf_files=""
-#make_dirs="/var/log/dir 0755 root root"
-hostmakedepends="clang flex libgomp-devel pkg-config shadow lld
- cross-bpf-gcc cross-bpf-binutils"
-makedepends="binutils-devel elfutils-devel fuse-devel libpcap-devel libpfm4-devel valgrind-devel libbpf-devel"
-depends=""
+hostmakedepends="cross-bpf-binutils cross-bpf-gcc flex libgomp-devel pkg-config shadow"
+makedepends="binutils-devel elfutils-devel fuse-devel libbpf-devel libpcap-devel
+ libpfm4-devel valgrind-devel"
short_desc="Linux version of the DTrace tracing tool"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="UPL-1.0"
homepage="https://github.com/oracle/dtrace-utils"
-#changelog=""
-#distfiles="https://github.com/oracle/dtrace-utils/archive/refs/tags/${version}.tar.gz"
-distfiles="https://github.com/oracle/dtrace-utils/archive/refs/heads/devel.tar.gz"
-checksum=33fa9b34510358e59e6d971cf6dab38300f5c7783f14046d6000beb5f3975cb6
+distfiles="https://github.com/oracle/dtrace-utils/archive/refs/tags/${version}.tar.gz"
+checksum=0636546b8286d67de0e41148f5c73cf8f4339f5989da3113442eb51421bc4916
nostrip_files="bpf_dlib.o"
export BPFC="bpf-gcc"
export BPFLD="bpf-ld"
post_install() {
- rm ${DESTDIR}/usr/share/doc/dtrace-2.0.1/showUSDT
+ rm ${DESTDIR}/usr/share/doc/dtrace-*/showUSDT
mv ${DESTDIR}/lib64/* ${DESTDIR}/usr/lib/
rmdir ${DESTDIR}/lib64
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] WIP New package: dtrace-utils-2.0.1.1.9999
2024-12-11 22:57 [PR PATCH] WIP New package: dtrace-utils-2.0.1.1.9999 leahneukirchen
2025-02-12 11:29 ` [PR PATCH] [Updated] " leahneukirchen
@ 2025-02-12 22:28 ` leahneukirchen
1 sibling, 0 replies; 3+ messages in thread
From: leahneukirchen @ 2025-02-12 22:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1539 bytes --]
There is an updated pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages dtrace
https://github.com/void-linux/void-packages/pull/53479
WIP New package: dtrace-utils-2.0.1.1.9999
<!-- Uncomment relevant sections and delete options which are not applicable -->
This is WIP.
Issues to fix before merging:
- binutils needs to be at least 2.42 because of a PIE linking bug:
https://sourceware.org/bugzilla/show_bug.cgi?id=31047
- bpf-binutils must be not newer than 2.41 unless we move bpf-gcc to 14.x
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**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/53479.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dtrace-53479.patch --]
[-- Type: text/x-diff, Size: 10188 bytes --]
From 13d562c0a4e4f724a3736c3a0b9e9c8ac637db5a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 11 Dec 2024 23:16:23 +0100
Subject: [PATCH 1/5] New package: cross-bpf-binutils-2.41
---
srcpkgs/cross-bpf-binutils/template | 37 +++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
create mode 100644 srcpkgs/cross-bpf-binutils/template
diff --git a/srcpkgs/cross-bpf-binutils/template b/srcpkgs/cross-bpf-binutils/template
new file mode 100644
index 00000000000000..866eb3b0ecb28b
--- /dev/null
+++ b/srcpkgs/cross-bpf-binutils/template
@@ -0,0 +1,37 @@
+# Template file for 'cross-${_triplet}-${_pkgname}'
+_triplet=bpf
+_pkgname=binutils
+pkgname=cross-${_triplet}-${_pkgname}
+version=2.41
+revision=1
+build_style=gnu-configure
+configure_args="
+ --disable-nls
+ --enable-deterministic-archives
+ --enable-interwork
+ --enable-ld
+ --enable-multilib
+ --enable-plugins
+ --host=${XBPS_CROSS_TRIPLET}
+ --prefix=/usr
+ --target=${_triplet}
+ --with-gnu-as
+ --with-gnu-ld
+ --with-sysroot=/usr/${_triplet}
+ --with-system-zlib
+ --without-isl
+"
+hostmakedepends="autoconf automake bison flex perl"
+makedepends="zlib-devel"
+depends="binutils-doc"
+short_desc="GNU binary utilities"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-3.0-or-later"
+homepage="https://www.gnu.org/software/binutils/"
+distfiles="${GNU_SITE}/${_pkgname}/${_pkgname}-${version}.tar.xz"
+checksum=ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
+nocross=yes
+
+post_install() {
+ rm -fr ${DESTDIR}/usr/share/info
+}
From 77b32550991af3befe7edf2a226aa6e41f770bd7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 11 Dec 2024 23:16:27 +0100
Subject: [PATCH 2/5] New package: cross-bpf-gcc-13.2.0
---
srcpkgs/cross-bpf-gcc/template | 84 ++++++++++++++++++++++++++++++++++
1 file changed, 84 insertions(+)
create mode 100644 srcpkgs/cross-bpf-gcc/template
diff --git a/srcpkgs/cross-bpf-gcc/template b/srcpkgs/cross-bpf-gcc/template
new file mode 100644
index 00000000000000..111b1144328333
--- /dev/null
+++ b/srcpkgs/cross-bpf-gcc/template
@@ -0,0 +1,84 @@
+# Template file for 'cross-${_triplet}-gcc'
+_triplet=bpf
+_pkgname=gcc
+pkgname=cross-${_triplet}-gcc
+version=13.2.0
+revision=1
+build_wrksrc=build
+build_style=gnu-configure
+make_build_args="INHIBIT_LIBC_CFLAGS='-DUSE_TM_CLONE_REGISTRY=0'"
+hostmakedepends="autoconf automake cross-bpf-binutils bison flex
+ perl tar texinfo"
+makedepends="gmp-devel isl15-devel libmpc-devel mpfr-devel zlib-devel"
+depends="cross-bpf-binutils"
+short_desc="GNU Compiler Collection"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GFDL-1.2-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
+homepage="https://gcc.gnu.org"
+distfiles="${GNU_SITE}/gcc/gcc-${version}/gcc-${version}.tar.xz"
+checksum=e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da
+alternatives="or1k-none-elf:/usr/bin/or1k-none-elf-cc:/usr/bin/or1k-none-elf-gcc"
+nocross=yes
+nopie=yes
+nostrip_files="libgcc.a libgcov.a"
+
+if [ "$XBPS_TARGET_WORDSIZE" != 64 ]; then
+ broken="https://api.travis-ci.org/v3/job/717355887/log.txt"
+fi
+
+export CFLAGS_FOR_TARGET="-g -Os -ffunction-sections -fdata-sections"
+export CXXFLAGS_FOR_TARGET="-g -Os -ffunction-sections -fdata-sections"
+
+post_extract() {
+ mkdir -p build
+}
+
+do_configure() {
+ ../configure \
+ --disable-decimal-float \
+ --disable-libffi \
+ --disable-libgomp \
+ --disable-libmudflap \
+ --disable-libquadmath \
+ --disable-libssp \
+ --disable-libstdcxx-pch \
+ --disable-libstdc__-v3 \
+ --disable-nls \
+ --disable-shared \
+ --disable-threads \
+ --disable-tls \
+ --disable-werror \
+ --disable-gcov \
+ --enable-__cxa_atexit \
+ --enable-c99 \
+ --enable-gnu-indirect-function \
+ --enable-interwork \
+ --enable-languages=c,c++ \
+ --enable-long-long \
+ --enable-multilib \
+ --enable-plugins \
+ --host=${XBPS_CROSS_TRIPLET} \
+ --libdir=/usr/lib \
+ --libexecdir=/usr/lib \
+ --prefix=/usr \
+ --target=${_triplet} \
+ --with-gmp \
+ --with-gnu-as \
+ --with-gnu-ld \
+ --with-headers=/usr/${_triplet}/include \
+ --with-host-libstdcxx='-static-libgcc -Wl,-Bstatic,-lstdc++,-Bdynamic -lm' \
+ --with-isl \
+ --with-libelf \
+ --with-mpc \
+ --with-mpfr \
+ --with-native-system-header-dir=/include \
+ --with-newlib \
+ --with-python-dir=share/gcc-${_triplet} \
+ --with-sysroot=/usr/${_triplet} \
+ --with-system-zlib
+}
+
+post_install() {
+ rm -fr ${DESTDIR}/usr/share/{info,man/man7}
+ rm -fr ${DESTDIR}/usr/lib/libcc1.*
+}
From 125a203db3c5c59b2f64b747f7363ae01b342081 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 11 Dec 2024 23:17:13 +0100
Subject: [PATCH 3/5] binutils: update to 2.43.1.
---
srcpkgs/binutils/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template
index 43a457f864c8f0..92142bb6788fda 100644
--- a/srcpkgs/binutils/template
+++ b/srcpkgs/binutils/template
@@ -1,7 +1,7 @@
# Template file for 'binutils'
pkgname=binutils
-version=2.41
-revision=3
+version=2.43.1
+revision=1
bootstrap=yes
hostmakedepends="pkgconf"
makedepends="zlib-devel libzstd-devel"
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://www.gnu.org/software/binutils/"
distfiles="${GNU_SITE}/binutils/binutils-${version}.tar.xz"
-checksum=ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
+checksum=13f74202a3c4c51118b797a39ea4200d3f6cfbe224da6d1d95bb938480132dfd
build_options="all_targets"
desc_option_all_targets="Enable all supported targets"
From cfd67de0c514cd8cce230d34ec4c33fb819d8e83 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 11 Dec 2024 23:17:41 +0100
Subject: [PATCH 4/5] New package: dtrace-utils-2.0.1.1.9999
---
srcpkgs/dtrace-utils/patches/configure.patch | 11 +++++++
srcpkgs/dtrace-utils/template | 34 ++++++++++++++++++++
2 files changed, 45 insertions(+)
create mode 100644 srcpkgs/dtrace-utils/patches/configure.patch
create mode 100644 srcpkgs/dtrace-utils/template
diff --git a/srcpkgs/dtrace-utils/patches/configure.patch b/srcpkgs/dtrace-utils/patches/configure.patch
new file mode 100644
index 00000000000000..36798d245996af
--- /dev/null
+++ b/srcpkgs/dtrace-utils/patches/configure.patch
@@ -0,0 +1,11 @@
+--- a/configure
++++ b/configure
+@@ -173,7 +173,7 @@
+ HAVE_BPFV3=*) write_config_var BPFV3 "$option";;
+ HAVE_BPFMASM=*) write_config_var BPFMASM "$option";;
+ *) echo "Unknown option $option" >&2
+- exit 1;;
++ ;;
+ esac
+ done
+
diff --git a/srcpkgs/dtrace-utils/template b/srcpkgs/dtrace-utils/template
new file mode 100644
index 00000000000000..0849445666e2b3
--- /dev/null
+++ b/srcpkgs/dtrace-utils/template
@@ -0,0 +1,34 @@
+# Template file for 'dtrace-utils'
+pkgname=dtrace-utils
+version=2.0.1.1.9999
+revision=1
+#archs="i686 x86_64"
+#build_wrksrc=
+build_style=gnu-configure
+#configure_args="HAVE_BPFMASM=no"
+make_build_args="-k"
+#make_install_args=""
+#conf_files=""
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends="clang flex libgomp-devel pkg-config shadow lld
+ cross-bpf-gcc cross-bpf-binutils"
+makedepends="binutils-devel elfutils-devel fuse-devel libpcap-devel libpfm4-devel valgrind-devel libbpf-devel"
+depends=""
+short_desc="Linux version of the DTrace tracing tool"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="UPL-1.0"
+homepage="https://github.com/oracle/dtrace-utils"
+#changelog=""
+#distfiles="https://github.com/oracle/dtrace-utils/archive/refs/tags/${version}.tar.gz"
+distfiles="https://github.com/oracle/dtrace-utils/archive/refs/heads/devel.tar.gz"
+checksum=33fa9b34510358e59e6d971cf6dab38300f5c7783f14046d6000beb5f3975cb6
+nostrip_files="bpf_dlib.o"
+
+export BPFC="bpf-gcc"
+export BPFLD="bpf-ld"
+
+post_install() {
+ rm ${DESTDIR}/usr/share/doc/dtrace-2.0.1/showUSDT
+ mv ${DESTDIR}/lib64/* ${DESTDIR}/usr/lib/
+ rmdir ${DESTDIR}/lib64
+}
From 839e6133a55b86fb84f8eb9c0d97c3620115a06c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 5 Feb 2025 12:05:32 +0100
Subject: [PATCH 5/5] dtrace-utils: update to 2.0.2.
---
srcpkgs/dtrace-utils/template | 22 +++++++---------------
1 file changed, 7 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/dtrace-utils/template b/srcpkgs/dtrace-utils/template
index 0849445666e2b3..eba754c01728c2 100644
--- a/srcpkgs/dtrace-utils/template
+++ b/srcpkgs/dtrace-utils/template
@@ -1,34 +1,26 @@
# Template file for 'dtrace-utils'
pkgname=dtrace-utils
-version=2.0.1.1.9999
+version=2.0.2
revision=1
-#archs="i686 x86_64"
-#build_wrksrc=
build_style=gnu-configure
#configure_args="HAVE_BPFMASM=no"
make_build_args="-k"
-#make_install_args=""
-#conf_files=""
-#make_dirs="/var/log/dir 0755 root root"
-hostmakedepends="clang flex libgomp-devel pkg-config shadow lld
- cross-bpf-gcc cross-bpf-binutils"
-makedepends="binutils-devel elfutils-devel fuse-devel libpcap-devel libpfm4-devel valgrind-devel libbpf-devel"
-depends=""
+hostmakedepends="cross-bpf-binutils cross-bpf-gcc flex libgomp-devel pkg-config shadow"
+makedepends="binutils-devel elfutils-devel fuse-devel libbpf-devel libpcap-devel
+ libpfm4-devel valgrind-devel"
short_desc="Linux version of the DTrace tracing tool"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="UPL-1.0"
homepage="https://github.com/oracle/dtrace-utils"
-#changelog=""
-#distfiles="https://github.com/oracle/dtrace-utils/archive/refs/tags/${version}.tar.gz"
-distfiles="https://github.com/oracle/dtrace-utils/archive/refs/heads/devel.tar.gz"
-checksum=33fa9b34510358e59e6d971cf6dab38300f5c7783f14046d6000beb5f3975cb6
+distfiles="https://github.com/oracle/dtrace-utils/archive/refs/tags/${version}.tar.gz"
+checksum=0636546b8286d67de0e41148f5c73cf8f4339f5989da3113442eb51421bc4916
nostrip_files="bpf_dlib.o"
export BPFC="bpf-gcc"
export BPFLD="bpf-ld"
post_install() {
- rm ${DESTDIR}/usr/share/doc/dtrace-2.0.1/showUSDT
+ rm ${DESTDIR}/usr/share/doc/dtrace-*/showUSDT
mv ${DESTDIR}/lib64/* ${DESTDIR}/usr/lib/
rmdir ${DESTDIR}/lib64
}
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-02-12 22:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-12-11 22:57 [PR PATCH] WIP New package: dtrace-utils-2.0.1.1.9999 leahneukirchen
2025-02-12 11:29 ` [PR PATCH] [Updated] " leahneukirchen
2025-02-12 22:28 ` leahneukirchen
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).