Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] [WIP] New package: gap-4.11.1
@ 2022-01-11 14:38 tornaria
  2022-01-11 15:26 ` dkwo
                   ` (7 more replies)
  0 siblings, 8 replies; 9+ messages in thread
From: tornaria @ 2022-01-11 14:38 UTC (permalink / raw)
  To: ml

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

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

https://github.com/tornaria/void-packages gap
https://github.com/void-linux/void-packages/pull/34995

[WIP] New package: gap-4.11.1
#### Testing the changes
- I tested the changes in this PR: **briefly**

This is a dependency of sagemath. It's working fine standalone, and I'm now working on having it used by sagemath from system. 

This is working fine on x86_64. I haven't tested musl, i686, or cross build yet.

Cc: @dkwo

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

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

From deb0055bd7aed103d0dd50e908584ad3022dcc2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 10 Jan 2022 16:18:04 -0300
Subject: [PATCH 1/2] New package: gap-4.11.1

---
 common/shlibs        |  1 +
 srcpkgs/gap-devel    |  1 +
 srcpkgs/gap/template | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+)
 create mode 120000 srcpkgs/gap-devel
 create mode 100644 srcpkgs/gap/template

diff --git a/common/shlibs b/common/shlibs
index 999d3ad714b8..1e537682c3a1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4021,6 +4021,7 @@ libpari-gmp.so.7 pari-2.13.0_1
 libpari-gmp-tls.so.7 pari-2.13.2_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
 libplanarity.so.0 planarity-3.0.1.1_1
+libgap.so.0 gap-4.11.1_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libgf2x.so.3 gf2x-1.3.0_1
 libntl.so.44 ntl-11.5.1_1
diff --git a/srcpkgs/gap-devel b/srcpkgs/gap-devel
new file mode 120000
index 000000000000..e195f60d0b1a
--- /dev/null
+++ b/srcpkgs/gap-devel
@@ -0,0 +1 @@
+gap
\ No newline at end of file
diff --git a/srcpkgs/gap/template b/srcpkgs/gap/template
new file mode 100644
index 000000000000..683d4e4edb63
--- /dev/null
+++ b/srcpkgs/gap/template
@@ -0,0 +1,41 @@
+# Template file for 'gap'
+pkgname=gap
+version=4.11.1
+revision=1
+build_style=gnu-configure
+makedepends="gmp-devel zlib-devel readline-devel"
+make_install_target="install-bin install-gaproot install-headers install-libgap"
+short_desc="Groups, Algorithms, Programming - computational discrete algebra"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="GPL-2.0-or-later"
+homepage="http://www.gap-system.org/"
+distfiles="https://github.com/gap-system/gap/releases/download/v${version}/gap-${version}.tar.gz"
+checksum=6635c5da7d82755f8339486b9cac33766f58712f297e8234fba40818902ea304
+
+_GAPROOT=/usr/share/gap/
+
+# minimal required packages
+_GAPPKGS="GAPDoc primgrp SmallGrp transgrp"
+
+# other expected packages
+_GAPPKGS+=" atlasrep autpgrp alnuth crisp ctbllib FactInt fga irredsol laguna
+ polenta polycyclic resclasses sophus tomlib"
+
+post_install() {
+	vmkdir ${_GAPROOT}/pkg
+	for p in ${_GAPPKGS}; do
+		[ -d pkg/$p ] || p="$p-*"
+		vcopy "pkg/$p" ${_GAPROOT}/pkg
+	done
+	# not handled by make install-headers
+	vcopy gen/config.h /usr/include/gap
+}
+
+gap-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+	}
+}

From af89a0bc88dd92585e20cec6c144ede762efe0a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 11 Jan 2022 00:09:49 -0300
Subject: [PATCH 2/2] gap: run more tests on full check

---
 srcpkgs/gap/template | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/srcpkgs/gap/template b/srcpkgs/gap/template
index 683d4e4edb63..74be8c03ea42 100644
--- a/srcpkgs/gap/template
+++ b/srcpkgs/gap/template
@@ -4,6 +4,7 @@ version=4.11.1
 revision=1
 build_style=gnu-configure
 makedepends="gmp-devel zlib-devel readline-devel"
+checkdepends="perl"
 make_install_target="install-bin install-gaproot install-headers install-libgap"
 short_desc="Groups, Algorithms, Programming - computational discrete algebra"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
@@ -12,6 +13,11 @@ homepage="http://www.gap-system.org/"
 distfiles="https://github.com/gap-system/gap/releases/download/v${version}/gap-${version}.tar.gz"
 checksum=6635c5da7d82755f8339486b9cac33766f58712f297e8234fba40818902ea304
 
+if [ "$XBPS_CHECK_PKGS" = full ]; then
+	# not sure about this -- takes about 25 minutes
+	make_check_target=teststandard
+fi
+
 _GAPROOT=/usr/share/gap/
 
 # minimal required packages

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

* Re: [WIP] New package: gap-4.11.1
  2022-01-11 14:38 [PR PATCH] [WIP] New package: gap-4.11.1 tornaria
@ 2022-01-11 15:26 ` dkwo
  2022-01-11 15:30 ` [PR PATCH] [Updated] " tornaria
                   ` (6 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: dkwo @ 2022-01-11 15:26 UTC (permalink / raw)
  To: ml

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/34995#issuecomment-1010074349

Comment:
Don't we need to `cd pkg` and `../bin/BuildPackages.sh` at some point?

I thought their make install does not work:
```
=> gap-4.11.1_1: running do_install ...
Warning, 'make install-bin' is incomplete
# TODO: make gac installable; this requires adjusting path in it, and
# installing the libtool script generated by configure somewhere; and then
# putting that path to it into gac)
Warning, 'make install-gaproot' is incomplete
# TODO: update paths and FLAGS in sysinfo.gap
# the following lines should not use `cp -r`, which is not quite portable,
# and which also may not deal with file permissions correctly
# TODO: what about CITATION, CONTRIBUTING.md, COPYRIGHT, INSTALL.md,
# LICENSE, README* ? Copy them also here? Or into some other path?
# TODO: also copy bin/BuildPackage.sh, as it is very useful?
Warning, 'make install-headers' is incomplete
# TODO: run the following only if HPC-GAP is enabled?
# TODO: take care of config.h, this is difficult
Warning, 'make install-libgap' is incomplete
libtool: warning: remember to run 'libtool --finish /usr/lib64'
```

Just a reference for myself: I also had
```
+configure_args="--with-gmp=system"
+hostmakedepends="tar"
+makedepends="givaro-devel mpfi-devel cddlib-devel libXaw-devel
+ boost-devel zeromq-devel fplll-devel wget chrpath fmt-devel libcurl-devel ncurses-devel"
```

Just a stupid lint: could you rebase on master and move up `make_install_target` by two?

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

* Re: [PR PATCH] [Updated] [WIP] New package: gap-4.11.1
  2022-01-11 14:38 [PR PATCH] [WIP] New package: gap-4.11.1 tornaria
  2022-01-11 15:26 ` dkwo
@ 2022-01-11 15:30 ` tornaria
  2022-01-11 15:42 ` tornaria
                   ` (5 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: tornaria @ 2022-01-11 15:30 UTC (permalink / raw)
  To: ml

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

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

https://github.com/tornaria/void-packages gap
https://github.com/void-linux/void-packages/pull/34995

[WIP] New package: gap-4.11.1
#### Testing the changes
- I tested the changes in this PR: **briefly**

This is a dependency of sagemath. It's working fine standalone, and I'm now working on having it used by sagemath from system. 

This is working fine on x86_64. I haven't tested musl, i686, or cross build yet.

Cc: @dkwo

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

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

From b0fd6bfc383459ca0899ab28e3921ba6589c64d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 10 Jan 2022 16:18:04 -0300
Subject: [PATCH 1/3] New package: gap-4.11.1

---
 common/shlibs        |  1 +
 srcpkgs/gap-devel    |  1 +
 srcpkgs/gap/template | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+)
 create mode 120000 srcpkgs/gap-devel
 create mode 100644 srcpkgs/gap/template

diff --git a/common/shlibs b/common/shlibs
index 999d3ad714b8..1e537682c3a1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4021,6 +4021,7 @@ libpari-gmp.so.7 pari-2.13.0_1
 libpari-gmp-tls.so.7 pari-2.13.2_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
 libplanarity.so.0 planarity-3.0.1.1_1
+libgap.so.0 gap-4.11.1_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libgf2x.so.3 gf2x-1.3.0_1
 libntl.so.44 ntl-11.5.1_1
diff --git a/srcpkgs/gap-devel b/srcpkgs/gap-devel
new file mode 120000
index 000000000000..e195f60d0b1a
--- /dev/null
+++ b/srcpkgs/gap-devel
@@ -0,0 +1 @@
+gap
\ No newline at end of file
diff --git a/srcpkgs/gap/template b/srcpkgs/gap/template
new file mode 100644
index 000000000000..683d4e4edb63
--- /dev/null
+++ b/srcpkgs/gap/template
@@ -0,0 +1,41 @@
+# Template file for 'gap'
+pkgname=gap
+version=4.11.1
+revision=1
+build_style=gnu-configure
+makedepends="gmp-devel zlib-devel readline-devel"
+make_install_target="install-bin install-gaproot install-headers install-libgap"
+short_desc="Groups, Algorithms, Programming - computational discrete algebra"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="GPL-2.0-or-later"
+homepage="http://www.gap-system.org/"
+distfiles="https://github.com/gap-system/gap/releases/download/v${version}/gap-${version}.tar.gz"
+checksum=6635c5da7d82755f8339486b9cac33766f58712f297e8234fba40818902ea304
+
+_GAPROOT=/usr/share/gap/
+
+# minimal required packages
+_GAPPKGS="GAPDoc primgrp SmallGrp transgrp"
+
+# other expected packages
+_GAPPKGS+=" atlasrep autpgrp alnuth crisp ctbllib FactInt fga irredsol laguna
+ polenta polycyclic resclasses sophus tomlib"
+
+post_install() {
+	vmkdir ${_GAPROOT}/pkg
+	for p in ${_GAPPKGS}; do
+		[ -d pkg/$p ] || p="$p-*"
+		vcopy "pkg/$p" ${_GAPROOT}/pkg
+	done
+	# not handled by make install-headers
+	vcopy gen/config.h /usr/include/gap
+}
+
+gap-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+	}
+}

From 1c60e9668e5c40bdcedcc4c7350e9be157bb3bae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 11 Jan 2022 00:09:49 -0300
Subject: [PATCH 2/3] gap: run more tests on full check

---
 srcpkgs/gap/template | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/srcpkgs/gap/template b/srcpkgs/gap/template
index 683d4e4edb63..74be8c03ea42 100644
--- a/srcpkgs/gap/template
+++ b/srcpkgs/gap/template
@@ -4,6 +4,7 @@ version=4.11.1
 revision=1
 build_style=gnu-configure
 makedepends="gmp-devel zlib-devel readline-devel"
+checkdepends="perl"
 make_install_target="install-bin install-gaproot install-headers install-libgap"
 short_desc="Groups, Algorithms, Programming - computational discrete algebra"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
@@ -12,6 +13,11 @@ homepage="http://www.gap-system.org/"
 distfiles="https://github.com/gap-system/gap/releases/download/v${version}/gap-${version}.tar.gz"
 checksum=6635c5da7d82755f8339486b9cac33766f58712f297e8234fba40818902ea304
 
+if [ "$XBPS_CHECK_PKGS" = full ]; then
+	# not sure about this -- takes about 25 minutes
+	make_check_target=teststandard
+fi
+
 _GAPROOT=/usr/share/gap/
 
 # minimal required packages

From 9fa0e10cd5167ce7704cb52a552121f0663bd150 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 11 Jan 2022 12:30:31 -0300
Subject: [PATCH 3/3] fix lint

---
 srcpkgs/gap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gap/template b/srcpkgs/gap/template
index 74be8c03ea42..7bc7d13ace20 100644
--- a/srcpkgs/gap/template
+++ b/srcpkgs/gap/template
@@ -3,9 +3,9 @@ pkgname=gap
 version=4.11.1
 revision=1
 build_style=gnu-configure
+make_install_target="install-bin install-gaproot install-headers install-libgap"
 makedepends="gmp-devel zlib-devel readline-devel"
 checkdepends="perl"
-make_install_target="install-bin install-gaproot install-headers install-libgap"
 short_desc="Groups, Algorithms, Programming - computational discrete algebra"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-2.0-or-later"

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

* Re: [PR PATCH] [Updated] [WIP] New package: gap-4.11.1
  2022-01-11 14:38 [PR PATCH] [WIP] New package: gap-4.11.1 tornaria
  2022-01-11 15:26 ` dkwo
  2022-01-11 15:30 ` [PR PATCH] [Updated] " tornaria
@ 2022-01-11 15:42 ` tornaria
  2022-01-11 16:06 ` tornaria
                   ` (4 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: tornaria @ 2022-01-11 15:42 UTC (permalink / raw)
  To: ml

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

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

https://github.com/tornaria/void-packages gap
https://github.com/void-linux/void-packages/pull/34995

[WIP] New package: gap-4.11.1
#### Testing the changes
- I tested the changes in this PR: **briefly**

This is a dependency of sagemath. It's working fine standalone, and I'm now working on having it used by sagemath from system. 

This is working fine on x86_64. I haven't tested musl, i686, or cross build yet.

Cc: @dkwo

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

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

From e7e90c08e15e14ba701aae3b7a5415467433bcc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 11 Jan 2022 12:39:21 -0300
Subject: [PATCH 1/4] Fix CI since github no longer accepts git:// protocol

As of today, everything fails on CI with:

```
Run common/travis/fetch_upstream.sh
Fetching upstream...
fatal: remote error:
  The unauthenticated git protocol on port 9418 is no longer supported.
Please see https://github.blog/2021-09-01-improving-git-protocol-security-github/ for more information.
Error: Process completed with exit code 128.
```

Switching `git://` to `https://` should fix this.
---
 common/travis/fetch_upstream.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/travis/fetch_upstream.sh b/common/travis/fetch_upstream.sh
index b1b06d9d54f9..45315563e0b1 100755
--- a/common/travis/fetch_upstream.sh
+++ b/common/travis/fetch_upstream.sh
@@ -9,4 +9,4 @@ elif command -v git >/dev/null 2>&1; then
 fi
 
 /bin/echo -e '\x1b[32mFetching upstream...\x1b[0m'
-$GIT_CMD fetch --depth 200 git://github.com/void-linux/void-packages.git master
+$GIT_CMD fetch --depth 200 https://github.com/void-linux/void-packages.git master

From 17cf9ba48c4fd2986fe833fd8171e906baaed054 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 10 Jan 2022 16:18:04 -0300
Subject: [PATCH 2/4] New package: gap-4.11.1

---
 common/shlibs        |  1 +
 srcpkgs/gap-devel    |  1 +
 srcpkgs/gap/template | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+)
 create mode 120000 srcpkgs/gap-devel
 create mode 100644 srcpkgs/gap/template

diff --git a/common/shlibs b/common/shlibs
index 999d3ad714b8..1e537682c3a1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4021,6 +4021,7 @@ libpari-gmp.so.7 pari-2.13.0_1
 libpari-gmp-tls.so.7 pari-2.13.2_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
 libplanarity.so.0 planarity-3.0.1.1_1
+libgap.so.0 gap-4.11.1_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libgf2x.so.3 gf2x-1.3.0_1
 libntl.so.44 ntl-11.5.1_1
diff --git a/srcpkgs/gap-devel b/srcpkgs/gap-devel
new file mode 120000
index 000000000000..e195f60d0b1a
--- /dev/null
+++ b/srcpkgs/gap-devel
@@ -0,0 +1 @@
+gap
\ No newline at end of file
diff --git a/srcpkgs/gap/template b/srcpkgs/gap/template
new file mode 100644
index 000000000000..683d4e4edb63
--- /dev/null
+++ b/srcpkgs/gap/template
@@ -0,0 +1,41 @@
+# Template file for 'gap'
+pkgname=gap
+version=4.11.1
+revision=1
+build_style=gnu-configure
+makedepends="gmp-devel zlib-devel readline-devel"
+make_install_target="install-bin install-gaproot install-headers install-libgap"
+short_desc="Groups, Algorithms, Programming - computational discrete algebra"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="GPL-2.0-or-later"
+homepage="http://www.gap-system.org/"
+distfiles="https://github.com/gap-system/gap/releases/download/v${version}/gap-${version}.tar.gz"
+checksum=6635c5da7d82755f8339486b9cac33766f58712f297e8234fba40818902ea304
+
+_GAPROOT=/usr/share/gap/
+
+# minimal required packages
+_GAPPKGS="GAPDoc primgrp SmallGrp transgrp"
+
+# other expected packages
+_GAPPKGS+=" atlasrep autpgrp alnuth crisp ctbllib FactInt fga irredsol laguna
+ polenta polycyclic resclasses sophus tomlib"
+
+post_install() {
+	vmkdir ${_GAPROOT}/pkg
+	for p in ${_GAPPKGS}; do
+		[ -d pkg/$p ] || p="$p-*"
+		vcopy "pkg/$p" ${_GAPROOT}/pkg
+	done
+	# not handled by make install-headers
+	vcopy gen/config.h /usr/include/gap
+}
+
+gap-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+	}
+}

From a03f91291a18a46ad1a1aedb7f4d07db59b83df1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 11 Jan 2022 00:09:49 -0300
Subject: [PATCH 3/4] gap: run more tests on full check

---
 srcpkgs/gap/template | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/srcpkgs/gap/template b/srcpkgs/gap/template
index 683d4e4edb63..74be8c03ea42 100644
--- a/srcpkgs/gap/template
+++ b/srcpkgs/gap/template
@@ -4,6 +4,7 @@ version=4.11.1
 revision=1
 build_style=gnu-configure
 makedepends="gmp-devel zlib-devel readline-devel"
+checkdepends="perl"
 make_install_target="install-bin install-gaproot install-headers install-libgap"
 short_desc="Groups, Algorithms, Programming - computational discrete algebra"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
@@ -12,6 +13,11 @@ homepage="http://www.gap-system.org/"
 distfiles="https://github.com/gap-system/gap/releases/download/v${version}/gap-${version}.tar.gz"
 checksum=6635c5da7d82755f8339486b9cac33766f58712f297e8234fba40818902ea304
 
+if [ "$XBPS_CHECK_PKGS" = full ]; then
+	# not sure about this -- takes about 25 minutes
+	make_check_target=teststandard
+fi
+
 _GAPROOT=/usr/share/gap/
 
 # minimal required packages

From 84e258bbdd9254bad242805ad1fd6f6da1583126 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 11 Jan 2022 12:30:31 -0300
Subject: [PATCH 4/4] fix lint

---
 srcpkgs/gap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gap/template b/srcpkgs/gap/template
index 74be8c03ea42..7bc7d13ace20 100644
--- a/srcpkgs/gap/template
+++ b/srcpkgs/gap/template
@@ -3,9 +3,9 @@ pkgname=gap
 version=4.11.1
 revision=1
 build_style=gnu-configure
+make_install_target="install-bin install-gaproot install-headers install-libgap"
 makedepends="gmp-devel zlib-devel readline-devel"
 checkdepends="perl"
-make_install_target="install-bin install-gaproot install-headers install-libgap"
 short_desc="Groups, Algorithms, Programming - computational discrete algebra"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-2.0-or-later"

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

* Re: [PR PATCH] [Updated] [WIP] New package: gap-4.11.1
  2022-01-11 14:38 [PR PATCH] [WIP] New package: gap-4.11.1 tornaria
                   ` (2 preceding siblings ...)
  2022-01-11 15:42 ` tornaria
@ 2022-01-11 16:06 ` tornaria
  2022-01-11 16:18 ` tornaria
                   ` (3 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: tornaria @ 2022-01-11 16:06 UTC (permalink / raw)
  To: ml

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

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

https://github.com/tornaria/void-packages gap
https://github.com/void-linux/void-packages/pull/34995

[WIP] New package: gap-4.11.1
#### Testing the changes
- I tested the changes in this PR: **briefly**

This is a dependency of sagemath. It's working fine standalone, and I'm now working on having it used by sagemath from system. 

This is working fine on x86_64. I haven't tested musl, i686, or cross build yet.

Cc: @dkwo

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

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

From 40ff55174347740ccbbbef96c8efaed29f33d449 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 10 Jan 2022 16:18:04 -0300
Subject: [PATCH] New package: gap-4.11.1

---
 common/shlibs        |  1 +
 srcpkgs/gap-devel    |  1 +
 srcpkgs/gap/template | 47 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 49 insertions(+)
 create mode 120000 srcpkgs/gap-devel
 create mode 100644 srcpkgs/gap/template

diff --git a/common/shlibs b/common/shlibs
index 999d3ad714b8..1e537682c3a1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4021,6 +4021,7 @@ libpari-gmp.so.7 pari-2.13.0_1
 libpari-gmp-tls.so.7 pari-2.13.2_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
 libplanarity.so.0 planarity-3.0.1.1_1
+libgap.so.0 gap-4.11.1_1
 libgtkdatabox.so.1 gtkdatabox3-1.0.0_1
 libgf2x.so.3 gf2x-1.3.0_1
 libntl.so.44 ntl-11.5.1_1
diff --git a/srcpkgs/gap-devel b/srcpkgs/gap-devel
new file mode 120000
index 000000000000..e195f60d0b1a
--- /dev/null
+++ b/srcpkgs/gap-devel
@@ -0,0 +1 @@
+gap
\ No newline at end of file
diff --git a/srcpkgs/gap/template b/srcpkgs/gap/template
new file mode 100644
index 000000000000..7bc7d13ace20
--- /dev/null
+++ b/srcpkgs/gap/template
@@ -0,0 +1,47 @@
+# Template file for 'gap'
+pkgname=gap
+version=4.11.1
+revision=1
+build_style=gnu-configure
+make_install_target="install-bin install-gaproot install-headers install-libgap"
+makedepends="gmp-devel zlib-devel readline-devel"
+checkdepends="perl"
+short_desc="Groups, Algorithms, Programming - computational discrete algebra"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="GPL-2.0-or-later"
+homepage="http://www.gap-system.org/"
+distfiles="https://github.com/gap-system/gap/releases/download/v${version}/gap-${version}.tar.gz"
+checksum=6635c5da7d82755f8339486b9cac33766f58712f297e8234fba40818902ea304
+
+if [ "$XBPS_CHECK_PKGS" = full ]; then
+	# not sure about this -- takes about 25 minutes
+	make_check_target=teststandard
+fi
+
+_GAPROOT=/usr/share/gap/
+
+# minimal required packages
+_GAPPKGS="GAPDoc primgrp SmallGrp transgrp"
+
+# other expected packages
+_GAPPKGS+=" atlasrep autpgrp alnuth crisp ctbllib FactInt fga irredsol laguna
+ polenta polycyclic resclasses sophus tomlib"
+
+post_install() {
+	vmkdir ${_GAPROOT}/pkg
+	for p in ${_GAPPKGS}; do
+		[ -d pkg/$p ] || p="$p-*"
+		vcopy "pkg/$p" ${_GAPROOT}/pkg
+	done
+	# not handled by make install-headers
+	vcopy gen/config.h /usr/include/gap
+}
+
+gap-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+	}
+}

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

* Re: [WIP] New package: gap-4.11.1
  2022-01-11 14:38 [PR PATCH] [WIP] New package: gap-4.11.1 tornaria
                   ` (3 preceding siblings ...)
  2022-01-11 16:06 ` tornaria
@ 2022-01-11 16:18 ` tornaria
  2022-01-12 11:30 ` dkwo
                   ` (2 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: tornaria @ 2022-01-11 16:18 UTC (permalink / raw)
  To: ml

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

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/34995#issuecomment-1010126600

Comment:
> Don't we need to `cd pkg` and `../bin/BuildPackages.sh` at some point?
> 
> I thought their make install does not work:
> 
> ```
> => gap-4.11.1_1: running do_install ...
> Warning, 'make install-bin' is incomplete
> # TODO: make gac installable; this requires adjusting path in it, and
> # installing the libtool script generated by configure somewhere; and then
> # putting that path to it into gac)
> Warning, 'make install-gaproot' is incomplete
> # TODO: update paths and FLAGS in sysinfo.gap
> # the following lines should not use `cp -r`, which is not quite portable,
> # and which also may not deal with file permissions correctly
> # TODO: what about CITATION, CONTRIBUTING.md, COPYRIGHT, INSTALL.md,
> # LICENSE, README* ? Copy them also here? Or into some other path?
> # TODO: also copy bin/BuildPackage.sh, as it is very useful?
> Warning, 'make install-headers' is incomplete
> # TODO: run the following only if HPC-GAP is enabled?
> # TODO: take care of config.h, this is difficult
> Warning, 'make install-libgap' is incomplete
> libtool: warning: remember to run 'libtool --finish /usr/lib64'
> ```

It's incomplete, but it seems to work. The shortcoming is that it
doesn't install packages or gac. I'm hand installing the same packages
as sage:
 - the minimal required packages (without them gap errors at start)
 - all the recommended packages (without them gap warns at start)

I don't know yet if gac is needed for sage (sage installs it so it may
be useful, also gap is already large b/c of the transitive group
database so adding gac is probably negligible in size).

WRT `BuildPackages.sh` that's for some packages that need building,
which as far as I can tell the ones I picked don't need it.

> +configure_args="--with-gmp=system"

I think it's picked automatically if `gmp-devel` is installed.

> +hostmakedepends="tar"

Maybe needed for building some package we don't install (?)

> +makedepends="givaro-devel mpfi-devel cddlib-devel libXaw-devel
> + boost-devel zeromq-devel fplll-devel wget chrpath fmt-devel libcurl-devel ncurses-devel"

These are for some packages we don't install. Except ncurses-devel which
is needed for and implied by `readline-devel`.

> Just a stupid lint: could you rebase on master and move up `make_install_target` by two?

Done, and everything is now working on CI.

I'll remove the `[WIP]` from the title when we have sagemath running and
passing all tests in all arches using system gap.


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

* Re: [WIP] New package: gap-4.11.1
  2022-01-11 14:38 [PR PATCH] [WIP] New package: gap-4.11.1 tornaria
                   ` (4 preceding siblings ...)
  2022-01-11 16:18 ` tornaria
@ 2022-01-12 11:30 ` dkwo
  2022-01-13 18:57 ` tornaria
  2022-01-14 14:14 ` [PR PATCH] [Merged]: " leahneukirchen
  7 siblings, 0 replies; 9+ messages in thread
From: dkwo @ 2022-01-12 11:30 UTC (permalink / raw)
  To: ml

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/34995#issuecomment-1010945642

Comment:
Very well, then.
It also builds fine on newer musl.

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

* Re: New package: gap-4.11.1
  2022-01-11 14:38 [PR PATCH] [WIP] New package: gap-4.11.1 tornaria
                   ` (5 preceding siblings ...)
  2022-01-12 11:30 ` dkwo
@ 2022-01-13 18:57 ` tornaria
  2022-01-14 14:14 ` [PR PATCH] [Merged]: " leahneukirchen
  7 siblings, 0 replies; 9+ messages in thread
From: tornaria @ 2022-01-13 18:57 UTC (permalink / raw)
  To: ml

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

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/34995#issuecomment-1012418882

Comment:
@leahneukirchen this is IMO ready to merge, as everything works fine with sagemath in all the supported arches.

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

* Re: [PR PATCH] [Merged]: New package: gap-4.11.1
  2022-01-11 14:38 [PR PATCH] [WIP] New package: gap-4.11.1 tornaria
                   ` (6 preceding siblings ...)
  2022-01-13 18:57 ` tornaria
@ 2022-01-14 14:14 ` leahneukirchen
  7 siblings, 0 replies; 9+ messages in thread
From: leahneukirchen @ 2022-01-14 14:14 UTC (permalink / raw)
  To: ml

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

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

New package: gap-4.11.1
https://github.com/void-linux/void-packages/pull/34995

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

This is a dependency of sagemath. It's working fine standalone, and I'm now working on having it used by sagemath from system. 

This is working fine on x86_64. I haven't tested musl, i686, or cross build yet.

Cc: @dkwo

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

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

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-11 14:38 [PR PATCH] [WIP] New package: gap-4.11.1 tornaria
2022-01-11 15:26 ` dkwo
2022-01-11 15:30 ` [PR PATCH] [Updated] " tornaria
2022-01-11 15:42 ` tornaria
2022-01-11 16:06 ` tornaria
2022-01-11 16:18 ` tornaria
2022-01-12 11:30 ` dkwo
2022-01-13 18:57 ` tornaria
2022-01-14 14:14 ` [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).