Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gnucobol: switch json dependency #22134

Merged
merged 1 commit into from
Oct 8, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions mingw-w64-gnucobol/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ _realname=gnucobol
pkgbase=mingw-w64-${_realname}
pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
pkgver=3.2
pkgrel=2
pkgrel=3
epoch=1
pkgdesc="GnuCOBOL, a free and modern COBOL compiler (mingw-w64)"
conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}-svn" "${MINGW_PACKAGE_PREFIX}-gnu-cobol-svn")
Expand All @@ -17,13 +17,13 @@ url="https://www.gnu.org/software/gnucobol/"
msys2_references=(
"cpe: cpe:/a:gnucobol_project:gnucobol"
)
license=('spdx:GPL-3.0-or-later AND spdx:LGPL-3.0-only')
license=('spdx:GPL-3.0-or-later AND LGPL-3.0-or-later AND GFDL-1.3-or-later')
# note: the final binaries will call cc, therefore it is a dependency
depends=("${MINGW_PACKAGE_PREFIX}-cc"
"${MINGW_PACKAGE_PREFIX}-gmp"
"${MINGW_PACKAGE_PREFIX}-gettext-runtime"
"${MINGW_PACKAGE_PREFIX}-ncurses"
"${MINGW_PACKAGE_PREFIX}-cjson"
"${MINGW_PACKAGE_PREFIX}-json-c"
"${MINGW_PACKAGE_PREFIX}-libxml2"
"${MINGW_PACKAGE_PREFIX}-db")

Expand All @@ -35,15 +35,15 @@ depends=("${MINGW_PACKAGE_PREFIX}-cc"
# "${MINGW_PACKAGE_PREFIX}-json-c: support for JSON GENERATE"
# "${MINGW_PACKAGE_PREFIX}-libxml2: support for XML GENERATE")
makedepends=("${MINGW_PACKAGE_PREFIX}-autotools" "${MINGW_PACKAGE_PREFIX}-gettext-tools")
# Note: it actually needs the one from the build environment (MSYS)
# Note: "make test" actually needs a version from the build environment (MSYS)
checkdepends=(perl)

# local definitions
#source=("https://alpha.gnu.org/gnu/${_realname}/${_realname}-${pkgver}.tar.xz"{,.sig}
source=("https://ftp.gnu.org/gnu/${_realname}/${_realname}-${pkgver}.tar.xz"{,.sig}
"cobenv.sh"
"cobenv.cmd"
"https://www.itl.nist.gov/div897/ctg/suites/newcob.val.Z"
"https://web.archive.org/web/20240322143655if_/https://www.itl.nist.gov/div897/ctg/suites/newcob.val.Z"
0001-gnucobol-extras-include-srcdir.patch
)
sha256sums=('3bb48af46ced4779facf41fdc2ee60e4ccb86eaa99d010b36685315df39c2ee2'
Expand Down Expand Up @@ -71,7 +71,7 @@ build() {
CPPLAGS="-D__USE_MINGW_ANSI_STDIO=1" \
PERL="/usr/bin/perl" \
--with-db --without-vbisam --without-disam --without-cisam \
--with-xml2 --with-json=cjson --with-curses=ncursesw \
--with-xml2 --with-json=json-c --with-curses=ncursesw \
--build=${MINGW_CHOST} \
--host=${MINGW_CHOST} \
--target=${MINGW_CHOST} \
Expand Down