* [PR PATCH] gts: fix cross
@ 2022-01-29 0:26 paper42
2022-01-29 0:58 ` [PR PATCH] [Updated] " paper42
2022-01-29 18:37 ` [PR PATCH] [Merged]: " paper42
0 siblings, 2 replies; 3+ messages in thread
From: paper42 @ 2022-01-29 0:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 516 bytes --]
There is a new pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages gts-cross
https://github.com/void-linux/void-packages/pull/35280
gts: fix cross
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
pinging package maintainers: @leahneukirchen @the-eater
A patch file from https://github.com/void-linux/void-packages/pull/35280.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gts-cross-35280.patch --]
[-- Type: text/x-diff, Size: 3780 bytes --]
From b13ded35ede8b5cd40b6bd7a53389e6870397edf Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 29 Jan 2022 01:13:20 +0100
Subject: [PATCH 1/2] gts: fix cross
---
srcpkgs/gts/patches/cross.patch | 19 +++++++++++++++++++
srcpkgs/gts/template | 1 -
2 files changed, 19 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/gts/patches/cross.patch
diff --git a/srcpkgs/gts/patches/cross.patch b/srcpkgs/gts/patches/cross.patch
new file mode 100644
index 000000000000..8499dfa4980e
--- /dev/null
+++ b/srcpkgs/gts/patches/cross.patch
@@ -0,0 +1,19 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -84,6 +84,7 @@
+ @AMDEP_TRUE@ ./$(DEPDIR)/stripe.Plo ./$(DEPDIR)/surface.Plo \
+ @AMDEP_TRUE@ ./$(DEPDIR)/triangle.Plo ./$(DEPDIR)/tribox3.Plo \
+ @AMDEP_TRUE@ ./$(DEPDIR)/vertex.Plo ./$(DEPDIR)/vopt.Plo
++HOST_COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+@@ -673,7 +674,7 @@
+ $(COMPILE) -c $(srcdir)/predicates.c
+
+ predicates_init: predicates_init.c rounding.h
+- $(COMPILE) $(srcdir)/predicates_init.c -o $(srcdir)/predicates_init
++ $(HOST_COMPILE) $(srcdir)/predicates_init.c -o $(srcdir)/predicates_init
+
+ predicates_init.h: predicates_init
+ ./predicates_init > $(srcdir)/predicates_init.h
diff --git a/srcpkgs/gts/template b/srcpkgs/gts/template
index f73daa3daf08..b5e7538ab09d 100644
--- a/srcpkgs/gts/template
+++ b/srcpkgs/gts/template
@@ -11,7 +11,6 @@ license="LGPL-3.0-or-later"
homepage="http://gts.sourceforge.net/index.html"
distfiles="https://netcologne.dl.sourceforge.net/project/gts/gts/${version}/gts-${version}.tar.gz"
checksum=059c3e13e3e3b796d775ec9f96abdce8f2b3b5144df8514eda0cc12e13e8b81e
-nocross="Tries to execute cross-compiled code"
gts-devel_package() {
depends="gts-${version}_${revision}"
From af99d5622e3efd0f4b97df321be006cc715c7776 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 29 Jan 2022 01:13:47 +0100
Subject: [PATCH 2/2] graphviz: enable gts on cross
---
srcpkgs/graphviz/template | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template
index b3331462e6b4..5cde2ac24863 100644
--- a/srcpkgs/graphviz/template
+++ b/srcpkgs/graphviz/template
@@ -1,20 +1,20 @@
# Template file for 'graphviz'
pkgname=graphviz
version=2.50.0
-revision=1
+revision=2
build_style=gnu-configure
-configure_args="--enable-lefty"
+configure_args="--enable-lefty --with-gts"
make_build_args="HOSTCC=$BUILD_CC"
hostmakedepends="automake flex libltdl-devel libtool perl pkg-config python3"
makedepends="libpng-devel gd-devel gtk+-devel librsvg-devel libltdl-devel
- libXaw-devel"
+ libXaw-devel gts-devel"
depends="liberation-fonts-ttf"
checkdepends="${depends}"
short_desc="Graph Visualization Software"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="EPL-1.0"
-homepage="http://www.graphviz.org"
-changelog="https://gitlab.com/graphviz/graphviz/-/blob/main/CHANGELOG.md"
+homepage="https://www.graphviz.org"
+changelog="https://gitlab.com/graphviz/graphviz/-/raw/main/CHANGELOG.md"
distfiles="https://gitlab.com/graphviz/graphviz/-/archive/${version}/graphviz-${version}.tar.gz"
checksum=afa48581f764a35e148909cc96a0308ec2356b5225b64af12492f3392f20ef1c
@@ -27,11 +27,6 @@ checksum=afa48581f764a35e148909cc96a0308ec2356b5225b64af12492f3392f20ef1c
# They expect graphviz already installed before testing, disable
make_check=no
-if [ -z "$CROSS_BUILD" ]; then
- configure_args+=" --with-gts"
- makedepends+=" gts-devel"
-fi
-
pre_configure() {
./autogen.sh NOCONFIG
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] gts: fix cross
2022-01-29 0:26 [PR PATCH] gts: fix cross paper42
@ 2022-01-29 0:58 ` paper42
2022-01-29 18:37 ` [PR PATCH] [Merged]: " paper42
1 sibling, 0 replies; 3+ messages in thread
From: paper42 @ 2022-01-29 0:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 521 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages gts-cross
https://github.com/void-linux/void-packages/pull/35280
gts: fix cross
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
pinging package maintainers: @leahneukirchen @the-eater
A patch file from https://github.com/void-linux/void-packages/pull/35280.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gts-cross-35280.patch --]
[-- Type: text/x-diff, Size: 4112 bytes --]
From 72e3892aaa50b41b994d39d2eea7e50990b6e435 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 29 Jan 2022 01:13:20 +0100
Subject: [PATCH 1/2] gts: fix cross
---
srcpkgs/gts/patches/cross.patch | 19 +++++++++++++++++++
srcpkgs/gts/template | 8 ++++++--
2 files changed, 25 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/gts/patches/cross.patch
diff --git a/srcpkgs/gts/patches/cross.patch b/srcpkgs/gts/patches/cross.patch
new file mode 100644
index 000000000000..8499dfa4980e
--- /dev/null
+++ b/srcpkgs/gts/patches/cross.patch
@@ -0,0 +1,19 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -84,6 +84,7 @@
+ @AMDEP_TRUE@ ./$(DEPDIR)/stripe.Plo ./$(DEPDIR)/surface.Plo \
+ @AMDEP_TRUE@ ./$(DEPDIR)/triangle.Plo ./$(DEPDIR)/tribox3.Plo \
+ @AMDEP_TRUE@ ./$(DEPDIR)/vertex.Plo ./$(DEPDIR)/vopt.Plo
++HOST_COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+@@ -673,7 +674,7 @@
+ $(COMPILE) -c $(srcdir)/predicates.c
+
+ predicates_init: predicates_init.c rounding.h
+- $(COMPILE) $(srcdir)/predicates_init.c -o $(srcdir)/predicates_init
++ $(HOST_COMPILE) $(srcdir)/predicates_init.c -o $(srcdir)/predicates_init
+
+ predicates_init.h: predicates_init
+ ./predicates_init > $(srcdir)/predicates_init.h
diff --git a/srcpkgs/gts/template b/srcpkgs/gts/template
index f73daa3daf08..689a033991f7 100644
--- a/srcpkgs/gts/template
+++ b/srcpkgs/gts/template
@@ -5,13 +5,17 @@ revision=1
build_style=gnu-configure
hostmakedepends="glib-devel pkg-config"
makedepends="libglib-devel"
-short_desc="The GNU Triangulated Surface Library"
+short_desc="GNU Triangulated Surface Library"
maintainer="eater <=@eater.me>"
license="LGPL-3.0-or-later"
homepage="http://gts.sourceforge.net/index.html"
distfiles="https://netcologne.dl.sourceforge.net/project/gts/gts/${version}/gts-${version}.tar.gz"
checksum=059c3e13e3e3b796d775ec9f96abdce8f2b3b5144df8514eda0cc12e13e8b81e
-nocross="Tries to execute cross-compiled code"
+make_check=no # 26 tests fail
+
+pre_check() {
+ chmod 755 test/boolean/test.sh
+}
gts-devel_package() {
depends="gts-${version}_${revision}"
From b2fb57e20855bedceed41640394f9a5d2a8aba42 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 29 Jan 2022 01:13:47 +0100
Subject: [PATCH 2/2] graphviz: enable gts on cross
---
srcpkgs/graphviz/template | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template
index b3331462e6b4..5cde2ac24863 100644
--- a/srcpkgs/graphviz/template
+++ b/srcpkgs/graphviz/template
@@ -1,20 +1,20 @@
# Template file for 'graphviz'
pkgname=graphviz
version=2.50.0
-revision=1
+revision=2
build_style=gnu-configure
-configure_args="--enable-lefty"
+configure_args="--enable-lefty --with-gts"
make_build_args="HOSTCC=$BUILD_CC"
hostmakedepends="automake flex libltdl-devel libtool perl pkg-config python3"
makedepends="libpng-devel gd-devel gtk+-devel librsvg-devel libltdl-devel
- libXaw-devel"
+ libXaw-devel gts-devel"
depends="liberation-fonts-ttf"
checkdepends="${depends}"
short_desc="Graph Visualization Software"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="EPL-1.0"
-homepage="http://www.graphviz.org"
-changelog="https://gitlab.com/graphviz/graphviz/-/blob/main/CHANGELOG.md"
+homepage="https://www.graphviz.org"
+changelog="https://gitlab.com/graphviz/graphviz/-/raw/main/CHANGELOG.md"
distfiles="https://gitlab.com/graphviz/graphviz/-/archive/${version}/graphviz-${version}.tar.gz"
checksum=afa48581f764a35e148909cc96a0308ec2356b5225b64af12492f3392f20ef1c
@@ -27,11 +27,6 @@ checksum=afa48581f764a35e148909cc96a0308ec2356b5225b64af12492f3392f20ef1c
# They expect graphviz already installed before testing, disable
make_check=no
-if [ -z "$CROSS_BUILD" ]; then
- configure_args+=" --with-gts"
- makedepends+=" gts-devel"
-fi
-
pre_configure() {
./autogen.sh NOCONFIG
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: gts: fix cross
2022-01-29 0:26 [PR PATCH] gts: fix cross paper42
2022-01-29 0:58 ` [PR PATCH] [Updated] " paper42
@ 2022-01-29 18:37 ` paper42
1 sibling, 0 replies; 3+ messages in thread
From: paper42 @ 2022-01-29 18:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 363 bytes --]
There's a merged pull request on the void-packages repository
gts: fix cross
https://github.com/void-linux/void-packages/pull/35280
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
pinging package maintainers: @leahneukirchen @the-eater
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-01-29 18:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-29 0:26 [PR PATCH] gts: fix cross paper42
2022-01-29 0:58 ` [PR PATCH] [Updated] " paper42
2022-01-29 18:37 ` [PR PATCH] [Merged]: " paper42
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).