* Re: [PR PATCH] [Updated] splint: Fix cross-build
2020-12-13 18:56 [PR PATCH] splint: Fix cross-build ndowens
@ 2020-12-13 19:00 ` ndowens
2020-12-13 19:16 ` [PR REVIEW] " ericonr
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: ndowens @ 2020-12-13 19:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 312 bytes --]
There is an updated pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages splint
https://github.com/void-linux/void-packages/pull/27124
splint: Fix cross-build
A patch file from https://github.com/void-linux/void-packages/pull/27124.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-splint-27124.patch --]
[-- Type: text/x-diff, Size: 1328 bytes --]
From 82d3cc7f65e320a924d66798f9a029cda2cd62e4 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 13 Dec 2020 12:57:34 -0600
Subject: [PATCH] splint: Fix cross-build
---
srcpkgs/splint/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/splint/template b/srcpkgs/splint/template
index 4e3a93eaf29..455bceab070 100644
--- a/srcpkgs/splint/template
+++ b/srcpkgs/splint/template
@@ -1,21 +1,28 @@
# Template file for 'splint'
pkgname=splint
version=3.1.2
-revision=4
+revision=5
wrksrc="${pkgname}-${version}.orig"
build_style=gnu-configure
hostmakedepends="flex"
makedepends="libfl-devel"
short_desc="Secure Programming Lint"
maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
homepage="http://www.splint.org"
-license="GPL-2"
distfiles="${DEBIAN_SITE}/main/s/splint/${pkgname}_${version}+dfsg.orig.tar.xz"
checksum=51cd7ba978a366ae1ededac2b927058fd5f45d5455e5a9d640b75ab4e45b748a
disable_parallel_build=yes
-nocross=yes
post_patch() {
vsed -i 's/__pid_t/pid_t/g' src/osd.c
vsed -i -e '/RM.*[.]tab[.]h/d' src/Makefile.am src/Makefile.in
}
+
+post_configure() {
+ # Test tries to run program. If cross-building
+ # this will fail.
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i '/SUBDIRS/s|test||' Makefile
+ fi
+}
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PR REVIEW] splint: Fix cross-build
2020-12-13 18:56 [PR PATCH] splint: Fix cross-build ndowens
2020-12-13 19:00 ` [PR PATCH] [Updated] " ndowens
@ 2020-12-13 19:16 ` ericonr
2020-12-13 19:24 ` [PR PATCH] [Updated] " ndowens
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: ericonr @ 2020-12-13 19:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 217 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27124#discussion_r541986326
Comment:
If it's only building for new stuff, no need to increase the revision.
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PR PATCH] [Updated] splint: Fix cross-build
2020-12-13 18:56 [PR PATCH] splint: Fix cross-build ndowens
2020-12-13 19:00 ` [PR PATCH] [Updated] " ndowens
2020-12-13 19:16 ` [PR REVIEW] " ericonr
@ 2020-12-13 19:24 ` ndowens
2020-12-13 20:07 ` ericonr
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: ndowens @ 2020-12-13 19:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 312 bytes --]
There is an updated pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages splint
https://github.com/void-linux/void-packages/pull/27124
splint: Fix cross-build
A patch file from https://github.com/void-linux/void-packages/pull/27124.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-splint-27124.patch --]
[-- Type: text/x-diff, Size: 1175 bytes --]
From e52a008e8522620674f010d09ba53cba1317b859 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 13 Dec 2020 12:57:34 -0600
Subject: [PATCH] splint: Fix cross-build
---
srcpkgs/splint/template | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/splint/template b/srcpkgs/splint/template
index 4e3a93eaf29..0c349c88462 100644
--- a/srcpkgs/splint/template
+++ b/srcpkgs/splint/template
@@ -8,14 +8,21 @@ hostmakedepends="flex"
makedepends="libfl-devel"
short_desc="Secure Programming Lint"
maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
homepage="http://www.splint.org"
-license="GPL-2"
distfiles="${DEBIAN_SITE}/main/s/splint/${pkgname}_${version}+dfsg.orig.tar.xz"
checksum=51cd7ba978a366ae1ededac2b927058fd5f45d5455e5a9d640b75ab4e45b748a
disable_parallel_build=yes
-nocross=yes
post_patch() {
vsed -i 's/__pid_t/pid_t/g' src/osd.c
vsed -i -e '/RM.*[.]tab[.]h/d' src/Makefile.am src/Makefile.in
}
+
+post_configure() {
+ # Test tries to run program. If cross-building
+ # this will fail.
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i '/SUBDIRS/s|test||' Makefile
+ fi
+}
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: splint: Fix cross-build
2020-12-13 18:56 [PR PATCH] splint: Fix cross-build ndowens
` (2 preceding siblings ...)
2020-12-13 19:24 ` [PR PATCH] [Updated] " ndowens
@ 2020-12-13 20:07 ` ericonr
2020-12-13 23:20 ` ndowens
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: ericonr @ 2020-12-13 20:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 234 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27124#issuecomment-744061146
Comment:
The cross build logs have a bunch of "couldn't execute file" lines. I guess they're harmless?
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: splint: Fix cross-build
2020-12-13 18:56 [PR PATCH] splint: Fix cross-build ndowens
` (3 preceding siblings ...)
2020-12-13 20:07 ` ericonr
@ 2020-12-13 23:20 ` ndowens
2020-12-13 23:24 ` ndowens
2020-12-14 1:07 ` sgn
6 siblings, 0 replies; 8+ messages in thread
From: ndowens @ 2020-12-13 23:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 299 bytes --]
New comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/27124#issuecomment-744086365
Comment:
> The cross build logs have a bunch of "couldn't execute file" lines. I guess they're harmless?
Not sure, going to see if I can test it in virtualbox or so
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: splint: Fix cross-build
2020-12-13 18:56 [PR PATCH] splint: Fix cross-build ndowens
` (4 preceding siblings ...)
2020-12-13 23:20 ` ndowens
@ 2020-12-13 23:24 ` ndowens
2020-12-14 1:07 ` sgn
6 siblings, 0 replies; 8+ messages in thread
From: ndowens @ 2020-12-13 23:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 313 bytes --]
New comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/27124#issuecomment-744086365
Comment:
> The cross build logs have a bunch of "couldn't execute file" lines. I guess they're harmless?
Not sure, I dont have access to another machine to test if it will run :\
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: splint: Fix cross-build
2020-12-13 18:56 [PR PATCH] splint: Fix cross-build ndowens
` (5 preceding siblings ...)
2020-12-13 23:24 ` ndowens
@ 2020-12-14 1:07 ` sgn
6 siblings, 0 replies; 8+ messages in thread
From: sgn @ 2020-12-14 1:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 3547 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/27124#issuecomment-744107600
Comment:
Without runnable splint, build system will pick the `lcd` files shipped by tarball.
Note that Debian puts those files in arch-dependent packages.
```diff
diff -Naur ./usr/share/splint/lib/posix.lcd /usr/share/splint/lib/posix.lcd
--- ./usr/share/splint/lib/posix.lcd 2020-12-14 07:57:30.000000000 +0700
+++ /usr/share/splint/lib/posix.lcd 2020-11-21 19:12:42.000000000 +0700
@@ -1223,7 +1223,7 @@
^13 13@c@-@0@0@0@0@61#__WCHAR_TYPE__
*1 (Constant)
^14 23$#__USER_LABEL_PREFIX__#__REGISTER_PREFIX__#__TIME__
-^17 5$#__STDC__#S_SPLINT_S#__LCLINT__#__i686
+^17 5$#__STDC__#S_SPLINT_S#__LCLINT__#__x86_64
*3 (Variable)
^21 380|@1|6@0@0@0@1#stdin#stdout
*1 (Constant)
diff -Naur ./usr/share/splint/lib/posixstrict.lcd /usr/share/splint/lib/posixstrict.lcd
--- ./usr/share/splint/lib/posixstrict.lcd 2020-12-14 07:57:30.000000000 +0700
+++ /usr/share/splint/lib/posixstrict.lcd 2020-11-21 19:12:42.000000000 +0700
@@ -1185,7 +1185,7 @@
^13 13@c@-@0@0@0@0@61#__WCHAR_TYPE__
*1 (Constant)
^14 23$#__USER_LABEL_PREFIX__#__REGISTER_PREFIX__#__TIME__
-^17 5$#__STDC__#S_SPLINT_S#__LCLINT__#__i686
+^17 5$#__STDC__#S_SPLINT_S#__LCLINT__#__x86_64
*3 (Variable)
^21 359|@1|6@0@0@0@2#stdin#stdout
*1 (Constant)
diff -Naur ./usr/share/splint/lib/standard.lcd /usr/share/splint/lib/standard.lcd
--- ./usr/share/splint/lib/standard.lcd 2020-12-14 07:57:30.000000000 +0700
+++ /usr/share/splint/lib/standard.lcd 2020-11-21 19:12:42.000000000 +0700
@@ -886,7 +886,7 @@
^13 13@c@-@0@0@0@0@61#__WCHAR_TYPE__
*1 (Constant)
^14 23$#__USER_LABEL_PREFIX__#__REGISTER_PREFIX__#__TIME__
-^17 5$#__STDC__#S_SPLINT_S#__LCLINT__#__i686
+^17 5$#__STDC__#S_SPLINT_S#__LCLINT__#__x86_64
*3 (Variable)
^21 380|@1|6@0@0@0@1#stdin#stdout
*1 (Constant)
diff -Naur ./usr/share/splint/lib/standardstrict.lcd /usr/share/splint/lib/standardstrict.lcd
--- ./usr/share/splint/lib/standardstrict.lcd 2020-12-14 07:57:30.000000000 +0700
+++ /usr/share/splint/lib/standardstrict.lcd 2020-11-21 19:12:42.000000000 +0700
@@ -842,7 +842,7 @@
^13 13@c@-@0@0@0@0@61#__WCHAR_TYPE__
*1 (Constant)
^14 23$#__USER_LABEL_PREFIX__#__REGISTER_PREFIX__#__TIME__
-^17 5$#__STDC__#S_SPLINT_S#__LCLINT__#__i686
+^17 5$#__STDC__#S_SPLINT_S#__LCLINT__#__x86_64
*3 (Variable)
^21 359|@1|6@0@0@0@2#stdin#stdout
*1 (Constant)
diff -Naur ./usr/share/splint/lib/unix.lcd /usr/share/splint/lib/unix.lcd
--- ./usr/share/splint/lib/unix.lcd 2020-12-14 07:57:30.000000000 +0700
+++ /usr/share/splint/lib/unix.lcd 2020-11-21 19:12:42.000000000 +0700
@@ -2218,7 +2218,7 @@
^13 13@c@-@0@0@0@0@61#__WCHAR_TYPE__
*1 (Constant)
^14 23$#__USER_LABEL_PREFIX__#__REGISTER_PREFIX__#__TIME__
-^17 5$#__STDC__#S_SPLINT_S#__LCLINT__#__i686
+^17 5$#__STDC__#S_SPLINT_S#__LCLINT__#__x86_64
*3 (Variable)
^21 380|@1|6@0@0@0@1#stdin#stdout
*1 (Constant)
diff -Naur ./usr/share/splint/lib/unixstrict.lcd /usr/share/splint/lib/unixstrict.lcd
--- ./usr/share/splint/lib/unixstrict.lcd 2020-12-14 07:57:30.000000000 +0700
+++ /usr/share/splint/lib/unixstrict.lcd 2020-11-21 19:12:42.000000000 +0700
@@ -2171,7 +2171,7 @@
^13 13@c@-@0@0@0@0@61#__WCHAR_TYPE__
*1 (Constant)
^14 23$#__USER_LABEL_PREFIX__#__REGISTER_PREFIX__#__TIME__
-^17 5$#__STDC__#S_SPLINT_S#__LCLINT__#__i686
+^17 5$#__STDC__#S_SPLINT_S#__LCLINT__#__x86_64
*3 (Variable)
^21 359|@1|6@0@0@0@2#stdin#stdout
*1 (Constant)
```
^ permalink raw reply [flat|nested] 8+ messages in thread