Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] (help needed) New package: sbcl-doc-2.1.11
@ 2021-12-28  9:48 HiPhish
  2021-12-28 14:09 ` [PR PATCH] [Updated] " HiPhish
                   ` (16 more replies)
  0 siblings, 17 replies; 18+ messages in thread
From: HiPhish @ 2021-12-28  9:48 UTC (permalink / raw)
  To: ml

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

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

https://github.com/HiPhish/void-packages sbcl-doc
https://github.com/void-linux/void-packages/pull/34730

(help needed) New package: sbcl-doc-2.1.11
Add the GNU Info manual for SBCL and its accompanying ASDF manual.

This package has an issue: it will install the manual with the `sbcl` package as well. This is due to the fact that the `do_install` function of the `sbcl` package runs `install.sh`, which will install the manual if it is available. There does not seem to be a way of suppressing that behaviour.

I tried to define a custom `do_build` function inside the subpackage, but it appears that it is not being run: 

```sh
sbcl-doc_package() {
	short_desc+=" - documentation"
	do_build() {
		(cd ./doc/manual; make info)
	}
	pkg_install() {
		vmkdir 'usr/share/info'
		vcopy "doc/manual/*.info*" 'usr/share/info'
	}
}
```

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

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**

A patch file from https://github.com/void-linux/void-packages/pull/34730.patch is attached

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

From d7111026edf599a2ef508400a1aa2718f5b07d1f Mon Sep 17 00:00:00 2001
From: HiPhish <hiphish@posteo.de>
Date: Tue, 28 Dec 2021 10:15:29 +0100
Subject: [PATCH] New package: sbcl-doc-2.1.11

Add the GNU Info manual for SBCL and its accompanying ASDF manual.
---
 srcpkgs/sbcl-doc      |  1 +
 srcpkgs/sbcl/template | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/sbcl-doc

diff --git a/srcpkgs/sbcl-doc b/srcpkgs/sbcl-doc
new file mode 120000
index 000000000000..d6eeb2634b04
--- /dev/null
+++ b/srcpkgs/sbcl-doc
@@ -0,0 +1 @@
+sbcl
\ No newline at end of file
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 524d66eb8d05..223cfcd1b628 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -3,7 +3,7 @@ pkgname=sbcl
 version=2.1.11
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
-hostmakedepends="iana-etc"
+hostmakedepends="iana-etc texinfo"
 makedepends="zlib-devel"
 conf_files="/etc/sbclrc"
 short_desc="Steel Bank Common Lisp"
@@ -46,6 +46,7 @@ do_build() {
 	bash make.sh \
 		"$_bootstrap_lisp" \
 		--without-sb-test --with-sb-core-compression --prefix=/usr
+	(cd ./doc/manual; make info)
 }
 
 do_install() {
@@ -64,3 +65,11 @@ sbcl-source_package() {
 		vcopy src usr/lib/sbcl
 	}
 }
+
+sbcl-doc_package() {
+	short_desc+=" - documentation"
+	pkg_install() {
+		vmkdir 'usr/share/info'
+		vcopy "doc/manual/*.info*" 'usr/share/info'
+	}
+}

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] (help needed) New package: sbcl-doc-2.1.11
  2021-12-28  9:48 [PR PATCH] (help needed) New package: sbcl-doc-2.1.11 HiPhish
@ 2021-12-28 14:09 ` HiPhish
  2021-12-28 14:13 ` HiPhish
                   ` (15 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: HiPhish @ 2021-12-28 14:09 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by HiPhish against master on the void-packages repository

https://github.com/HiPhish/void-packages sbcl-doc
https://github.com/void-linux/void-packages/pull/34730

(help needed) New package: sbcl-doc-2.1.11
Add the GNU Info manual for SBCL and its accompanying ASDF manual.

This package has an issue: it will install the manual with the `sbcl` package as well. This is due to the fact that the `do_install` function of the `sbcl` package runs `install.sh`, which will install the manual if it is available. There does not seem to be a way of suppressing that behaviour.

I tried to define a custom `do_build` function inside the subpackage, but it appears that it is not being run: 

```sh
sbcl-doc_package() {
	short_desc+=" - documentation"
	do_build() {
		(cd ./doc/manual; make info)
	}
	pkg_install() {
		vmkdir 'usr/share/info'
		vcopy "doc/manual/*.info*" 'usr/share/info'
	}
}
```

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

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**

A patch file from https://github.com/void-linux/void-packages/pull/34730.patch is attached

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

From f2690aa13a9ed8d4c4a6fa920773c9e51f01d0a9 Mon Sep 17 00:00:00 2001
From: HiPhish <hiphish@posteo.de>
Date: Tue, 28 Dec 2021 10:15:29 +0100
Subject: [PATCH] New package: sbcl-doc-2.1.11

Add the GNU Info manual for SBCL and its accompanying ASDF manual.
---
 srcpkgs/sbcl-doc      |  1 +
 srcpkgs/sbcl/template | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/sbcl-doc

diff --git a/srcpkgs/sbcl-doc b/srcpkgs/sbcl-doc
new file mode 120000
index 000000000000..d6eeb2634b04
--- /dev/null
+++ b/srcpkgs/sbcl-doc
@@ -0,0 +1 @@
+sbcl
\ No newline at end of file
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 524d66eb8d05..5447201fb938 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -3,7 +3,7 @@ pkgname=sbcl
 version=2.1.11
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
-hostmakedepends="iana-etc"
+hostmakedepends="iana-etc texinfo"
 makedepends="zlib-devel"
 conf_files="/etc/sbclrc"
 short_desc="Steel Bank Common Lisp"
@@ -46,6 +46,13 @@ do_build() {
 	bash make.sh \
 		"$_bootstrap_lisp" \
 		--without-sb-test --with-sb-core-compression --prefix=/usr
+	(cd ./doc/manual; make info)
+	# Move built manual files into other directory so they won't get installed
+	# in the main package
+	mkdir -p doc/manual/info
+	for info in doc/manual/*.info*; do
+		mv $info doc/manual/info/
+	done
 }
 
 do_install() {
@@ -64,3 +71,11 @@ sbcl-source_package() {
 		vcopy src usr/lib/sbcl
 	}
 }
+
+sbcl-doc_package() {
+	short_desc+=" - documentation"
+	pkg_install() {
+		vmkdir 'usr/share/info'
+		vcopy "doc/manual/info/*.info*" "usr/share/info"
+	}
+}

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: (help needed) New package: sbcl-doc-2.1.11
  2021-12-28  9:48 [PR PATCH] (help needed) New package: sbcl-doc-2.1.11 HiPhish
  2021-12-28 14:09 ` [PR PATCH] [Updated] " HiPhish
@ 2021-12-28 14:13 ` HiPhish
  2021-12-28 20:35 ` Chocimier
                   ` (14 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: HiPhish @ 2021-12-28 14:13 UTC (permalink / raw)
  To: ml

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

New comment by HiPhish on void-packages repository

https://github.com/void-linux/void-packages/pull/34730#issuecomment-1002125622

Comment:
I think I have solved the issue, at least in a hacky way. Everything (including manuals) gets built, but then I move all the Info manual files into a separate directory. That way they won't get picked up by the installer script. In the `sbcl-doc` subpackage I manually copy the Info files over from the custom directory instead. If anyone has a better idea let me know, but that's the least hacky way I could think of. One downside though: the Info files do not get compressed automatically by XBPS.

Alternatively we could just ship the manual as part of the main package, that would be one like of code in the build function.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: New package: sbcl-doc-2.1.11
  2021-12-28  9:48 [PR PATCH] (help needed) New package: sbcl-doc-2.1.11 HiPhish
  2021-12-28 14:09 ` [PR PATCH] [Updated] " HiPhish
  2021-12-28 14:13 ` HiPhish
@ 2021-12-28 20:35 ` Chocimier
  2021-12-28 20:36 ` Chocimier
                   ` (13 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: Chocimier @ 2021-12-28 20:35 UTC (permalink / raw)
  To: ml

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

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/34730#issuecomment-1002272315

Comment:
> it will install the manual with the sbcl package as well

That's how things are supposed to work. First everything is installed into fake destdir, then files are `vmove`'d into subpackages. Remaining files form contents of main package.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: New package: sbcl-doc-2.1.11
  2021-12-28  9:48 [PR PATCH] (help needed) New package: sbcl-doc-2.1.11 HiPhish
                   ` (2 preceding siblings ...)
  2021-12-28 20:35 ` Chocimier
@ 2021-12-28 20:36 ` Chocimier
  2021-12-28 23:01 ` [PR PATCH] [Updated] " HiPhish
                   ` (12 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: Chocimier @ 2021-12-28 20:36 UTC (permalink / raw)
  To: ml

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

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/34730#issuecomment-1002272556

Comment:
You need to increase revision, otherwise builders won't build this.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] New package: sbcl-doc-2.1.11
  2021-12-28  9:48 [PR PATCH] (help needed) New package: sbcl-doc-2.1.11 HiPhish
                   ` (3 preceding siblings ...)
  2021-12-28 20:36 ` Chocimier
@ 2021-12-28 23:01 ` HiPhish
  2021-12-28 23:13 ` HiPhish
                   ` (11 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: HiPhish @ 2021-12-28 23:01 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by HiPhish against master on the void-packages repository

https://github.com/HiPhish/void-packages sbcl-doc
https://github.com/void-linux/void-packages/pull/34730

New package: sbcl-doc-2.1.11
Add the GNU Info manual for SBCL and its accompanying ASDF manual.

This package has an issue: it will install the manual with the `sbcl` package as well. This is due to the fact that the `do_install` function of the `sbcl` package runs `install.sh`, which will install the manual if it is available. There does not seem to be a way of suppressing that behaviour.

I tried to define a custom `do_build` function inside the subpackage, but it appears that it is not being run: 

```sh
sbcl-doc_package() {
	short_desc+=" - documentation"
	do_build() {
		(cd ./doc/manual; make info)
	}
	pkg_install() {
		vmkdir 'usr/share/info'
		vcopy "doc/manual/*.info*" 'usr/share/info'
	}
}
```

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

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**

A patch file from https://github.com/void-linux/void-packages/pull/34730.patch is attached

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

From 63666441353ad73cf1809ce937f83b0ed9c24f9b Mon Sep 17 00:00:00 2001
From: HiPhish <hiphish@posteo.de>
Date: Tue, 28 Dec 2021 10:15:29 +0100
Subject: [PATCH] New package: sbcl-doc-2.1.11

Add the GNU Info manual for SBCL and its accompanying ASDF manual.
---
 srcpkgs/sbcl-doc      |  1 +
 srcpkgs/sbcl/template | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/sbcl-doc

diff --git a/srcpkgs/sbcl-doc b/srcpkgs/sbcl-doc
new file mode 120000
index 000000000000..d6eeb2634b04
--- /dev/null
+++ b/srcpkgs/sbcl-doc
@@ -0,0 +1 @@
+sbcl
\ No newline at end of file
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 524d66eb8d05..58003d68d69c 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,9 +1,9 @@
 # Template file for 'sbcl'
 pkgname=sbcl
 version=2.1.11
-revision=1
+revision=2
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
-hostmakedepends="iana-etc"
+hostmakedepends="iana-etc texinfo"
 makedepends="zlib-devel"
 conf_files="/etc/sbclrc"
 short_desc="Steel Bank Common Lisp"
@@ -46,6 +46,7 @@ do_build() {
 	bash make.sh \
 		"$_bootstrap_lisp" \
 		--without-sb-test --with-sb-core-compression --prefix=/usr
+	(cd ./doc/manual; make info)
 }
 
 do_install() {
@@ -64,3 +65,12 @@ sbcl-source_package() {
 		vcopy src usr/lib/sbcl
 	}
 }
+
+sbcl-doc_package() {
+	short_desc+=" - documentation"
+	pkg_install() {
+		mkdir -p 'usr/share/info'
+		mv doc/manual/*.info* usr/share/info/
+		vmove usr/share/info/*
+	}
+}

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: New package: sbcl-doc-2.1.11
  2021-12-28  9:48 [PR PATCH] (help needed) New package: sbcl-doc-2.1.11 HiPhish
                   ` (4 preceding siblings ...)
  2021-12-28 23:01 ` [PR PATCH] [Updated] " HiPhish
@ 2021-12-28 23:13 ` HiPhish
  2021-12-29 23:49 ` Chocimier
                   ` (10 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: HiPhish @ 2021-12-28 23:13 UTC (permalink / raw)
  To: ml

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

New comment by HiPhish on void-packages repository

https://github.com/void-linux/void-packages/pull/34730#issuecomment-1002317168

Comment:
> You need to increase revision, otherwise builders won't build this.

Done.

> That's how things are supposed to work. First everything is installed into fake destdir, then files are `vmove`'d into subpackages. Remaining files form contents of main package.

Thank you, that makes things quite a lot easier. So if I understand correctly, things are run in this order: first the main package is built (`do_build`), then the sub-packages are packaged (`pkg_install`), then whatever is left is packaged as the main package (`do_install`)? That's quite confusing.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: New package: sbcl-doc-2.1.11
  2021-12-28  9:48 [PR PATCH] (help needed) New package: sbcl-doc-2.1.11 HiPhish
                   ` (5 preceding siblings ...)
  2021-12-28 23:13 ` HiPhish
@ 2021-12-29 23:49 ` Chocimier
  2021-12-30 12:04 ` [PR PATCH] [Updated] " HiPhish
                   ` (9 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: Chocimier @ 2021-12-29 23:49 UTC (permalink / raw)
  To: ml

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

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/34730#issuecomment-1002816187

Comment:
1. `do_build` is run.
2. `do_install` is run. This should call `make install` or equivalent (good defaults provided by xbps-src). As result, files for main package and subpackages should be (temporally) installed into common destdir.
3. `pkg_install` of subpackages are run. They move files from common destdir to subpackage's destdir.
4. Non-configurable `do_pkg` is run. This compresses files taken apart into subpackage archive, and files not taken apart from common destdir into main package archive.

That means `vmove usr/share/info` is enough, because do_install already prepared files there.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] New package: sbcl-doc-2.1.11
  2021-12-28  9:48 [PR PATCH] (help needed) New package: sbcl-doc-2.1.11 HiPhish
                   ` (6 preceding siblings ...)
  2021-12-29 23:49 ` Chocimier
@ 2021-12-30 12:04 ` HiPhish
  2021-12-30 12:06 ` HiPhish
                   ` (8 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: HiPhish @ 2021-12-30 12:04 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by HiPhish against master on the void-packages repository

https://github.com/HiPhish/void-packages sbcl-doc
https://github.com/void-linux/void-packages/pull/34730

New package: sbcl-doc-2.1.11
Add the GNU Info manual for SBCL and its accompanying ASDF manual.

This package has an issue: it will install the manual with the `sbcl` package as well. This is due to the fact that the `do_install` function of the `sbcl` package runs `install.sh`, which will install the manual if it is available. There does not seem to be a way of suppressing that behaviour.

I tried to define a custom `do_build` function inside the subpackage, but it appears that it is not being run: 

```sh
sbcl-doc_package() {
	short_desc+=" - documentation"
	do_build() {
		(cd ./doc/manual; make info)
	}
	pkg_install() {
		vmkdir 'usr/share/info'
		vcopy "doc/manual/*.info*" 'usr/share/info'
	}
}
```

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

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**

A patch file from https://github.com/void-linux/void-packages/pull/34730.patch is attached

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

From ab2eb6dbd6f2c7ffb65347affbb9a35796097ada Mon Sep 17 00:00:00 2001
From: HiPhish <hiphish@posteo.de>
Date: Tue, 28 Dec 2021 10:15:29 +0100
Subject: [PATCH] New package: sbcl-doc-2.1.11

Add the GNU Info manual for SBCL and its accompanying ASDF manual.
---
 srcpkgs/sbcl-doc      |  1 +
 srcpkgs/sbcl/template | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/sbcl-doc

diff --git a/srcpkgs/sbcl-doc b/srcpkgs/sbcl-doc
new file mode 120000
index 000000000000..d6eeb2634b04
--- /dev/null
+++ b/srcpkgs/sbcl-doc
@@ -0,0 +1 @@
+sbcl
\ No newline at end of file
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 524d66eb8d05..b7bedd980057 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,9 +1,9 @@
 # Template file for 'sbcl'
 pkgname=sbcl
 version=2.1.11
-revision=1
+revision=2
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
-hostmakedepends="iana-etc"
+hostmakedepends="iana-etc texinfo"
 makedepends="zlib-devel"
 conf_files="/etc/sbclrc"
 short_desc="Steel Bank Common Lisp"
@@ -46,6 +46,7 @@ do_build() {
 	bash make.sh \
 		"$_bootstrap_lisp" \
 		--without-sb-test --with-sb-core-compression --prefix=/usr
+	(cd ./doc/manual; make info)
 }
 
 do_install() {
@@ -64,3 +65,10 @@ sbcl-source_package() {
 		vcopy src usr/lib/sbcl
 	}
 }
+
+sbcl-doc_package() {
+	short_desc+=" - documentation"
+	pkg_install() {
+		vmove usr/share/info/*
+	}
+}

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: New package: sbcl-doc-2.1.11
  2021-12-28  9:48 [PR PATCH] (help needed) New package: sbcl-doc-2.1.11 HiPhish
                   ` (7 preceding siblings ...)
  2021-12-30 12:04 ` [PR PATCH] [Updated] " HiPhish
@ 2021-12-30 12:06 ` HiPhish
  2021-12-30 14:08 ` leahneukirchen
                   ` (7 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: HiPhish @ 2021-12-30 12:06 UTC (permalink / raw)
  To: ml

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

New comment by HiPhish on void-packages repository

https://github.com/void-linux/void-packages/pull/34730#issuecomment-1003000923

Comment:
Got it, now it makes perfect sense and it's much simpler than I would have thought.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: New package: sbcl-doc-2.1.11
  2021-12-28  9:48 [PR PATCH] (help needed) New package: sbcl-doc-2.1.11 HiPhish
                   ` (8 preceding siblings ...)
  2021-12-30 12:06 ` HiPhish
@ 2021-12-30 14:08 ` leahneukirchen
  2021-12-30 14:09 ` leahneukirchen
                   ` (6 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: leahneukirchen @ 2021-12-30 14:08 UTC (permalink / raw)
  To: ml

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

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/34730#issuecomment-1003045665

Comment:
Let's keep the docs in the main package, they are small enough.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: New package: sbcl-doc-2.1.11
  2021-12-28  9:48 [PR PATCH] (help needed) New package: sbcl-doc-2.1.11 HiPhish
                   ` (9 preceding siblings ...)
  2021-12-30 14:08 ` leahneukirchen
@ 2021-12-30 14:09 ` leahneukirchen
  2021-12-30 15:44 ` [PR PATCH] [Updated] " HiPhish
                   ` (5 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: leahneukirchen @ 2021-12-30 14:09 UTC (permalink / raw)
  To: ml

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

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/34730#issuecomment-1003045884

Comment:
also `make -C doc/manual info` saves the cd call.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] New package: sbcl-doc-2.1.11
  2021-12-28  9:48 [PR PATCH] (help needed) New package: sbcl-doc-2.1.11 HiPhish
                   ` (10 preceding siblings ...)
  2021-12-30 14:09 ` leahneukirchen
@ 2021-12-30 15:44 ` HiPhish
  2021-12-30 15:45 ` HiPhish
                   ` (4 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: HiPhish @ 2021-12-30 15:44 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by HiPhish against master on the void-packages repository

https://github.com/HiPhish/void-packages sbcl-doc
https://github.com/void-linux/void-packages/pull/34730

New package: sbcl-doc-2.1.11
Add the GNU Info manual for SBCL and its accompanying ASDF manual.

This package has an issue: it will install the manual with the `sbcl` package as well. This is due to the fact that the `do_install` function of the `sbcl` package runs `install.sh`, which will install the manual if it is available. There does not seem to be a way of suppressing that behaviour.

I tried to define a custom `do_build` function inside the subpackage, but it appears that it is not being run: 

```sh
sbcl-doc_package() {
	short_desc+=" - documentation"
	do_build() {
		(cd ./doc/manual; make info)
	}
	pkg_install() {
		vmkdir 'usr/share/info'
		vcopy "doc/manual/*.info*" 'usr/share/info'
	}
}
```

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

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**

A patch file from https://github.com/void-linux/void-packages/pull/34730.patch is attached

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

From a9401de3506f3122354919816fef3ad335e21c65 Mon Sep 17 00:00:00 2001
From: HiPhish <hiphish@posteo.de>
Date: Tue, 28 Dec 2021 10:15:29 +0100
Subject: [PATCH] New package: sbcl-doc-2.1.11

Add the GNU Info manual for SBCL and its accompanying ASDF manual.
---
 srcpkgs/sbcl-doc      | 1 +
 srcpkgs/sbcl/template | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/sbcl-doc

diff --git a/srcpkgs/sbcl-doc b/srcpkgs/sbcl-doc
new file mode 120000
index 000000000000..d6eeb2634b04
--- /dev/null
+++ b/srcpkgs/sbcl-doc
@@ -0,0 +1 @@
+sbcl
\ No newline at end of file
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 524d66eb8d05..59259de77f26 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,9 +1,9 @@
 # Template file for 'sbcl'
 pkgname=sbcl
 version=2.1.11
-revision=1
+revision=2
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
-hostmakedepends="iana-etc"
+hostmakedepends="iana-etc texinfo"
 makedepends="zlib-devel"
 conf_files="/etc/sbclrc"
 short_desc="Steel Bank Common Lisp"
@@ -46,6 +46,7 @@ do_build() {
 	bash make.sh \
 		"$_bootstrap_lisp" \
 		--without-sb-test --with-sb-core-compression --prefix=/usr
+	make -C ./doc/manual info
 }
 
 do_install() {

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] New package: sbcl-doc-2.1.11
  2021-12-28  9:48 [PR PATCH] (help needed) New package: sbcl-doc-2.1.11 HiPhish
                   ` (11 preceding siblings ...)
  2021-12-30 15:44 ` [PR PATCH] [Updated] " HiPhish
@ 2021-12-30 15:45 ` HiPhish
  2021-12-30 15:46 ` HiPhish
                   ` (3 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: HiPhish @ 2021-12-30 15:45 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by HiPhish against master on the void-packages repository

https://github.com/HiPhish/void-packages sbcl-doc
https://github.com/void-linux/void-packages/pull/34730

New package: sbcl-doc-2.1.11
Add the GNU Info manual for SBCL and its accompanying ASDF manual.

This package has an issue: it will install the manual with the `sbcl` package as well. This is due to the fact that the `do_install` function of the `sbcl` package runs `install.sh`, which will install the manual if it is available. There does not seem to be a way of suppressing that behaviour.

I tried to define a custom `do_build` function inside the subpackage, but it appears that it is not being run: 

```sh
sbcl-doc_package() {
	short_desc+=" - documentation"
	do_build() {
		(cd ./doc/manual; make info)
	}
	pkg_install() {
		vmkdir 'usr/share/info'
		vcopy "doc/manual/*.info*" 'usr/share/info'
	}
}
```

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

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**

A patch file from https://github.com/void-linux/void-packages/pull/34730.patch is attached

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

From 105949a0936708def8ab750a1a70d6bd1aedd816 Mon Sep 17 00:00:00 2001
From: HiPhish <hiphish@posteo.de>
Date: Tue, 28 Dec 2021 10:15:29 +0100
Subject: [PATCH] New package: sbcl-doc-2.1.11

Add the GNU Info manual for SBCL and its accompanying ASDF manual.
---
 srcpkgs/sbcl/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 524d66eb8d05..59259de77f26 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,9 +1,9 @@
 # Template file for 'sbcl'
 pkgname=sbcl
 version=2.1.11
-revision=1
+revision=2
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
-hostmakedepends="iana-etc"
+hostmakedepends="iana-etc texinfo"
 makedepends="zlib-devel"
 conf_files="/etc/sbclrc"
 short_desc="Steel Bank Common Lisp"
@@ -46,6 +46,7 @@ do_build() {
 	bash make.sh \
 		"$_bootstrap_lisp" \
 		--without-sb-test --with-sb-core-compression --prefix=/usr
+	make -C ./doc/manual info
 }
 
 do_install() {

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: New package: sbcl-doc-2.1.11
  2021-12-28  9:48 [PR PATCH] (help needed) New package: sbcl-doc-2.1.11 HiPhish
                   ` (12 preceding siblings ...)
  2021-12-30 15:45 ` HiPhish
@ 2021-12-30 15:46 ` HiPhish
  2022-01-09 15:19 ` [PR PATCH] [Updated] " HiPhish
                   ` (2 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: HiPhish @ 2021-12-30 15:46 UTC (permalink / raw)
  To: ml

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

New comment by HiPhish on void-packages repository

https://github.com/void-linux/void-packages/pull/34730#issuecomment-1003083582

Comment:
OK, now the Info documentation is in the main package. Just out of curiosity, why was the documentation not included in the first place?

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] New package: sbcl-doc-2.1.11
  2021-12-28  9:48 [PR PATCH] (help needed) New package: sbcl-doc-2.1.11 HiPhish
                   ` (13 preceding siblings ...)
  2021-12-30 15:46 ` HiPhish
@ 2022-01-09 15:19 ` HiPhish
  2022-01-09 15:19 ` HiPhish
  2022-01-09 15:27 ` [PR PATCH] [Merged]: " leahneukirchen
  16 siblings, 0 replies; 18+ messages in thread
From: HiPhish @ 2022-01-09 15:19 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by HiPhish against master on the void-packages repository

https://github.com/HiPhish/void-packages sbcl-doc
https://github.com/void-linux/void-packages/pull/34730

New package: sbcl-doc-2.1.11
Add the GNU Info manual for SBCL and its accompanying ASDF manual.

This package has an issue: it will install the manual with the `sbcl` package as well. This is due to the fact that the `do_install` function of the `sbcl` package runs `install.sh`, which will install the manual if it is available. There does not seem to be a way of suppressing that behaviour.

I tried to define a custom `do_build` function inside the subpackage, but it appears that it is not being run: 

```sh
sbcl-doc_package() {
	short_desc+=" - documentation"
	do_build() {
		(cd ./doc/manual; make info)
	}
	pkg_install() {
		vmkdir 'usr/share/info'
		vcopy "doc/manual/*.info*" 'usr/share/info'
	}
}
```

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

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**

A patch file from https://github.com/void-linux/void-packages/pull/34730.patch is attached

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

From 277d8fc8d122c0dd5be573dc327f4c2601ca8b52 Mon Sep 17 00:00:00 2001
From: HiPhish <hiphish@posteo.de>
Date: Tue, 28 Dec 2021 10:15:29 +0100
Subject: [PATCH] sbcl: Add the GNU Info manual to the base package

---
 srcpkgs/sbcl/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 62c3790ba4cc..18e8ee33885a 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,9 +1,9 @@
 # Template file for 'sbcl'
 pkgname=sbcl
 version=2.2.0
-revision=1
+revision=2
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
-hostmakedepends="iana-etc"
+hostmakedepends="iana-etc texinfo"
 makedepends="zlib-devel"
 conf_files="/etc/sbclrc"
 short_desc="Steel Bank Common Lisp"
@@ -48,6 +48,7 @@ do_build() {
 	bash make.sh \
 		"$_bootstrap_lisp" \
 		--without-sb-test --with-sb-core-compression --prefix=/usr
+	make -C ./doc/manual info
 }
 
 do_install() {

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: New package: sbcl-doc-2.1.11
  2021-12-28  9:48 [PR PATCH] (help needed) New package: sbcl-doc-2.1.11 HiPhish
                   ` (14 preceding siblings ...)
  2022-01-09 15:19 ` [PR PATCH] [Updated] " HiPhish
@ 2022-01-09 15:19 ` HiPhish
  2022-01-09 15:27 ` [PR PATCH] [Merged]: " leahneukirchen
  16 siblings, 0 replies; 18+ messages in thread
From: HiPhish @ 2022-01-09 15:19 UTC (permalink / raw)
  To: ml

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

New comment by HiPhish on void-packages repository

https://github.com/void-linux/void-packages/pull/34730#issuecomment-1008317141

Comment:
*bump* Anything else that needs to be done?

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Merged]: New package: sbcl-doc-2.1.11
  2021-12-28  9:48 [PR PATCH] (help needed) New package: sbcl-doc-2.1.11 HiPhish
                   ` (15 preceding siblings ...)
  2022-01-09 15:19 ` HiPhish
@ 2022-01-09 15:27 ` leahneukirchen
  16 siblings, 0 replies; 18+ messages in thread
From: leahneukirchen @ 2022-01-09 15:27 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

New package: sbcl-doc-2.1.11
https://github.com/void-linux/void-packages/pull/34730

Description:
Add the GNU Info manual for SBCL and its accompanying ASDF manual.

This package has an issue: it will install the manual with the `sbcl` package as well. This is due to the fact that the `do_install` function of the `sbcl` package runs `install.sh`, which will install the manual if it is available. There does not seem to be a way of suppressing that behaviour.

I tried to define a custom `do_build` function inside the subpackage, but it appears that it is not being run: 

```sh
sbcl-doc_package() {
	short_desc+=" - documentation"
	do_build() {
		(cd ./doc/manual; make info)
	}
	pkg_install() {
		vmkdir 'usr/share/info'
		vcopy "doc/manual/*.info*" 'usr/share/info'
	}
}
```

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

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**

^ permalink raw reply	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2022-01-09 15:27 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-28  9:48 [PR PATCH] (help needed) New package: sbcl-doc-2.1.11 HiPhish
2021-12-28 14:09 ` [PR PATCH] [Updated] " HiPhish
2021-12-28 14:13 ` HiPhish
2021-12-28 20:35 ` Chocimier
2021-12-28 20:36 ` Chocimier
2021-12-28 23:01 ` [PR PATCH] [Updated] " HiPhish
2021-12-28 23:13 ` HiPhish
2021-12-29 23:49 ` Chocimier
2021-12-30 12:04 ` [PR PATCH] [Updated] " HiPhish
2021-12-30 12:06 ` HiPhish
2021-12-30 14:08 ` leahneukirchen
2021-12-30 14:09 ` leahneukirchen
2021-12-30 15:44 ` [PR PATCH] [Updated] " HiPhish
2021-12-30 15:45 ` HiPhish
2021-12-30 15:46 ` HiPhish
2022-01-09 15:19 ` [PR PATCH] [Updated] " HiPhish
2022-01-09 15:19 ` HiPhish
2022-01-09 15:27 ` [PR PATCH] [Merged]: " 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).