Re: [PR PATCH] [Updated] cvs: fix cross.

[fosslinux <fosslinux@users.noreply.github.com>]

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

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

https://github.com/fosslinux/void-packages cvs-cross
https://github.com/void-linux/void-packages/pull/27528

cvs: fix cross.
The check evaluates to null anyway.

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

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

From f14e33c07221d7e9625f599de5a548ff9fcb0437 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Tue, 29 Dec 2020 21:37:39 +1100
Subject: [PATCH] cvs: fix cross, xlintify.

---
 srcpkgs/cvs/patches/cross.patch | 77 +++++++++++++++++++++++++++++++++
 srcpkgs/cvs/template            |  2 +-
 2 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/cvs/patches/cross.patch

diff --git a/srcpkgs/cvs/patches/cross.patch b/srcpkgs/cvs/patches/cross.patch
new file mode 100644
index 00000000000..b3d882ec477
--- /dev/null
+++ b/srcpkgs/cvs/patches/cross.patch
@@ -0,0 +1,77 @@
+This check fails on cross, it produces false on host, so we just skip it
+entirely.
+
+--- configure	2020-12-28 15:47:57.495364388 +1100
++++ configure	2020-12-28 15:48:45.881677930 +1100
+@@ -36944,71 +36944,6 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether printf supports %p" >&5
+-echo $ECHO_N "checking whether printf supports %p... $ECHO_C" >&6
+-if test "${cvs_cv_func_printf_ptr+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <stdio.h>
+-/* If printf supports %p, exit 0. */
+-int
+-main ()
+-{
+-  void *p1, *p2;
+-  char buf[256];
+-  p1 = &p1; p2 = &p2;
+-  sprintf(buf, "%p", p1);
+-  exit(sscanf(buf, "%p", &p2) != 1 || p2 != p1);
+-}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  cvs_cv_func_printf_ptr=yes
+-else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-cvs_cv_func_printf_ptr=no
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-rm -f core core.* *.core
+-fi
+-echo "$as_me:$LINENO: result: $cvs_cv_func_printf_ptr" >&5
+-echo "${ECHO_T}$cvs_cv_func_printf_ptr" >&6
+-if test $cvs_cv_func_printf_ptr = yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_PRINTF_PTR 1
+-_ACEOF
+-
+-fi
+-
+-
+ # Try to find connect and gethostbyname.
+ 
+ echo "$as_me:$LINENO: checking for main in -lnsl" >&5
diff --git a/srcpkgs/cvs/template b/srcpkgs/cvs/template
index c37384b5430..8de9d79e764 100644
--- a/srcpkgs/cvs/template
+++ b/srcpkgs/cvs/template
@@ -10,7 +10,7 @@ makedepends="mit-krb5-devel openssh"
 depends="openssh>=6.1p1"
 short_desc="Concurrent Versions System"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-1.0-or-later, LGPL-2.0-or-later"
 homepage="http://www.nongnu.org/cvs/"
-license="GPL-1, LGPL-2"
 distfiles="http://ftp.gnu.org/non-gnu/cvs/source/feature/$version/cvs-$version.tar.bz2"
 checksum=78853613b9a6873a30e1cc2417f738c330e75f887afdaf7b3d0800cb19ca515e