Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] preload: generate manpage when not cross
@ 2023-05-23  7:51 RunningDroid
  2023-05-23 19:55 ` classabbyamp
                   ` (12 more replies)
  0 siblings, 13 replies; 14+ messages in thread
From: RunningDroid @ 2023-05-23  7:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1723 bytes --]

There is a new pull request by RunningDroid against master on the void-packages repository

https://github.com/RunningDroid/void-packages fix_preload_manpage
https://github.com/void-linux/void-packages/pull/44038

preload: generate manpage when not cross
If `help2man` isn't available at build time then the contents of man8/preload.8 are 

> help2man is required to generate this file.

 Apparently `makewhatis` has to run after the new file is installed so `man` knows to run the file through the formatter but I'd rather not add a post-install script.

This also adds psmisc to checkdepends because the test script uses `( sleep 1; killall ./preload 2>/dev/null ) &` to ensure the test ends.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **yes**

<!--
#### 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/44038.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix_preload_manpage-44038.patch --]
[-- Type: text/x-diff, Size: 1563 bytes --]

From a0e6820b06bc029a9e07e4013da6d0d6094744b6 Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Tue, 23 May 2023 03:15:55 -0400
Subject: [PATCH] preload: generate manpage when not cross

this also adds psmisc to checkdepends
(the test script uses killall to end the tests)
---
 srcpkgs/preload/template | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/preload/template b/srcpkgs/preload/template
index 9623aed0e6eb..51c0f703fade 100644
--- a/srcpkgs/preload/template
+++ b/srcpkgs/preload/template
@@ -1,10 +1,11 @@
 # Template file for 'preload'
 pkgname=preload
 version=0.6.4
-revision=11
+revision=12
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libglib-devel"
+checkdepends="psmisc"
 short_desc="Adaptive readahead daemon"
 maintainer="bougyman <bougyman@voidlinux.org>"
 license="GPL-2.0-or-later"
@@ -13,6 +14,10 @@ distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=d0a558e83cb29a51d9d96736ef39f4b4e55e43a589ad1aec594a048ca22f816b
 disable_parallel_build=yes
 
+if [ -z "$CROSS_BUILD" ]; then
+	hostmakedepends+=" help2man"
+fi
+
 conf_files="/etc/preload.conf"
 
 make_dirs="
@@ -23,5 +28,10 @@ post_install() {
 	rm -rf ${DESTDIR}/etc/logrotate.d
 	rm -rf ${DESTDIR}/etc/sysconfig
 	rm -rf ${DESTDIR}/var/log
+	if [ -n "$CROSS_BUILD" ]; then
+		# if help2man isn't available at build time this file contains
+		# "help2man is required to generate this file."
+		rm "${DESTDIR}/usr/share/man/man8/preload.8.gz"
+	fi
 	vsv preload
 }

^ permalink raw reply	[flat|nested] 14+ messages in thread
end of thread, other threads:[~2023-06-27  8:10 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-23  7:51 [PR PATCH] preload: generate manpage when not cross RunningDroid
2023-05-23 19:55 ` classabbyamp
2023-05-27 23:34 ` [PR PATCH] [Updated] " RunningDroid
2023-05-27 23:38 ` RunningDroid
2023-05-27 23:41 ` RunningDroid
2023-05-27 23:44 ` classabbyamp
2023-05-28  1:05 ` RunningDroid
2023-05-31  2:07 ` [PR PATCH] [Updated] " RunningDroid
2023-05-31  2:08 ` RunningDroid
2023-05-31  2:08 ` RunningDroid
2023-05-31  2:18 ` RunningDroid
2023-05-31  2:25 ` [PR PATCH] [Updated] " RunningDroid
2023-05-31  2:26 ` RunningDroid
2023-06-27  8:10 ` [PR PATCH] [Merged]: " classabbyamp

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).