Github messages for voidlinux
 help / color / mirror / Atom feed
From: cinerea0 <cinerea0@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] gnucobol: update to 3.2
Date: Wed, 23 Aug 2023 01:24:55 +0200	[thread overview]
Message-ID: <20230822232455.jqgvrIr2Pw_8txxxh1219SPXmi2K6-yTaP0PO48J1eA@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-45629@inbox.vuxu.org>

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

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

https://github.com/cinerea0/void-packages cobol
https://github.com/void-linux/void-packages/pull/45629

gnucobol: update to 3.2
#### Testing the changes
- I tested the changes in this PR: **briefly**

I am reaching out to a more experienced user of this package for testing. Closes #45612.

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

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

From 97c93425873dcc7d7f578f7ba73b1dde7e9ce66d Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 22 Aug 2023 19:24:38 -0400
Subject: [PATCH] gnucobol: update to 3.2

---
 srcpkgs/gnucobol/patches/cross.patch | 14 ++++++++++
 srcpkgs/gnucobol/template            | 40 ++++++++++++++++++++++------
 2 files changed, 46 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/gnucobol/patches/cross.patch

diff --git a/srcpkgs/gnucobol/patches/cross.patch b/srcpkgs/gnucobol/patches/cross.patch
new file mode 100644
index 0000000000000..5ce3109885fc3
--- /dev/null
+++ b/srcpkgs/gnucobol/patches/cross.patch
@@ -0,0 +1,14 @@
+diff --git a/extras/Makefile.am b/extras/Makefile.am
+index d3a800f49a..324575ad4d 100644
+--- a/extras/Makefile.am
++++ b/extras/Makefile.am
+@@ -20,9 +20,7 @@
+ # along with GnuCOBOL.  If not, see <https://www.gnu.org/licenses/>.
+ 
+ extrasdir = @COB_LIBRARY_PATH@
+-if COB_MAKE_RUN_BINARIES
+ extras_DATA = CBL_OC_DUMP.$(COB_MODULE_EXT)
+-endif
+ COBC = cobc$(EXEEXT)
+ 
+ EXTRA_DIST = CBL_OC_DUMP.cob
diff --git a/srcpkgs/gnucobol/template b/srcpkgs/gnucobol/template
index 4519ea7867249..bc07075f47698 100644
--- a/srcpkgs/gnucobol/template
+++ b/srcpkgs/gnucobol/template
@@ -1,19 +1,43 @@
 # Template file for 'gnucobol'
 pkgname=gnucobol
-version=3.1.2
+version=3.2
 revision=1
 build_style=gnu-configure
-make_check_target="test"
-makedepends="gmp-devel db-devel"
+build_helper=qemu
+configure_args="--disable-hardening"
+hostmakedepends="automake gettext-devel-tools libtool pkg-config"
+makedepends="db-devel gmp-devel json-c-devel libxml2-devel ncurses-devel"
 depends="gnucobol-libs>=${version}_${revision}"
-checkdepends="curl perl wget which"
+checkdepends="curl perl which"
 short_desc="GnuCOBOL (formerly OpenCOBOL) is a free COBOL compiler"
 maintainer="Cthulhux <git@tuxproject.de>"
 license="GPL-3.0-or-later"
-homepage="https://sourceforge.net/projects/open-cobol/"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=f38c60b38a9e404bcba709b61b46f2bafa146b5f3dd90a94b2a70f5cea2f6297
-nocross="https://build.voidlinux.org/builders/armv7l-musl_builder/builds/7152/steps/shell_3/logs/stdio"
+homepage="https://www.gnu.org/software/gnucobol/"
+distfiles="${GNU_SITE}/gnucobol/gnucobol-${version}.tar.xz"
+checksum=3bb48af46ced4779facf41fdc2ee60e4ccb86eaa99d010b36685315df39c2ee2
+
+pre_configure() {
+	autoreconf -fi
+}
+
+post_configure() {
+	if [ "${CROSS_BUILD}" ]; then
+		vsed -i libtool \
+			-e 's|exec \\"\\$progdir/\\$program\\"|exec /usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static \\"\\$progdir/\\$program\\"|'
+	fi
+}
+
+post_build() {
+	if [ "${CROSS_BUILD}" ]; then
+		vsed -i "bin/cob-config" \
+			-e "s|-I${XBPS_CROSS_BASE}/usr/include|-I/usr/include|"
+	fi 
+}
+
+do_check() {
+	TERM=xterm make check
+	make test
+}
 
 gnucobol-libs_package() {
 	short_desc+=" - runtime libraries"

  parent reply	other threads:[~2023-08-22 23:24 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-17  2:50 [PR PATCH] " cinerea0
2023-08-17  3:17 ` [PR PATCH] [Updated] " cinerea0
2023-08-17  3:28 ` cinerea0
2023-08-17 20:03 ` GitMensch
2023-08-17 20:39 ` cinerea0
2023-08-17 20:42 ` GitMensch
2023-08-18  2:23 ` cinerea0
2023-08-18  3:10 ` cinerea0
2023-08-18  5:14 ` GitMensch
2023-08-22 23:24 ` cinerea0 [this message]
2023-08-22 23:26 ` [PR PATCH] [Updated] " cinerea0
2023-08-23  5:12 ` GitMensch
2023-08-23  5:35 ` GitMensch
2023-08-23  7:00 ` GitMensch
2023-08-25  5:24 ` GitMensch
2023-08-26 18:02 ` [PR PATCH] [Updated] " cinerea0
2023-09-23 13:32 ` [PR PATCH] [Merged]: " Duncaen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230822232455.jqgvrIr2Pw_8txxxh1219SPXmi2K6-yTaP0PO48J1eA@z \
    --to=cinerea0@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).