* [gentoo-commits] repo/gentoo:master commit in: sys-process/lsof/, sys-process/lsof/files/
@ 2018-03-27 9:00 Fabian Groffen
0 siblings, 0 replies; 3+ messages in thread
From: Fabian Groffen @ 2018-03-27 9:00 UTC (permalink / raw
To: gentoo-commits
commit: 96f1d755b39e80fc469c6a74d8d2a025307f4840
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 27 09:00:47 2018 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Mar 27 09:00:47 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96f1d755
sys-process/lsof: fix for Darwin, bug #648084
This is based on the work by jsteward in bug #648084.
Closes: https://bugs.gentoo.org/648084
Package-Manager: Portage-2.3.24, Repoman-2.3.6
sys-process/lsof/files/lsof-4.90-darwin-cppfix.patch | 12 ++++++++++++
sys-process/lsof/lsof-4.90.ebuild | 12 +++++++++++-
sys-process/lsof/lsof-4.91.ebuild | 12 +++++++++++-
3 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/sys-process/lsof/files/lsof-4.90-darwin-cppfix.patch b/sys-process/lsof/files/lsof-4.90-darwin-cppfix.patch
new file mode 100644
index 00000000000..fcbfeba410a
--- /dev/null
+++ b/sys-process/lsof/files/lsof-4.90-darwin-cppfix.patch
@@ -0,0 +1,12 @@
+diff -Naur a/dialects/darwin/libproc/dfile.c b/dialects/darwin/libproc/dfile.c
+--- a/dialects/darwin/libproc/dfile.c 2018-02-19 15:04:26.011578124 +0800
++++ b/dialects/darwin/libproc/dfile.c 2018-02-19 15:04:45.006502653 +0800
+@@ -43,7 +43,7 @@
+ #include "lsof.h"
+
+ #if defined(PROC_FP_GUARDED)
+-#extern struct pff_tab Pgf_tab[];
++extern struct pff_tab Pgf_tab[];
+ #endif /* defined(PROC_FP_GUARDED) */
+
+
diff --git a/sys-process/lsof/lsof-4.90.ebuild b/sys-process/lsof/lsof-4.90.ebuild
index f22dd0eaae8..8a1faa697af 100644
--- a/sys-process/lsof/lsof-4.90.ebuild
+++ b/sys-process/lsof/lsof-4.90.ebuild
@@ -14,7 +14,7 @@ SRC_URI="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
LICENSE="lsof"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="examples ipv6 rpc selinux static"
RDEPEND="rpc? ( net-libs/libtirpc )
@@ -26,6 +26,7 @@ S="${WORKDIR}/${MY_P}/${MY_P}_src"
PATCHES=(
"${FILESDIR}"/${PN}-4.85-cross.patch #432120
+ "${FILESDIR}"/${PN}-4.90-darwin-cppfix.patch #648084
)
src_unpack() {
@@ -66,6 +67,15 @@ src_configure() {
append-cppflags $(use rpc && $(tc-getPKG_CONFIG) libtirpc --cflags || echo "-DHASNOTRPC -DHASNORPC_H")
append-cppflags $(usex ipv6 -{D,U}HASIPv6)
[[ ${CHOST} == *-solaris2.11 ]] && append-cppflags -DHAS_PAD_MUTEX
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ # make sys/proc_info.h available in ${T} because of LSOF_INCLUDE
+ # dummy location -- Darwin needs this for a Configure check to
+ # succeed
+ if [[ -e /usr/include/sys/proc_info.h ]] ; then
+ mkdir -p "${T}"/sys || die
+ ( cd "${T}"/sys && ln -s /usr/include/sys/proc_info.h ) || die
+ fi
+ fi
export LSOF_CFGL="${CFLAGS} ${LDFLAGS} \
$(use rpc && $(tc-getPKG_CONFIG) libtirpc --libs)"
diff --git a/sys-process/lsof/lsof-4.91.ebuild b/sys-process/lsof/lsof-4.91.ebuild
index f22dd0eaae8..8a1faa697af 100644
--- a/sys-process/lsof/lsof-4.91.ebuild
+++ b/sys-process/lsof/lsof-4.91.ebuild
@@ -14,7 +14,7 @@ SRC_URI="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
LICENSE="lsof"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="examples ipv6 rpc selinux static"
RDEPEND="rpc? ( net-libs/libtirpc )
@@ -26,6 +26,7 @@ S="${WORKDIR}/${MY_P}/${MY_P}_src"
PATCHES=(
"${FILESDIR}"/${PN}-4.85-cross.patch #432120
+ "${FILESDIR}"/${PN}-4.90-darwin-cppfix.patch #648084
)
src_unpack() {
@@ -66,6 +67,15 @@ src_configure() {
append-cppflags $(use rpc && $(tc-getPKG_CONFIG) libtirpc --cflags || echo "-DHASNOTRPC -DHASNORPC_H")
append-cppflags $(usex ipv6 -{D,U}HASIPv6)
[[ ${CHOST} == *-solaris2.11 ]] && append-cppflags -DHAS_PAD_MUTEX
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ # make sys/proc_info.h available in ${T} because of LSOF_INCLUDE
+ # dummy location -- Darwin needs this for a Configure check to
+ # succeed
+ if [[ -e /usr/include/sys/proc_info.h ]] ; then
+ mkdir -p "${T}"/sys || die
+ ( cd "${T}"/sys && ln -s /usr/include/sys/proc_info.h ) || die
+ fi
+ fi
export LSOF_CFGL="${CFLAGS} ${LDFLAGS} \
$(use rpc && $(tc-getPKG_CONFIG) libtirpc --libs)"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/lsof/, sys-process/lsof/files/
@ 2022-12-26 8:35 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-12-26 8:35 UTC (permalink / raw
To: gentoo-commits
commit: 19b4c55cf2ad7c4387b3624a7b337f47ab0bac75
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 26 08:31:51 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 26 08:33:07 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19b4c55c
sys-process/lsof: drop 4.95.0
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-process/lsof/Manifest | 1 -
sys-process/lsof/files/lsof-4.95.0-test-typo.patch | 25 -----
sys-process/lsof/lsof-4.95.0.ebuild | 115 ---------------------
3 files changed, 141 deletions(-)
diff --git a/sys-process/lsof/Manifest b/sys-process/lsof/Manifest
index fbab9a3c28dc..f2a14ca41f5b 100644
--- a/sys-process/lsof/Manifest
+++ b/sys-process/lsof/Manifest
@@ -1,3 +1,2 @@
-DIST lsof-4.95.0.tar.gz 1343380 BLAKE2B ffb0a656463f8f0e84ddcba36d78a94a8b4b883f0ff043c3821b3236274fb11e04b8c82f84f4e67ab922f021769c2711c1e97716aef3190d640fc321110521a3 SHA512 09c5c4b0ea0530e23b98b96df8485f37c2594028b604097a816aee216a8b1a7bc887071e8727cbaf3c765d0992314a5aa49723572cfe926f88806be18a6b8aef
DIST lsof-4.96.3.tar.gz 1342843 BLAKE2B 79e276d0db5138c356cc8bfa32e6f991ce8860644eb5d02f49ba04ce08076232f0fb8b10e143ee135205de5c64bd053d7bf021e48d666b65ffc01c0a47b76116 SHA512 ad17a73590ffb154a13b8b5de8ada738ce343fcc833012b2a5e9b3bda587785b09ae8bf090a99fba8e84b788c2a6d61eaa7359f939bfa68d2423e604801e2a98
DIST lsof-4.96.4.tar.gz 1342514 BLAKE2B c420e2f928ffa8148a62298ba7176f860b15f9e78f4c2dc299162614a1d9b94a85c42ee93ef5e92b8a99f1c67e496cf2c848874b844c22c287aab53bfe211c58 SHA512 06f8005e1eb72324c1fd603d8b8287a61ad6fdec182e9da833991a8915aaa69c416af1564d3b1087cb08b3504ef9b15cdffec7051605e89d945d6750ec8da985
diff --git a/sys-process/lsof/files/lsof-4.95.0-test-typo.patch b/sys-process/lsof/files/lsof-4.95.0-test-typo.patch
deleted file mode 100644
index f35b71e749fa..000000000000
--- a/sys-process/lsof/files/lsof-4.95.0-test-typo.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://github.com/lsof-org/lsof/commit/60e292652879a45ecaa20987e755e218c1396311
-
-From 60e292652879a45ecaa20987e755e218c1396311 Mon Sep 17 00:00:00 2001
-From: Masatake YAMATO <yamato@redhat.com>
-Date: Thu, 28 Apr 2022 08:03:02 +0900
-Subject: [PATCH] [linux] test case: fix a typo
-
-Signed-off-by: Masatake YAMATO <yamato@redhat.com>
----
- dialects/linux/tests/case-10-ux-socket-state.bash | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dialects/linux/tests/case-10-ux-socket-state.bash b/dialects/linux/tests/case-10-ux-socket-state.bash
-index 2c080d6..d58826e 100755
---- a/dialects/linux/tests/case-10-ux-socket-state.bash
-+++ b/dialects/linux/tests/case-10-ux-socket-state.bash
-@@ -4,7 +4,7 @@ name=$(basename $0 .bash)
- lsof=$1
- report=$2
-
--if ! [ -r "/proc/$self/stack" ]; then
-+if ! [ -r "/proc/self/stack" ]; then
- echo "this platform doesn't allow to access /proc/\$PID/stack" >> $report
- exit 2
- fi
diff --git a/sys-process/lsof/lsof-4.95.0.ebuild b/sys-process/lsof/lsof-4.95.0.ebuild
deleted file mode 100644
index 763ba627605c..000000000000
--- a/sys-process/lsof/lsof-4.95.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-MY_P="${P/-/_}"
-DESCRIPTION="Lists open files for running Unix processes"
-HOMEPAGE="https://github.com/lsof-org/lsof"
-SRC_URI="https://github.com/lsof-org/lsof/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="lsof"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples ipv6 rpc selinux"
-
-RDEPEND="rpc? ( net-libs/libtirpc )
- selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-apps/groff
- rpc? ( virtual/pkgconfig )"
-
-# Needs fixing first
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.85-cross.patch # bug #432120
- "${FILESDIR}"/${P}-test-typo.patch
-)
-
-src_prepare() {
- default
- # fix POSIX compliance with `echo`
- sed -i \
- -e 's:echo -n:printf:' \
- AFSConfig Configure Customize Inventory tests/CkTestDB || die
- # Convert `test -r header.h` into a compile test.
- # Make sure we convert `test ... -a ...` into two `test` commands
- # so we can then convert both over into a compile test. #601432
- sed -i -E \
- -e '/if test .* -a /s: -a : \&\& test :g' \
- -e '/test -r/s:test -r \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\1>" | ${LSOF_CC} ${LSOF_CFGF} -E - >/dev/null 2>\&1:g' \
- -e 's:grep (.*) \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\2>" | ${LSOF_CC} ${LSOF_CFGF} -E -P -dD - 2>/dev/null | grep \1:' \
- Configure || die
-
- # "create" man-page (bug #689462)
- # inspired by shipped "makeman" ksh script
- soelim < Lsof.8 > lsof.8 || die
-}
-
-target() {
- case ${CHOST} in
- *-darwin*) echo darwin ;;
- *-freebsd*) echo freebsd ;;
- *-solaris*) echo solaris ;;
- *-aix*) echo aixgcc ;;
- *) echo linux ;;
- esac
-}
-
-src_configure() {
- append-cppflags $(use rpc && $(tc-getPKG_CONFIG) libtirpc --cflags || echo "-DHASNOTRPC -DHASNORPC_H")
- append-cppflags $(usex ipv6 -{D,U}HASIPv6)
- [[ ${CHOST} == *-solaris2.11 ]] && append-cppflags -DHAS_PAD_MUTEX
- if [[ ${CHOST} == *-darwin* ]] ; then
- # make sys/proc_info.h available in ${T} because of LSOF_INCLUDE
- # dummy location -- Darwin needs this for a Configure check to
- # succeed
- if [[ -e /usr/include/sys/proc_info.h ]] ; then
- mkdir -p "${T}"/sys || die
- ( cd "${T}"/sys && ln -s /usr/include/sys/proc_info.h ) || die
- fi
- fi
-
- export LSOF_CFGL="${CFLAGS} ${LDFLAGS} \
- $(use rpc && $(tc-getPKG_CONFIG) libtirpc --libs)"
-
- # Set LSOF_INCLUDE to a dummy location so the script doesn't poke
- # around in it and mix /usr/include paths with cross-compile/etc.
- touch .neverInv
- LINUX_HASSELINUX=$(usex selinux y n) \
- LSOF_INCLUDE=${T} \
- LSOF_CC=$(tc-getCC) \
- LSOF_AR="$(tc-getAR) rc" \
- LSOF_RANLIB=$(tc-getRANLIB) \
- LSOF_CFGF="${CFLAGS} ${CPPFLAGS}" \
- ./Configure -n $(target) || die
-}
-
-src_compile() {
- emake DEBUG="" all
-}
-
-src_install() {
- dobin lsof
-
- if use examples ; then
- insinto /usr/share/lsof/scripts
- doins scripts/*
- fi
-
- doman lsof.8
- dodoc 00*
-}
-
-pkg_postinst() {
- if [[ ${CHOST} == *-solaris* ]] ; then
- einfo "Note: to use lsof on Solaris you need read permissions on"
- einfo "/dev/kmem, i.e. you need to be root, or to be in the group sys"
- elif [[ ${CHOST} == *-aix* ]] ; then
- einfo "Note: to use lsof on AIX you need read permissions on /dev/mem and"
- einfo "/dev/kmem, i.e. you need to be root, or to be in the group system"
- fi
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-process/lsof/, sys-process/lsof/files/
@ 2024-01-04 0:07 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2024-01-04 0:07 UTC (permalink / raw
To: gentoo-commits
commit: 4682a1f615e7eacf6242767c7e6a663614359e3c
Author: Sv. Lockal <lockalsash <AT> gmail <DOT> com>
AuthorDate: Mon Dec 25 16:55:23 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 4 00:06:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4682a1f6
sys-process/lsof: fix compilation with clang when hip runtime is installed
Closes: https://bugs.gentoo.org/919253
Signed-off-by: Sv. Lockal <lockalsash <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34471
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../lsof/files/lsof-4.98.0-fix-clang-version-parser.patch | 15 +++++++++++++++
sys-process/lsof/lsof-4.98.0-r1.ebuild | 10 +++++++++-
sys-process/lsof/lsof-4.99.0.ebuild | 13 +++++++++++++
sys-process/lsof/lsof-4.99.3.ebuild | 13 +++++++++++++
4 files changed, 50 insertions(+), 1 deletion(-)
diff --git a/sys-process/lsof/files/lsof-4.98.0-fix-clang-version-parser.patch b/sys-process/lsof/files/lsof-4.98.0-fix-clang-version-parser.patch
new file mode 100644
index 000000000000..ebb5d85d2e5d
--- /dev/null
+++ b/sys-process/lsof/files/lsof-4.98.0-fix-clang-version-parser.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/919253
+https://github.com/lsof-org/lsof/issues/305
+
+Ignore HIP or CUDA versions in clang, when checking for compiler version
+--- a/configure.ac
++++ b/configure.ac
+@@ -410,7 +410,7 @@ AC_CONFIG_FILES([Makefile])
+
+ # Pass build configurations to version.h.in
+ AC_SUBST(cc, $CC)
+-AC_SUBST(ccv, $($CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'))
++AC_SUBST(ccv, $($CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p;q'))
+ AC_SUBST(ccflags, $CFLAGS)
+ AC_SUBST(ldflags, "$LDFLAGS$LIBS")
+ # Reproducible build
diff --git a/sys-process/lsof/lsof-4.98.0-r1.ebuild b/sys-process/lsof/lsof-4.98.0-r1.ebuild
index 77f81e741013..715ef0c9a4c3 100644
--- a/sys-process/lsof/lsof-4.98.0-r1.ebuild
+++ b/sys-process/lsof/lsof-4.98.0-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit flag-o-matic
+inherit autotools flag-o-matic
MY_P="${P/-/_}"
DESCRIPTION="Lists open files for running Unix processes"
@@ -30,8 +30,16 @@ RESTRICT="test"
PATCHES=(
"${FILESDIR}"/${P}-fix-common-include-strftime.patch
+ "${FILESDIR}"/${PN}-4.98.0-fix-clang-version-parser.patch
)
+# TODO: drop this block, "inherit autotools" and clang-version-parser patch after 4.99.3
+# https://github.com/lsof-org/lsof/pull/306
+src_prepare() {
+ default
+ eautoreconf
+}
+
src_configure() {
# TODO: drop after 4.98.0: https://github.com/lsof-org/lsof/commit/4fbe0b78f63ce115f25cf7a49756745e3bf47fea
export ac_cv_header_selinux_selinux_h=$(usex selinux)
diff --git a/sys-process/lsof/lsof-4.99.0.ebuild b/sys-process/lsof/lsof-4.99.0.ebuild
index d1dba0173182..e77a7a93b7e9 100644
--- a/sys-process/lsof/lsof-4.99.0.ebuild
+++ b/sys-process/lsof/lsof-4.99.0.ebuild
@@ -3,6 +3,8 @@
EAPI=8
+inherit autotools
+
MY_P="${P/-/_}"
DESCRIPTION="Lists open files for running Unix processes"
HOMEPAGE="https://github.com/lsof-org/lsof"
@@ -26,6 +28,17 @@ BDEPEND="
# Needs fixing first for sandbox
RESTRICT="test"
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.98.0-fix-clang-version-parser.patch
+)
+
+# TODO: drop this block, "inherit autotools" and clang-version-parser patch after 4.99.3
+# https://github.com/lsof-org/lsof/pull/306
+src_prepare() {
+ default
+ eautoreconf
+}
+
src_configure() {
local myeconfargs=(
$(use_with rpc libtirpc)
diff --git a/sys-process/lsof/lsof-4.99.3.ebuild b/sys-process/lsof/lsof-4.99.3.ebuild
index c22f1df517e3..591b4742d2de 100644
--- a/sys-process/lsof/lsof-4.99.3.ebuild
+++ b/sys-process/lsof/lsof-4.99.3.ebuild
@@ -3,6 +3,8 @@
EAPI=8
+inherit autotools
+
MY_P="${P/-/_}"
DESCRIPTION="Lists open files for running Unix processes"
HOMEPAGE="https://github.com/lsof-org/lsof"
@@ -26,6 +28,17 @@ BDEPEND="
# Needs fixing first for sandbox
RESTRICT="test"
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.98.0-fix-clang-version-parser.patch
+)
+
+# TODO: drop this block, "inherit autotools" and clang-version-parser patch after 4.99.3
+# https://github.com/lsof-org/lsof/pull/306
+src_prepare() {
+ default
+ eautoreconf
+}
+
src_configure() {
local myeconfargs=(
$(use_with rpc libtirpc)
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-01-04 0:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-26 8:35 [gentoo-commits] repo/gentoo:master commit in: sys-process/lsof/, sys-process/lsof/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-01-04 0:07 Sam James
2018-03-27 9:00 Fabian Groffen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox