From nobody Wed Aug 17 16:46:47 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M7DSR3FkPz4Zsyw; Wed, 17 Aug 2022 16:46:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M7DSR2k96z3qWW; Wed, 17 Aug 2022 16:46:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660754807; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gplnHCpz96WpaC803viltAeDpGMCxxpveabCD0HvAvw=; b=dNeqKVFJqsuEXyokqxvvNh+9ZehpY8YSip6n71ELhe6Xam+cVTCm9GFIYzHd/b2yZuqi5W BX66/psytpBfVs3y6Y6kbszNmAyO6BefWTnTzH8s4VYLYuDZsVMlH/lW80pBuwUkuXnzFu 5IWelOwFoAY7+ALVOb+rW6V/CqIrJaVg2rlmrlVKwJZJBfSmPYXkOl0lkhdxkUoqvvu1BD YxGl9fG1AOCq8nF1o/BdC4pIh0q1ZfmpSi7DK6c7dHq75+eiL5E+5NasrmKctztcNBtk2I DNhpHu9R7Fau+PSfAoS6xr50PHnlsoYO7to/zqUaULFyq0fhqvObzGeabxO99w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4M7DSR1mNZzwct; Wed, 17 Aug 2022 16:46:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27HGklVq027454; Wed, 17 Aug 2022 16:46:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27HGklFx027453; Wed, 17 Aug 2022 16:46:47 GMT (envelope-from git) Date: Wed, 17 Aug 2022 16:46:47 GMT Message-Id: <202208171646.27HGklFx027453@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: f8275f75cd90 - 2022Q3 - devel/ctypes.sh: Add missing patches List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q3 X-Git-Reftype: branch X-Git-Commit: f8275f75cd903e78a3110e61f6b20edc64f38231 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660754807; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gplnHCpz96WpaC803viltAeDpGMCxxpveabCD0HvAvw=; b=lb4uu5f4HZTErCr1hLQnCMw7HSluizWDk29okpwulTVyVBVz/xXKC3omRAtAwVxiGyo8vX MAxIdTT5lWV9Av0k9OYW0J0fmQDMy3WvoczLacqikEoo4GAJ8oDlaZ7ScZWUC6UkD9by3S 43JII/bny7XFwiVDRmqOciem4u4YcaybNkHlOne8MoWpSKmoaeMiWLa7oV2yFEDh+g5TAn VtFWQIpQyUKhfH9Rcv4o2rlmpVeGSY3ZWUrWlgjmmcIHWFHWdwt8RJ5umPAD3USR3VKBSK fGLgb2KoC0x+HOedHwuf4H1IFQG705RwAa60XzWb6ON9Hkv4FPq+4ve95+rSAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660754807; a=rsa-sha256; cv=none; b=wYp9IcoxqkrS/tSat8jOOvSdoqqrl1AnCJWDB0+HWPIt+MQV2rvf3821FKAAQOGnSxc4d4 Y8GGOHNFE8nU0Obe6cvcx526ht1zyHWJ8bRhxsiS9J/HS22WEn8Kx1TZdUUY8S8ANHssdm pSJqLovgM9WmeKy1DIisuuhZCPX7GEtUdhxx0fvxQronCRhZRtH9PwQnDNA/4M7oDKCQvk TYR5WedBTRdW2gILhG5xhF8xpwVCDYoaBCPGwaulWHklX198rqwHnzwGYxiakNWlioe7/u TZncz6/LrwMGliB26Jtti+gBp5F4sRNrOdyrAe8nxkO3LW7kgfQ7iFqhMxMXFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=f8275f75cd903e78a3110e61f6b20edc64f38231 commit f8275f75cd903e78a3110e61f6b20edc64f38231 Author: Fernando Apesteguía AuthorDate: 2022-08-17 16:40:36 +0000 Commit: Fernando Apesteguía CommitDate: 2022-08-17 16:43:30 +0000 devel/ctypes.sh: Add missing patches Add patches missing from last update. PR: 265318 Fixes: 79f9679c7e795de9a15451910526cea3ea50c21f (cherry picked from commit 505d19cfeea99671eecfa7a151e2665eece96a5f) --- devel/ctypes.sh/files/patch-configure.ac | 20 ++++++++++++++++++++ devel/ctypes.sh/files/patch-include_builtins.h | 13 +++++++++++++ devel/ctypes.sh/files/patch-src_callback.c | 11 +++++++++++ devel/ctypes.sh/files/patch-src_unpack.c | 11 +++++++++++ 4 files changed, 55 insertions(+) diff --git a/devel/ctypes.sh/files/patch-configure.ac b/devel/ctypes.sh/files/patch-configure.ac new file mode 100644 index 000000000000..f036749e8e85 --- /dev/null +++ b/devel/ctypes.sh/files/patch-configure.ac @@ -0,0 +1,20 @@ +--- configure.ac.orig 2020-07-08 18:26:35 UTC ++++ configure.ac +@@ -32,6 +32,7 @@ AC_CHECK_FUNCS([gelf_getehdr dwfl_version dl_iterate_p + disable_struct_support=yes; + AC_MSG_WARN([a function needed for struct support was not found]) + ]) ++AC_CHECK_FUNCS([mempcpy]) + AC_CHECK_HEADER_STDBOOL + AC_PROG_CC + AC_FUNC_ALLOCA +@@ -152,6 +153,9 @@ AS_IF([test "x$disable_struct_support" == "xyes"], [ + AC_SUBST([struct], [struct]) + AC_SUBST([sizeof], [sizeof]) + ]) ++ ++# replace include/config.h ++AC_DEFINE([ARRAY_VARS], [1], [Enable array variable support]) + + AC_SUBST([soext], [$shrext_cmds]) + AC_CONFIG_FILES([Makefile src/Makefile ctypes.sh]) diff --git a/devel/ctypes.sh/files/patch-include_builtins.h b/devel/ctypes.sh/files/patch-include_builtins.h new file mode 100644 index 000000000000..812498cbebf5 --- /dev/null +++ b/devel/ctypes.sh/files/patch-include_builtins.h @@ -0,0 +1,13 @@ +--- include/builtins.h.orig 2022-07-19 16:57:21 UTC ++++ include/builtins.h +@@ -18,7 +18,10 @@ + along with Bash. If not, see . + */ + ++#define ARRAY_VARS 1 ++#ifdef HAVE_CONFIG_H + #include "config.h" ++#endif + + #if defined (HAVE_UNISTD_H) + # ifdef _MINIX diff --git a/devel/ctypes.sh/files/patch-src_callback.c b/devel/ctypes.sh/files/patch-src_callback.c new file mode 100644 index 000000000000..2e7f0ec22fec --- /dev/null +++ b/devel/ctypes.sh/files/patch-src_callback.c @@ -0,0 +1,11 @@ +--- src/callback.c.orig 2022-07-19 17:26:18 UTC ++++ src/callback.c +@@ -82,7 +82,7 @@ static int generate_native_callback(WORD_LIST *list) + ffi_type *callbacktype; + char **proto; + char *resultname = "DLRETVAL"; +- char opt; ++ int opt; + reset_internal_getopt(); + + while ((opt = internal_getopt(list, "d:n:")) != -1) { diff --git a/devel/ctypes.sh/files/patch-src_unpack.c b/devel/ctypes.sh/files/patch-src_unpack.c new file mode 100644 index 000000000000..0267ffa08e83 --- /dev/null +++ b/devel/ctypes.sh/files/patch-src_unpack.c @@ -0,0 +1,11 @@ +--- src/unpack.c.orig 2022-07-19 16:33:30 UTC ++++ src/unpack.c +@@ -22,7 +22,7 @@ + #include "types.h" + #include "shell.h" + +-#if !defined(__GLIBC__) && !defined(__NEWLIB__) ++#if !defined(HAVE_MEMPCPY) + static inline void *mempcpy(void *dest, const void *src, size_t n) + { + memcpy(dest, src, n);