From 8d64ae169b4d04b551022916c3dafbc54da8a2ee Mon Sep 17 00:00:00 2001 From: Hernan Martinez Date: Wed, 27 Sep 2023 02:33:40 -0600 Subject: [PATCH] Add missing ctype.h and enable aarch64 builds --- mingw-w64-argtable/001-missing-ctype.patch | 11 ++++++++++ .../002-recognize-aarch64.patch | 21 +++++++++++++++++++ mingw-w64-argtable/PKGBUILD | 18 +++++++++++----- 3 files changed, 45 insertions(+), 5 deletions(-) create mode 100644 mingw-w64-argtable/001-missing-ctype.patch create mode 100644 mingw-w64-argtable/002-recognize-aarch64.patch diff --git a/mingw-w64-argtable/001-missing-ctype.patch b/mingw-w64-argtable/001-missing-ctype.patch new file mode 100644 index 0000000000..db9a234746 --- /dev/null +++ b/mingw-w64-argtable/001-missing-ctype.patch @@ -0,0 +1,11 @@ +diff -Naur argtable2-13/src/arg_int.c argtable2-13-mod/src/arg_int.c +--- argtable2-13/src/arg_int.c 2023-09-27 02:23:18.210986500 -0600 ++++ argtable2-13-mod/src/arg_int.c 2023-09-27 02:17:04.986336900 -0600 +@@ -30,6 +30,7 @@ + + #include "argtable2.h" + #include ++#include + + /* local error codes */ + enum {EMINCOUNT=1,EMAXCOUNT,EBADINT,MYEOVERFLOW}; diff --git a/mingw-w64-argtable/002-recognize-aarch64.patch b/mingw-w64-argtable/002-recognize-aarch64.patch new file mode 100644 index 0000000000..a3daac99b1 --- /dev/null +++ b/mingw-w64-argtable/002-recognize-aarch64.patch @@ -0,0 +1,21 @@ +diff -aur argtable2-13-orig/config.sub argtable2-13/config.sub +--- argtable2-13-orig/config.sub 2009-04-10 06:10:34.000000000 -0600 ++++ argtable2-13/config.sub 2023-09-27 02:44:29.706214200 -0600 +@@ -284,7 +284,7 @@ + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. +- i*86 | x86_64) ++ i*86 | x86_64 | aarch64) + basic_machine=$basic_machine-pc + ;; + # Object if more than one company name word. +@@ -346,7 +346,7 @@ + | tron-* \ + | v850-* | v850e-* | vax-* \ + | we32k-* \ +- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ ++ | x86-* | x86_64-* | aarch64-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa-* \ + | ymp-* \ + | z8k-*) diff --git a/mingw-w64-argtable/PKGBUILD b/mingw-w64-argtable/PKGBUILD index f19ad748a8..bdd60c532d 100644 --- a/mingw-w64-argtable/PKGBUILD +++ b/mingw-w64-argtable/PKGBUILD @@ -5,21 +5,29 @@ pkgbase="mingw-w64-${_realname}" pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.13 intver=${pkgver//./-} -pkgrel=2 +pkgrel=3 pkgdesc="ANSI C library for parsing GNU-style command-line options (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') license=("custom") url="https://argtable.sourceforge.io" -source=("https://downloads.sourceforge.net/project/argtable/argtable/${_realname}-${pkgver}/${_realname}${intver}.tar.gz") -sha256sums=('8f77e8a7ced5301af6e22f47302fdbc3b1ff41f2b83c43c77ae5ca041771ddbf') -makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-autotools") +source=("https://downloads.sourceforge.net/project/argtable/argtable/${_realname}-${pkgver}/${_realname}${intver}.tar.gz" + "001-missing-ctype.patch" + "002-recognize-aarch64.patch") +sha256sums=('8f77e8a7ced5301af6e22f47302fdbc3b1ff41f2b83c43c77ae5ca041771ddbf' + 'e487bf08f7d3d400e6a39f730da5af3ecd2ea239ccee348d5fc97881a9e76520' + '4d635e457283396e381964c232097a1c4423ad611afd4411390f03d04e2c3cc6') +makedepends=("${MINGW_PACKAGE_PREFIX}-cc" + "${MINGW_PACKAGE_PREFIX}-autotools") options=('staticlibs' 'strip') prepare() { cd "${srcdir}"/${_realname}${intver} sed -i.bak 's/EOVERFLOW/MYEOVERFLOW/g' src/arg_int.c + + patch -Np1 -i "${srcdir}/001-missing-ctype.patch" + patch -Np1 -i "${srcdir}/002-recognize-aarch64.patch" } build() {