nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 06:53:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

rubyPackages.iconv: fix build with clang 16

Browse Source 
Fix incompatible function pointer conversion errors.
This commit is contained in:
Randy Eckenrode 2023-11-03 14:43:23 -04:00
parent 3c43b804d4
commit b4f75edb07
No known key found for this signature in database
GPG Key ID: 64C1CD4EC2A600D9
2 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/ruby-modules/gem-config/default.nix
View File

@ -369,7 +369,12 @@ in
};
iconv = attrs: {
dontBuild = false;
buildFlags = lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}";
patches = [
# Fix incompatible function pointer conversion errors with clang 16
./iconv-fix-incompatible-function-pointer-conversions.patch
];
};
idn-ruby = attrs: {

51
pkgs/development/ruby-modules/gem-config/iconv-fix-incompatible-function-pointer-conversions.patch Normal file
View File

@ -0,0 +1,51 @@
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 2801049..77fae7e 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -188,7 +188,7 @@ static VALUE iconv_convert _((iconv_t cd, VALUE str, long start, long length, in
static VALUE iconv_s_allocate _((VALUE klass));
static VALUE iconv_initialize _((int argc, VALUE *argv, VALUE self));
static VALUE iconv_s_open _((int argc, VALUE *argv, VALUE self));
-static VALUE iconv_s_convert _((struct iconv_env_t* env));
+static VALUE iconv_s_convert _((VALUE env));
static VALUE iconv_s_iconv _((int argc, VALUE *argv, VALUE self));
static VALUE iconv_init_state _((VALUE cd));
static VALUE iconv_finish _((VALUE self));
@@ -204,7 +204,7 @@ static VALUE charset_map;
* Returns the map from canonical name to system dependent name.
*/
static VALUE
-charset_map_get(void)
+charset_map_get(VALUE klass)
{
return charset_map;
}
@@ -642,7 +642,7 @@ iconv_s_allocate(VALUE klass)
}
static VALUE
-get_iconv_opt_i(VALUE i, VALUE arg)
+get_iconv_opt_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, arg))
{
VALUE name;
#if defined ICONV_SET_TRANSLITERATE || defined ICONV_SET_DISCARD_ILSEQ
@@ -784,8 +784,9 @@ iconv_s_open(int argc, VALUE *argv, VALUE self)
}
static VALUE
-iconv_s_convert(struct iconv_env_t* env)
+iconv_s_convert(VALUE env_value)
{
+ struct iconv_env_t* env = (struct iconv_env_t*)env_value;
VALUE last = 0;
for (; env->argc > 0; --env->argc, ++env->argv) {
@@ -906,7 +907,7 @@ list_iconv(unsigned int namescount, const char *const *names, void *data)
#if defined(HAVE_ICONVLIST) || defined(HAVE___ICONV_FREE_LIST)
static VALUE
-iconv_s_list(void)
+iconv_s_list(VALUE klass)
{
#ifdef HAVE_ICONVLIST
int state;