summaryrefslogtreecommitdiff
path: root/dev-scheme/c-wrapper
diff options
context:
space:
mode:
authorroot <root@alpha.trunkmasters.com>2026-06-12 19:09:37 -0500
committerroot <root@alpha.trunkmasters.com>2026-06-12 19:09:37 -0500
commitb590c8d7572b727d565cc0b8ff660d43569845de (patch)
tree06f7a4102ea4e845df8b66660f252920d52952f9 /dev-scheme/c-wrapper
parent24f9cbfc4c34fdb6a6e03311674414e881ceab47 (diff)
downloadbaldeagleos-repo-b590c8d7572b727d565cc0b8ff660d43569845de.tar.gz
baldeagleos-repo-b590c8d7572b727d565cc0b8ff660d43569845de.tar.xz
baldeagleos-repo-b590c8d7572b727d565cc0b8ff660d43569845de.zip
Adding metadata
Diffstat (limited to 'dev-scheme/c-wrapper')
-rw-r--r--dev-scheme/c-wrapper/Manifest1
-rw-r--r--dev-scheme/c-wrapper/c-wrapper-0.6.1-r2.ebuild53
-rw-r--r--dev-scheme/c-wrapper/c-wrapper-0.6.1-r3.ebuild54
-rw-r--r--dev-scheme/c-wrapper/files/c-wrapper-clang.patch71
-rw-r--r--dev-scheme/c-wrapper/files/c-wrapper-closure.patch10
-rw-r--r--dev-scheme/c-wrapper/files/c-wrapper-extend-parser.patch142
-rw-r--r--dev-scheme/c-wrapper/files/c-wrapper-float128.patch79
-rw-r--r--dev-scheme/c-wrapper/files/c-wrapper-gauche-abi-0.98.patch62
-rw-r--r--dev-scheme/c-wrapper/files/c-wrapper-gcc-15.patch24
-rw-r--r--dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch43
-rw-r--r--dev-scheme/c-wrapper/files/c-wrapper-gentoo.patch51
-rw-r--r--dev-scheme/c-wrapper/files/c-wrapper-glibc-2.25.patch13
-rw-r--r--dev-scheme/c-wrapper/files/c-wrapper-info.patch66
-rw-r--r--dev-scheme/c-wrapper/files/c-wrapper-local-typedef.patch149
-rw-r--r--dev-scheme/c-wrapper/files/c-wrapper-texinfo-6.7.patch34
-rw-r--r--dev-scheme/c-wrapper/metadata.xml9
16 files changed, 861 insertions, 0 deletions
diff --git a/dev-scheme/c-wrapper/Manifest b/dev-scheme/c-wrapper/Manifest
new file mode 100644
index 000000000000..885d443f83a9
--- /dev/null
+++ b/dev-scheme/c-wrapper/Manifest
@@ -0,0 +1 @@
+DIST c-wrapper-0.6.1.tgz 843981 BLAKE2B af28cf60eebe0da32c90c030bfdae4457d20731c31220f7eaac33291ea1be104a7aab11fad0560fe6e3d36a5d3afafbd8795fddd633e0c26be226c29012afbc9 SHA512 a03a4d57d112d2c23dac3716bae081e3e6f02dcef261bd8dd518ed8519b43e28f9e61a36f7584b2bcb1762112c128d0b698cda422cc0c9d1190cbf7502ea04b0
diff --git a/dev-scheme/c-wrapper/c-wrapper-0.6.1-r2.ebuild b/dev-scheme/c-wrapper/c-wrapper-0.6.1-r2.ebuild
new file mode 100644
index 000000000000..9addd53b433f
--- /dev/null
+++ b/dev-scheme/c-wrapper/c-wrapper-0.6.1-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit autotools
+
+DESCRIPTION="Foreign function interface for C and Objective-C libraries"
+HOMEPAGE="http://www.koguro.net/prog/c-wrapper/"
+SRC_URI="http://www.koguro.net/prog/${PN}/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="examples"
+
+RDEPEND="dev-scheme/gauche:=
+ dev-libs/libffi:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-closure.patch
+ "${FILESDIR}"/${PN}-gauche-abi-0.98.patch
+ "${FILESDIR}"/${PN}-gcc-5.patch
+ "${FILESDIR}"/${PN}-gentoo.patch
+ "${FILESDIR}"/${PN}-glibc-2.25.patch
+ "${FILESDIR}"/${PN}-info.patch
+ "${FILESDIR}"/${PN}-texinfo-6.7.patch
+ "${FILESDIR}"/${PN}-clang.patch
+ "${FILESDIR}"/${PN}-float128.patch
+ "${FILESDIR}"/${PN}-local-typedef.patch
+ "${FILESDIR}"/${PN}-extend-parser.patch
+)
+HTML_DOCS=( doc/${PN}-ref{e,j}.html )
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_test() {
+ emake -j1 -s check
+}
+
+src_install() {
+ default
+
+ if use examples; then
+ docompress -x /usr/share/doc/${PF}/examples
+ dodoc -r examples
+ fi
+}
diff --git a/dev-scheme/c-wrapper/c-wrapper-0.6.1-r3.ebuild b/dev-scheme/c-wrapper/c-wrapper-0.6.1-r3.ebuild
new file mode 100644
index 000000000000..5b4ff185032a
--- /dev/null
+++ b/dev-scheme/c-wrapper/c-wrapper-0.6.1-r3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit autotools
+
+DESCRIPTION="Foreign function interface for C and Objective-C libraries"
+HOMEPAGE="http://www.koguro.net/prog/c-wrapper/"
+SRC_URI="http://www.koguro.net/prog/${PN}/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="dev-scheme/gauche:=
+ dev-libs/libffi:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-closure.patch
+ "${FILESDIR}"/${PN}-gauche-abi-0.98.patch
+ "${FILESDIR}"/${PN}-gcc-5.patch
+ "${FILESDIR}"/${PN}-gentoo.patch
+ "${FILESDIR}"/${PN}-glibc-2.25.patch
+ "${FILESDIR}"/${PN}-info.patch
+ "${FILESDIR}"/${PN}-texinfo-6.7.patch
+ "${FILESDIR}"/${PN}-clang.patch
+ "${FILESDIR}"/${PN}-float128.patch
+ "${FILESDIR}"/${PN}-local-typedef.patch
+ "${FILESDIR}"/${PN}-extend-parser.patch
+ "${FILESDIR}"/${PN}-gcc-15.patch
+)
+HTML_DOCS=( doc/${PN}-ref{e,j}.html )
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_test() {
+ emake -j1 -s check
+}
+
+src_install() {
+ default
+
+ if use examples; then
+ docompress -x /usr/share/doc/${PF}/examples
+ dodoc -r examples
+ fi
+}
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-clang.patch b/dev-scheme/c-wrapper/files/c-wrapper-clang.patch
new file mode 100644
index 000000000000..ba39e74df9cf
--- /dev/null
+++ b/dev-scheme/c-wrapper/files/c-wrapper-clang.patch
@@ -0,0 +1,71 @@
+--- a/src/c-parser.c
++++ b/src/c-parser.c
+@@ -1667,14 +1667,25 @@
+ ScmObj Scm_ParseMacroCode(ScmObj in, ScmObj macro_list)
+ {
+ static ScmObj trigger_line = SCM_FALSE;
++ static ScmObj is_gcc = SCM_TRUE;
+ ScmObj line_str;
+ ScmObj rx;
++ int n = 0;
++ int i;
+
+ /* skip the first line '# 1 "<stdin>"' */
+ Scm_ReadLineUnsafe(SCM_PORT(in));
+
+ if (SCM_FALSEP(trigger_line)) {
+- trigger_line = SCM_MAKE_STR_IMMUTABLE("# 1 \"<stdin>\"");
++ ScmObj gcc = Scm_GlobalVariableRef(SCM_FIND_MODULE(CPARSER_MODULE_NAME, TRUE), SCM_SYMBOL(SCM_INTERN("GCC")), 0);
++ if (SCM_INTP(Scm_StringScanRight(SCM_STRING(gcc), SCM_STRING(SCM_MAKE_STR_IMMUTABLE("gcc")), SCM_STRING_SCAN_INDEX))) {
++ trigger_line = SCM_MAKE_STR_IMMUTABLE("# 1 \"<stdin>\"");
++ } else if (SCM_INTP(Scm_StringScanRight(SCM_STRING(gcc), SCM_STRING(SCM_MAKE_STR_IMMUTABLE("clang")), SCM_STRING_SCAN_INDEX))) {
++ trigger_line = SCM_MAKE_STR_IMMUTABLE("# 1 \"<stdin>\" 2");
++ is_gcc = SCM_FALSE;
++ } else {
++ Scm_Error("unknown compiler");
++ }
+ }
+
+ while (!SCM_EOFP(line_str = Scm_ReadLineUnsafe(SCM_PORT(in)))) {
+@@ -1683,22 +1694,33 @@
+ }
+ }
+
+- rx = Scm_RegComp(SCM_STRING(SCM_MAKE_STR_IMMUTABLE("^#\\s+\\d+\\s+\"<stdin>\"")), 0);
++ rx = Scm_RegComp(SCM_STRING(SCM_MAKE_STR_IMMUTABLE("^#\\s+(\\d+)\\s+\"<stdin>\"")), 0);
+ line_str = Scm_ReadLineUnsafe(SCM_PORT(in));
+- while (!SCM_EOFP(line_str)) {
+- ScmObj body_str = line_str;
++ for (i = 1; !SCM_EOFP(line_str); i++) {
++ ScmObj body_str;
++ ScmObj rm;
++ if (i < n) {
++ body_str = SCM_MAKE_STR_IMMUTABLE("");
++ goto parse;
++ }
++ body_str = line_str;
+ while (!SCM_EOFP(line_str = Scm_ReadLineUnsafe(SCM_PORT(in)))
+ && SCM_STRING_LENGTH(line_str) >= 13
+ #ifdef SCM_REGEXP_MULTI_LINE
+- && SCM_REGMATCHP(Scm_RegExec(SCM_REGEXP(rx), SCM_STRING(line_str), SCM_UNDEFINED, SCM_UNDEFINED))) {
++ && SCM_REGMATCHP(rm = Scm_RegExec(SCM_REGEXP(rx), SCM_STRING(line_str), SCM_UNDEFINED, SCM_UNDEFINED))) {
+ #else
+- && SCM_REGMATCHP(Scm_RegExec(SCM_REGEXP(rx), SCM_STRING(line_str)))) {
++ && SCM_REGMATCHP(rm = Scm_RegExec(SCM_REGEXP(rx), SCM_STRING(line_str)))) {
+ #endif
+- if (SCM_EOFP(line_str = Scm_ReadLineUnsafe(SCM_PORT(in)))) {
+- Scm_Error("[bug] unexpected EOF while parsing macro body");
++ if (SCM_TRUEP(is_gcc)) {
++ if (SCM_EOFP(line_str = Scm_ReadLineUnsafe(SCM_PORT(in)))) {
++ Scm_Error("[bug] unexpected EOF while parsing macro body");
++ }
++ body_str = Scm_StringAppend2(SCM_STRING(body_str), SCM_STRING(line_str));
++ } else {
++ n = SCM_INT_VALUE(Scm_StringToNumber(SCM_STRING(Scm_RegMatchSubstr(SCM_REGMATCH(rm), SCM_MAKE_INT(1))), 10, 0));
+ }
+- body_str = Scm_StringAppend2(SCM_STRING(body_str), SCM_STRING(line_str));
+ }
++parse:
+ if (SCM_NULLP(macro_list)) {
+ Scm_Error("[bug] lost macro body");
+ } else {
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-closure.patch b/dev-scheme/c-wrapper/files/c-wrapper-closure.patch
new file mode 100644
index 000000000000..24be1d052fd7
--- /dev/null
+++ b/dev-scheme/c-wrapper/files/c-wrapper-closure.patch
@@ -0,0 +1,10 @@
+--- a/src/closure_alloc.c
++++ b/src/closure_alloc.c
+@@ -100,6 +100,7 @@
+ ++(node->n);
+ return;
+ }
++ node = node->next;
+ }
+
+ node = malloc(sizeof(FreeNode));
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-extend-parser.patch b/dev-scheme/c-wrapper/files/c-wrapper-extend-parser.patch
new file mode 100644
index 000000000000..998938a2c428
--- /dev/null
+++ b/dev-scheme/c-wrapper/files/c-wrapper-extend-parser.patch
@@ -0,0 +1,142 @@
+https://aur.archlinux.org/cgit/aur.git/tree/14_extend_parser.patch?h=gauche-c-wrapper
+
+Description: Include __int128, make statements before delcarations in functions possible and add some workaround to load x86intrin.h successfully.
+Author: Fabian Brosda <fabi3141@gmx.de>
+Last-Update: 2020-07-10
+
+--- a/lib/c-wrapper/c-parser.scm
++++ b/lib/c-wrapper/c-parser.scm
+@@ -181,6 +181,26 @@
+ ,@(reverse init-list)
+ ,@statements)))
+
++(define-maybe (%COMPOUND-STATEMENT-WITH-DECLARATION-EXT statements-before declaration-list statements)
++ (let ((var-list '())
++ (init-list '()))
++ (for-each (lambda (declaration)
++ (let* ((type (type-of declaration))
++ (identifier (name-of declaration))
++ (init-val (value-of declaration)))
++ ;; TODO: typedef in compound_statement is not supported
++ (push! var-list `(,identifier (make ,type)))
++ (when init-val
++ (push! init-list
++ `(set! ((with-module c-wrapper.c-ffi ref) ,identifier)
++ ,init-val)))))
++ declaration-list)
++ `(begin
++ ,@statements-before
++ (let* ,(reverse var-list)
++ ,@(reverse init-list)
++ ,@statements))))
++
+ (define-maybe (%REF-ARRAY v index)
+ `((with-module c-wrapper.c-ffi ref) ,v ,(%INT index)))
+
+--- a/src/c-grammar.scm
++++ b/src/c-grammar.scm
+@@ -122,6 +122,7 @@
+ (LPAREN expr RPAREN) : (%EXPR-IN-PARENS $2)
+ (LPAREN compound_statement RPAREN) : (%COMPOUND-STATEMENT $2)
+ (LPAREN type_name RPAREN LCBRA initializer_list RCBRA) : #f
++ (LPAREN type_name RPAREN LCBRA initializer_list COMMA RCBRA) : #f
+ (objc_message_expr) : $1
+ (objc_selector_expr) : $1
+ (objc_protocol_expr) : #f
+@@ -474,8 +475,8 @@
+ (LCBRA RCBRA) : (%COMPOUND-STATEMENT '(0))
+ (LCBRA statement_list RCBRA) : (%COMPOUND-STATEMENT $2)
+ (LCBRA declaration_list RCBRA) : (%COMPOUND-STATEMENT '(0))
+- (LCBRA declaration_list statement_list RCBRA)
+- : (%COMPOUND-STATEMENT-WITH-DECLARATION $2 $3)
++ (LCBRA declaration_list statement_list RCBRA) : (%COMPOUND-STATEMENT-WITH-DECLARATION $2 $3)
++ (LCBRA statement_list declaration_list statement_list RCBRA) : (%COMPOUND-STATEMENT-WITH-DECLARATION-EXT $2 $3 $4)
+ (error RCBRA) : #f
+ )
+
+--- a/src/c-lex.c
++++ b/src/c-lex.c
+@@ -361,6 +361,7 @@
+ "void",
+ "_Bool",
+ "_Float128",
++ "__int128",
+ NULL,
+ };
+ int i;
+--- a/src/c-parser.c
++++ b/src/c-parser.c
+@@ -104,6 +104,7 @@
+ DEFINE_SYM(void);
+ DEFINE_SYM(_Bool);
+ DEFINE_SYM(_Float128);
++DEFINE_SYM(__int128);
+ DEFINE_SYM(__builtin_va_list);
+ DEFINE_SYM(U_struct);
+ DEFINE_SYM(U_union);
+@@ -472,7 +473,9 @@
+ } else if (SCM_EQ(car, SYM(_Bool))) {
+ SCM_RETURN(SYM(c_int));
+ } else if (SCM_EQ(car, SYM(_Float128))) {
+ SCM_RETURN(SYM(c_double));
++ } else if (SCM_EQ(car, SYM(__int128))) {
++ SCM_RETURN(SYM(c_longlong));
+ } else if (SCM_EQ(car, SYM(__builtin_va_list))) {
+ SCM_RETURN(SCM_LIST2(SCM_LIST3(SYM(with_module), SYM(c_wrapper_c_ffi), SYM(ptr)), SYM(c_void)));
+ } else if (SCM_PAIRP(car) && SCM_EQ(SCM_CAR(car), SYM(U_struct))) {
+@@ -1024,7 +1027,11 @@
+ Scm_ParserAttributeClear();
+ td_list = Scm_MakeTypeDeclList(type_spec_list, declarator_list);
+ SCM_FOR_EACH(pair, td_list) {
+- Scm_ArgPoolAdd(SCM_TYPE_DECL_NAME(SCM_CAR(pair)));
++ // hack to avoid segfault when loading x86intrin.h
++ // TODO: why is this necessary?
++ if (!SCM_EQ(SCM_CAR(pair), SCM_FALSE)) {
++ Scm_ArgPoolAdd(SCM_TYPE_DECL_NAME(SCM_CAR(pair)));
++ }
+ }
+
+ SCM_RETURN(td_list);
+@@ -1865,6 +1872,7 @@
+ INIT_SYM(void, "void");
+ INIT_SYM(_Bool, "_Bool");
+ INIT_SYM(_Float128, "_Float128");
++ INIT_SYM(__int128, "__int128");
+ INIT_SYM(__builtin_va_list, "__builtin_va_list");
+ INIT_SYM(U_struct, "STRUCT");
+ INIT_SYM(U_union, "UNION");
+--- a/testsuite/Makefile.in
++++ b/testsuite/Makefile.in
+@@ -78,6 +78,7 @@
+ $(GOSH) -I../src -I../lib stdio-test.scm >> test.log
+ $(GOSH) -I../src -I../lib math-test.scm >> test.log
+ $(GOSH) -I../src -I../lib local-typedef.scm >> test.log
++ $(GOSH) -I../src -I../lib stmt-decl.scm >> test.log
+ $(GOSH) -I../src -I../lib inline-test.scm >> test.log
+ $(GOSH) -I../src -I../lib fptr_array-test.scm >> test.log
+ $(GOSH) -I../src -I../lib array_qualifier-test.scm >> test.log
+--- a/testsuite/stmt_decl.h
++++ b/testsuite/stmt_decl.h
+@@ -0,0 +1,6 @@
++void f(int arg1)
++{
++ arg1 = 3;
++ double tmp = arg1;
++ return tmp;
++}
+--- a/testsuite/stmt-decl.scm
++++ b/testsuite/stmt-decl.scm
+@@ -0,0 +1,13 @@
++;;;
++;;; Test include math.h
++;;;
++
++(use gauche.test)
++
++(test-start "test for statement before and after declaration in c function")
++(use c-wrapper)
++
++(c-include "stmt_decl.h")
++
++;; epilogue
++(test-end)
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-float128.patch b/dev-scheme/c-wrapper/files/c-wrapper-float128.patch
new file mode 100644
index 000000000000..acd2f04407dd
--- /dev/null
+++ b/dev-scheme/c-wrapper/files/c-wrapper-float128.patch
@@ -0,0 +1,79 @@
+https://aur.archlinux.org/cgit/aur.git/tree/12_float128.patch?h=gauche-c-wrapper
+
+Description: Workaround for usage of math.h including type _Float128
+Author: Fabian Brosda <fabi3141@gmx.de>
+Last-Update: 2020-07-10
+
+--- a/src/c-lex.c
++++ b/src/c-lex.c
+@@ -360,6 +360,7 @@
+ "double",
+ "void",
+ "_Bool",
++ "_Float128",
+ NULL,
+ };
+ int i;
+--- a/src/c-parser.c
++++ b/src/c-parser.c
+@@ -103,6 +103,7 @@
+ DEFINE_SYM(double);
+ DEFINE_SYM(void);
+ DEFINE_SYM(_Bool);
++DEFINE_SYM(_Float128);
+ DEFINE_SYM(__builtin_va_list);
+ DEFINE_SYM(U_struct);
+ DEFINE_SYM(U_union);
+@@ -470,6 +471,8 @@
+ SCM_RETURN(SYM(c_void));
+ } else if (SCM_EQ(car, SYM(_Bool))) {
+ SCM_RETURN(SYM(c_int));
++ } else if (SCM_EQ(car, SYM(_Float128))) {
++ SCM_RETURN(SYM(c_double));
+ } else if (SCM_EQ(car, SYM(__builtin_va_list))) {
+ SCM_RETURN(SCM_LIST2(SCM_LIST3(SYM(with_module), SYM(c_wrapper_c_ffi), SYM(ptr)), SYM(c_void)));
+ } else if (SCM_PAIRP(car) && SCM_EQ(SCM_CAR(car), SYM(U_struct))) {
+@@ -1859,6 +1862,7 @@
+ INIT_SYM(double, "double");
+ INIT_SYM(void, "void");
+ INIT_SYM(_Bool, "_Bool");
++ INIT_SYM(_Float128, "_Float128");
+ INIT_SYM(__builtin_va_list, "__builtin_va_list");
+ INIT_SYM(U_struct, "STRUCT");
+ INIT_SYM(U_union, "UNION");
+--- a/testsuite/Makefile.in
++++ b/testsuite/Makefile.in
+@@ -73,6 +73,7 @@
+ $(GOSH) -I../src -I../lib cwrappertest.scm >> test.log
+ $(GOSH) -I../src -I../lib struct_in_union-test.scm >> test.log
+ $(GOSH) -I../src -I../lib stdio-test.scm >> test.log
++ $(GOSH) -I../src -I../lib math-test.scm >> test.log
+ $(GOSH) -I../src -I../lib inline-test.scm >> test.log
+ $(GOSH) -I../src -I../lib fptr_array-test.scm >> test.log
+ $(GOSH) -I../src -I../lib array_qualifier-test.scm >> test.log
+--- a/testsuite/math-test.scm
++++ b/testsuite/math-test.scm
+@@ -0,0 +1,23 @@
++;;;
++;;; Test include math.h
++;;;
++
++(use gauche.test)
++
++(test-start "c-wrapper (include math.h)")
++(use c-wrapper)
++
++(c-include "math.h")
++
++(test "trunc"
++ 1.0
++ (lambda ()
++ (trunc 1.9)))
++
++(test "pow"
++ 625.0
++ (lambda ()
++ (pow 5 4)))
++
++;; epilogue
++(test-end)
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-gauche-abi-0.98.patch b/dev-scheme/c-wrapper/files/c-wrapper-gauche-abi-0.98.patch
new file mode 100644
index 000000000000..6c9f0cb371b2
--- /dev/null
+++ b/dev-scheme/c-wrapper/files/c-wrapper-gauche-abi-0.98.patch
@@ -0,0 +1,62 @@
+--- a/src/c-ffi.c
++++ b/src/c-ffi.c
+@@ -347,7 +347,11 @@
+ }
+ sa = SCM_SLOT_ACCESSOR(SCM_CDR(p));
+ if (0 <= sa->slotNumber) {
++#if !defined(GAUCHE_API_VERSION) || GAUCHE_API_VERSION < 98
+ return SCM_FFI_TYPE_DATA(Scm_InstanceSlotRef(ctype, sa->slotNumber));
++#else
++ return SCM_FFI_TYPE_DATA(Scm_InstanceSlotRef(ctype, sa->slotNumber, SCM_UNBOUND));
++#endif
+ } else {
+ Scm_Error("wrong slot number: %d", sa->slotNumber);
+ }
+--- a/src/c-lex.c
++++ b/src/c-lex.c
+@@ -992,11 +992,6 @@
+ SCM_RETURN(Scm_MakeInteger(v));
+ }
+
+-ScmObj Scm_ReadStringLiteral()
+-{
+- SCM_RETURN(read_string_literal());
+-}
+-
+ ScmObj Scm_ReadCharacterConstant()
+ {
+ SCM_RETURN(read_character_constant());
+--- a/src/c-lex.h
++++ b/src/c-lex.h
+@@ -78,7 +78,6 @@
+ extern ScmObj Scm_IsForceIdentifierSet(ScmObj v);
+ extern ScmObj Scm_ReadIdentifier(ScmObj l);
+ extern ScmObj Scm_ReadOperator(ScmObj c);
+-extern ScmObj Scm_ReadStringLiteral();
+ extern ScmObj Scm_ReadCharacterConstant();
+ extern ScmObj Scm_ReadOctalOrFlonum(ScmObj l);
+ extern ScmObj Scm_ReadDecimal(ScmObj l);
+--- a/src/c-lexlib.stub
++++ b/src/c-lexlib.stub
+@@ -40,7 +40,11 @@
+ "if (nptr == endptr) {"
+ " SCM_RETURN(SCM_FALSE);"
+ "} else {"
++ "#if !defined(GAUCHE_API_VERSION) || GAUCHE_API_VERSION < 98"
+ " SCM_RETURN(Scm_MakeInteger64((ScmInt64) v));"
++ "#else"
++ " SCM_RETURN(Scm_MakeInteger64((int64_t) v));"
++ "#endif"
+ "}"))
+
+ (define-cproc strtod (nptr::<const-cstring>)
+@@ -136,9 +140,6 @@
+ (define-cproc read-operator (c)
+ (call "Scm_ReadOperator"))
+
+-(define-cproc read-string-literal ()
+- (call "Scm_ReadStringLiteral"))
+-
+ (define-cproc read-character-constant ()
+ (call "Scm_ReadCharacterConstant"))
+
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-gcc-15.patch b/dev-scheme/c-wrapper/files/c-wrapper-gcc-15.patch
new file mode 100644
index 000000000000..9f6128b0c76c
--- /dev/null
+++ b/dev-scheme/c-wrapper/files/c-wrapper-gcc-15.patch
@@ -0,0 +1,24 @@
+Fix build with GCC 15
+
+https://bugs.gentoo.org/943982
+
+--- a/src/c-lex.c
++++ b/src/c-lex.c
+@@ -887,7 +887,7 @@ static inline int backslash(int c)
+ case 'x':
+ c1 = buffer_peek_char();
+ if (is_hex_digit_char(c1)) {
+- return readx(c1);
++ return readx();
+ } else {
+ Scm_Error("\\x must be followed by hex-digit, but got '%c'", c1);
+ }
+@@ -934,7 +934,7 @@ static inline int backslash(int c)
+ SCM_LIST1(SCM_MAKE_CHAR(c)));
+ return c;
+ } else {
+- return buffer_read_char(c);
++ return buffer_read_char();
+ }
+ }
+ } else {
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch b/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch
new file mode 100644
index 000000000000..46ab531b389a
--- /dev/null
+++ b/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch
@@ -0,0 +1,43 @@
+--- a/src/c-parser.c
++++ b/src/c-parser.c
+@@ -1668,6 +1668,7 @@
+ {
+ static ScmObj trigger_line = SCM_FALSE;
+ ScmObj line_str;
++ ScmObj rx;
+
+ /* skip the first line '# 1 "<stdin>"' */
+ Scm_ReadLineUnsafe(SCM_PORT(in));
+@@ -1682,7 +1683,22 @@
+ }
+ }
+
+- while (!SCM_EOFP(line_str = Scm_ReadLineUnsafe(SCM_PORT(in)))) {
++ rx = Scm_RegComp(SCM_STRING(SCM_MAKE_STR_IMMUTABLE("^#\\s+\\d+\\s+\"<stdin>\"")), 0);
++ line_str = Scm_ReadLineUnsafe(SCM_PORT(in));
++ while (!SCM_EOFP(line_str)) {
++ ScmObj body_str = line_str;
++ while (!SCM_EOFP(line_str = Scm_ReadLineUnsafe(SCM_PORT(in)))
++ && SCM_STRING_LENGTH(line_str) >= 13
++#ifdef SCM_REGEXP_MULTI_LINE
++ && SCM_REGMATCHP(Scm_RegExec(SCM_REGEXP(rx), SCM_STRING(line_str), SCM_UNDEFINED, SCM_UNDEFINED))) {
++#else
++ && SCM_REGMATCHP(Scm_RegExec(SCM_REGEXP(rx), SCM_STRING(line_str)))) {
++#endif
++ if (SCM_EOFP(line_str = Scm_ReadLineUnsafe(SCM_PORT(in)))) {
++ Scm_Error("[bug] unexpected EOF while parsing macro body");
++ }
++ body_str = Scm_StringAppend2(SCM_STRING(body_str), SCM_STRING(line_str));
++ }
+ if (SCM_NULLP(macro_list)) {
+ Scm_Error("[bug] lost macro body");
+ } else {
+@@ -1690,7 +1706,7 @@
+ macro_list = SCM_CDR(macro_list);
+ Scm_FilenameSet(SCM_CAAR(pos_name_args));
+ Scm_LineNumberSet(SCM_INT_VALUE(SCM_CDAR(pos_name_args)));
+- parse_macro_body(SCM_CADR(pos_name_args), SCM_CDDR(pos_name_args), line_str);
++ parse_macro_body(SCM_CADR(pos_name_args), SCM_CDDR(pos_name_args), body_str);
+ }
+ }
+
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-gentoo.patch b/dev-scheme/c-wrapper/files/c-wrapper-gentoo.patch
new file mode 100644
index 000000000000..e94d55fa0d21
--- /dev/null
+++ b/dev-scheme/c-wrapper/files/c-wrapper-gentoo.patch
@@ -0,0 +1,51 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -53,6 +53,7 @@
+
+ dnl Check for libraries
+ dnl Add your macro calls to check required libraries, if you have any.
++PKG_CHECK_MODULES([FFI], [libffi])
+
+ dnl Platform-dependent configuration.
+ AC_ARG_ENABLE(objc, [ --enable-objc turn on Objective-C support])
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -20,9 +20,10 @@
+ GAUCHE_PACKAGE = @GAUCHE_PACKAGE@
+ INSTALL = @GAUCHE_INSTALL@
+
+-CPPFLAGS = -I./libffi/include -DGAUCHE_API_0_8_8 @CPPFLAGS@
++CPPFLAGS = -DGAUCHE_API_0_8_8 @FFI_CFLAGS@ @CPPFLAGS@
++CFLAGS = @CFLAGS@
+ LDFLAGS = @LDFLAGS@
+-LIBS = libffi/.libs/libffi.a @LIBS@
++LIBS = @FFI_LIBS@ @LIBS@
+
+ YACC = @YACC@
+
+@@ -38,7 +39,7 @@
+ SCMFILES =
+ HEADERS =
+
+-TARGET = libffi/.libs/libffi.a $(ARCHFILES)
++TARGET = $(ARCHFILES)
+ GENERATED = libffi
+ CONFIG_GENERATED = libffi/Makefile Makefile cwcompile
+
+@@ -62,13 +63,13 @@
+ cd libffi; $(MAKE)
+
+ c-ffi.$(SOEXT): $(ffi_SRCS)
+- $(GAUCHE_PACKAGE) compile --cppflags="$(CPPFLAGS)" --ldflags="$(LDFLAGS)" --libs="$(LIBS)" --verbose c-ffi $(ffi_SRCS)
++ $(GAUCHE_PACKAGE) compile --cppflags="$(CPPFLAGS)" --cflags="$(CFLAGS)" --ldflags="$(LDFLAGS)" --libs="$(LIBS)" --verbose c-ffi $(ffi_SRCS)
+
+ c-lex.$(SOEXT): $(clex_SRCS)
+- $(GAUCHE_PACKAGE) compile --cppflags="$(CPPFLAGS)" --ldflags="$(LDFLAGS)" --libs="$(LIBS)" --verbose c-lex $(clex_SRCS)
++ $(GAUCHE_PACKAGE) compile --cppflags="$(CPPFLAGS)" --cflags="$(CFLAGS)" --ldflags="$(LDFLAGS)" --libs="$(LIBS)" --verbose c-lex $(clex_SRCS)
+
+ c-parser.$(SOEXT): $(cparser_SRCS) y.tab.c
+- $(GAUCHE_PACKAGE) compile --cppflags="$(CPPFLAGS)" --ldflags="$(LDFLAGS)" --libs="$(LIBS) $(cparser_LIBS)" --verbose c-parser $(cparser_SRCS)
++ $(GAUCHE_PACKAGE) compile --cppflags="$(CPPFLAGS)" --cflags="$(CFLAGS)" --ldflags="$(LDFLAGS)" --libs="$(LIBS) $(cparser_LIBS)" --verbose c-parser $(cparser_SRCS)
+
+ c-grammar.y: c-grammar.scm genyacc.scm
+ $(GOSH) genyacc.scm --outfile=c-grammar.y $<
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-glibc-2.25.patch b/dev-scheme/c-wrapper/files/c-wrapper-glibc-2.25.patch
new file mode 100644
index 000000000000..0776b255bbac
--- /dev/null
+++ b/dev-scheme/c-wrapper/files/c-wrapper-glibc-2.25.patch
@@ -0,0 +1,13 @@
+--- a/lib/c-wrapper/c-parser.scm
++++ b/lib/c-wrapper/c-parser.scm
+@@ -1115,7 +1115,9 @@
+ (raise e))))
+ (call-with-gcc-io include-dirs headers options
+ (lambda (in out)
+- (let ((macro-list (queue->list (macro-queue))))
++ (let ((macro-list (filter (lambda (m)
++ (not (string-prefix? "__glibc_macro_warning" (car m))))
++ (queue->list (macro-queue)))))
+ (for-each (lambda (macro-def)
+ (display (car macro-def) out)
+ (newline out))
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-info.patch b/dev-scheme/c-wrapper/files/c-wrapper-info.patch
new file mode 100644
index 000000000000..fed41c6aa2ec
--- /dev/null
+++ b/dev-scheme/c-wrapper/files/c-wrapper-info.patch
@@ -0,0 +1,66 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -47,7 +47,6 @@
+ AC_PROG_CC
+ AC_PROG_YACC
+ AC_CHECK_PROGS(MAKEINFO, makeinfo)
+-AC_CHECK_PROGS(GZIP_PROGRAM, gzip)
+ AC_CHECK_PROGS(SED, sed)
+ AC_PATH_PROG([LDCONFIG], [ldconfig], [], [$PATH:/sbin:/usr/sbin])
+
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -11,7 +11,6 @@
+ GAUCHE_CONFIG = @GAUCHE_CONFIG@
+ INSTALL = @GAUCHE_INSTALL@
+ MAKEINFO = @MAKEINFO@
+-GZIP_PROGRAM = @GZIP_PROGRAM@
+
+ TEXIS = c-wrapper-ref.texi
+
+@@ -22,7 +21,7 @@
+ all: info
+
+ install: all
+- if test -f c-wrapper-refe.info.gz -o -f c-wrapper-refj.info.gz; then \
++ if test -f c-wrapper-refe.info -o -f c-wrapper-refj.info; then \
+ for info in *.info*; do \
+ $(INSTALL) -m 444 -T $(infodir) $$info; \
+ done; \
+@@ -47,7 +46,7 @@
+
+ pdf : c-wrapper-refe.pdf
+
+-info : c-wrapper-refe.info.gz c-wrapper-refj.info.gz
++info : c-wrapper-refe.info c-wrapper-refj.info
+
+ c-wrapper-refe.html : c-wrapper-refe.texi
+ texi2html -number c-wrapper-refe.texi
+@@ -64,11 +63,9 @@
+ c-wrapper-refe.texi : $(TEXIS) extract
+ $(GOSH) ./extract -en -o c-wrapper-refe.texi c-wrapper-ref.texi
+
+-c-wrapper-refe.info.gz : c-wrapper-refe.texi
+- if test X$(MAKEINFO) != X -a X$(GZIP_PROGRAM) != X; then \
++c-wrapper-refe.info : c-wrapper-refe.texi
++ if test X$(MAKEINFO) != X; then \
+ $(MAKEINFO) --no-warn c-wrapper-refe.texi; \
+- rm -rf c-wrapper-refe.info*.gz; \
+- $(GZIP_PROGRAM) c-wrapper-refe.info; \
+ fi
+
+ c-wrapper-refj.html : c-wrapper-refj.texi
+@@ -91,11 +88,9 @@
+ c-wrapper-refj.texi : $(TEXIS) extract
+ $(GOSH) ./extract -jp -o c-wrapper-refj.texi c-wrapper-ref.texi
+
+-c-wrapper-refj.info.gz : c-wrapper-refj.texi
+- if test X$(MAKEINFO) != X -a X$(GZIP_PROGRAM) != X; then \
++c-wrapper-refj.info : c-wrapper-refj.texi
++ if test X$(MAKEINFO) != X; then \
+ $(MAKEINFO) --no-warn c-wrapper-refj.texi; \
+- rm -rf c-wrapper-refj.info*.gz; \
+- $(GZIP_PROGRAM) c-wrapper-refj.info ; \
+ fi
+
+ clean:
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-local-typedef.patch b/dev-scheme/c-wrapper/files/c-wrapper-local-typedef.patch
new file mode 100644
index 000000000000..70f4ffcf4cd4
--- /dev/null
+++ b/dev-scheme/c-wrapper/files/c-wrapper-local-typedef.patch
@@ -0,0 +1,149 @@
+https://aur.archlinux.org/cgit/aur.git/plain/13_local_typedef.patch?h=gauche-c-wrapper
+
+Description: Basic support for typedefs inside functions
+Author: Fabian Brosda <fabi3141@gmx.de>
+Last-Update: 2020-07-10
+
+--- a/src/c-parser.c
++++ b/src/c-parser.c
+@@ -594,6 +594,26 @@
+ }
+ }
+
++static void emit_typedef(ScmObj type_decl_list)
++{
++ ScmObj p;
++
++ SCM_FOR_EACH(p, type_decl_list) {
++ ScmObj v = SCM_CAR(p);
++ ScmObj ctype = SCM_TYPE_DECL_CTYPE(v);
++ ScmObj new_ctype = SCM_TYPE_DECL_NAME(v);
++ ScmObj sym = CParser_ctype2class_symbol(new_ctype);
++
++ Scm_DefChunkDictSetTypename(new_ctype,
++ Scm_MakeDefChunk(SYM(S_typedef),
++ new_ctype,
++ SCM_LIST1(sym),
++ SCM_LIST3(SYM(S_define), sym, ctype)));
++ Scm_InstallType(new_ctype);
++ }
++}
++
++
+ ScmObj Scm_MakeTypeDecl(ScmObj type_spec_list, ScmObj declarator)
+ {
+ ScmObj lst = SCM_NIL;
+@@ -612,6 +632,7 @@
+
+ SCM_FOR_EACH(pair, type_spec_list) {
+ if (SCM_EQ(SCM_CAR(pair), SYM(U_typedef))) {
++ emit_typedef(Scm_Cons(Scm_MakeTypeDecl(SCM_CDR(pair), declarator), lst));
+ continue;
+ }
+ lst = Scm_Cons(SCM_CAR(pair), lst);
+@@ -1542,25 +1563,6 @@
+ SCM_RETURN(SCM_UNDEFINED);
+ }
+
+-static void emit_typedef(ScmObj type_decl_list)
+-{
+- ScmObj p;
+-
+- SCM_FOR_EACH(p, type_decl_list) {
+- ScmObj v = SCM_CAR(p);
+- ScmObj ctype = SCM_TYPE_DECL_CTYPE(v);
+- ScmObj new_ctype = SCM_TYPE_DECL_NAME(v);
+- ScmObj sym = CParser_ctype2class_symbol(new_ctype);
+-
+- Scm_DefChunkDictSetTypename(new_ctype,
+- Scm_MakeDefChunk(SYM(S_typedef),
+- new_ctype,
+- SCM_LIST1(sym),
+- SCM_LIST3(SYM(S_define), sym, ctype)));
+- Scm_InstallType(new_ctype);
+- }
+-}
+-
+ static void emit_define_extern(ScmObj declaration)
+ {
+ ScmObj ctype = SCM_TYPE_DECL_CTYPE(declaration);
+--- a/testsuite/local_typedef.c
++++ b/testsuite/local_typedef.c
+@@ -0,0 +1,6 @@
++#include "local_typedef.h"
++
++int local_typedef(void)
++{
++ return helper();
++}
+--- a/testsuite/local_typedef.h
++++ b/testsuite/local_typedef.h
+@@ -0,0 +1,8 @@
++extern int local_typedef(void);
++
++int helper(void)
++{
++ typedef int _my_type;
++ _my_type ret = 1;
++ return ret;
++}
+--- a/testsuite/local-typedef.scm
++++ b/testsuite/local-typedef.scm
+@@ -0,0 +1,19 @@
++;;;
++;;; Test local typedefs
++;;;
++
++(use gauche.test)
++
++(test-start "c-wrapper (local typedefs)")
++(use c-wrapper)
++
++(c-load-library "./local_typedef")
++(c-include "./local_typedef.h")
++
++(test "local_typedef"
++ 1
++ (lambda ()
++ (local_typedef)))
++
++;; epilogue
++(test-end)
+--- a/testsuite/Makefile.in
++++ b/testsuite/Makefile.in
+@@ -57,6 +57,9 @@
+ fptr_array.$(DYLIBEXT): fptr_array.o
+ $(CC) $(LDFLAGS) $@ $<
+
++local_typedef.$(DYLIBEXT): local_typedef.o
++ $(CC) $(LDFLAGS) $@ $<
++
+ gcc_extension.$(DYLIBEXT): gcc_extension.o
+ $(CC) $(LDFLAGS) $@ $<
+
+@@ -65,7 +68,7 @@
+
+ check: $(CHECK_TARGET)
+
+-check-c: ffitest.$(DYLIBEXT) fptr_array.$(DYLIBEXT) gcc_extension.$(DYLIBEXT)
++check-c: ffitest.$(DYLIBEXT) fptr_array.$(DYLIBEXT) gcc_extension.$(DYLIBEXT) local_typedef.$(DYLIBEXT)
+ @rm -f test.log
+ $(GOSH) -I../src -I../lib attr-test.scm >> test.log
+ $(GOSH) -I../src -I../lib ffitest.scm >> test.log
+@@ -74,6 +77,7 @@
+ $(GOSH) -I../src -I../lib struct_in_union-test.scm >> test.log
+ $(GOSH) -I../src -I../lib stdio-test.scm >> test.log
+ $(GOSH) -I../src -I../lib math-test.scm >> test.log
++ $(GOSH) -I../src -I../lib local-typedef.scm >> test.log
+ $(GOSH) -I../src -I../lib inline-test.scm >> test.log
+ $(GOSH) -I../src -I../lib fptr_array-test.scm >> test.log
+ $(GOSH) -I../src -I../lib array_qualifier-test.scm >> test.log
+@@ -83,7 +87,7 @@
+ $(GOSH) -I../src -I../lib -I../objc objc-test.scm >> test.log
+
+ clean :
+- rm -rf core ffitest.$(DYLIBEXT) objc-test.$(DYLIBEXT) fptr_array.$(DYLIBEXT) gcc_extension.$(DYLIBEXT) *.o $(GENERATED) *~ test.log so_locations
++ rm -rf core ffitest.$(DYLIBEXT) objc-test.$(DYLIBEXT) fptr_array.$(DYLIBEXT) gcc_extension.$(DYLIBEXT) local_typedef.$(DYLIBEXT) *.o $(GENERATED) *~ test.log so_locations
+
+ distclean : clean
+ rm -rf $(CONFIG_GENERATED)
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-texinfo-6.7.patch b/dev-scheme/c-wrapper/files/c-wrapper-texinfo-6.7.patch
new file mode 100644
index 000000000000..97acd86470eb
--- /dev/null
+++ b/dev-scheme/c-wrapper/files/c-wrapper-texinfo-6.7.patch
@@ -0,0 +1,34 @@
+--- a/doc/c-wrapper-ref.texi
++++ b/doc/c-wrapper-ref.texi
+@@ -14,7 +14,7 @@
+ @direntry
+ * c-wrapper reference: (c-wrapper-refj.info). A generic wrapper for C libraries.
+ @end direntry
+-@documentencoding euc-jp
++@documentencoding UTF-8
+ @c COMMON
+ @comment %**end of header
+
+--- a/doc/extract
++++ b/doc/extract
+@@ -138,8 +138,6 @@
+ ((en) (filter #/^@c EN$/ #/^@c JP$/))
+ ((jp) (filter #/^@c JP$/ #/^@c EN$/))))
+
+- (define outenc (if (eq? *lang* 'jp) 'euc-jp 'utf8))
+-
+ (unless (= (length a) 1) (usage))
+
+ (when (eq? *lang* 'jp)
+@@ -148,9 +146,9 @@
+ (with-input-from-file (car a)
+ (lambda ()
+ (if *outfile*
+- (with-output-to-file *outfile* do-it :encoding outenc)
++ (with-output-to-file *outfile* do-it :encoding 'utf8)
+ (let1 out (open-output-conversion-port
+- (current-output-port) outenc)
++ (current-output-port) 'utf8)
+ (with-output-to-port out do-it)
+ (close-output-port out))))
+ :encoding 'euc-jp)
diff --git a/dev-scheme/c-wrapper/metadata.xml b/dev-scheme/c-wrapper/metadata.xml
new file mode 100644
index 000000000000..5bb2dda1be44
--- /dev/null
+++ b/dev-scheme/c-wrapper/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>hattya@gentoo.org</email>
+ <name>Akinori Hattori</name>
+ </maintainer>
+ <origin>baldeagleos-repo</origin>
+</pkgmetadata>