summaryrefslogtreecommitdiff
path: root/dev-scheme/gauche/files
diff options
context:
space:
mode:
Diffstat (limited to 'dev-scheme/gauche/files')
-rw-r--r--dev-scheme/gauche/files/gauche-0.9-ext-ldflags.patch11
-rw-r--r--dev-scheme/gauche/files/gauche-0.9.5-bsd.patch25
-rw-r--r--dev-scheme/gauche/files/gauche-0.9.5-libressl.patch19
-rw-r--r--dev-scheme/gauche/files/gauche-0.9.5-unicode.patch19
-rw-r--r--dev-scheme/gauche/files/gauche-0.9.6-rfc.tls.patch (renamed from dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch)4
-rw-r--r--dev-scheme/gauche/files/gauche-info.patch95
-rw-r--r--dev-scheme/gauche/files/gauche-rfc.tls.patch10
-rw-r--r--dev-scheme/gauche/files/gauche-rpath.patch10
8 files changed, 101 insertions, 92 deletions
diff --git a/dev-scheme/gauche/files/gauche-0.9-ext-ldflags.patch b/dev-scheme/gauche/files/gauche-0.9-ext-ldflags.patch
deleted file mode 100644
index b4aedef2a316..000000000000
--- a/dev-scheme/gauche/files/gauche-0.9-ext-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/ext/Makefile.ext.in
-+++ b/ext/Makefile.ext.in
-@@ -22,7 +22,7 @@
- LIBS = $(XLIBS) @LIBS@
- CFLAGS = @CFLAGS@ @SHLIB_SO_CFLAGS@ $(XCFLAGS)
- CPPFLAGS = @CPPFLAGS@ $(XCPPFLAGS)
--LDFLAGS = $(LOCAL_LFLAGS) $(XLDFLAGS) @SHLIB_SO_LDFLAGS@
-+LDFLAGS = $(LOCAL_LFLAGS) $(XLDFLAGS) @LDFLAGS@ @SHLIB_SO_LDFLAGS@
-
- # These are set by configure
- DEFS = @DEFS@
diff --git a/dev-scheme/gauche/files/gauche-0.9.5-bsd.patch b/dev-scheme/gauche/files/gauche-0.9.5-bsd.patch
deleted file mode 100644
index 615020df8dfe..000000000000
--- a/dev-scheme/gauche/files/gauche-0.9.5-bsd.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit da2ea76503e8f1784d0f0be26435d4c8e0d1b12f
-Author: Shiro Kawai <shiro@acm.org>
-Date: Sat Oct 15 11:44:28 2016 -1000
-
- Avoid preprocessor symbols redefinition on OpenBSD
-
- https://sourceforge.net/p/gauche/mailman/message/35429549/
-
-diff --git a/ext/net/gauche-net.h b/ext/net/gauche-net.h
-index d4f1dcd..decba64 100644
---- a/ext/net/gauche-net.h
-+++ b/ext/net/gauche-net.h
-@@ -362,8 +362,12 @@ extern ScmObj Scm_GetAddrinfo(const char *nodename,
- struct addrinfo *hints);
- extern ScmObj Scm_GetNameinfo(ScmSockAddr *addr, int flags);
-
-+#ifndef NI_MAXHOST
- #define NI_MAXHOST 1025
-+#endif
-+#ifndef NI_MAXSERV
- #define NI_MAXSERV 32
-+#endif
-
- #endif /* HAVE_IPV6 */
-
diff --git a/dev-scheme/gauche/files/gauche-0.9.5-libressl.patch b/dev-scheme/gauche/files/gauche-0.9.5-libressl.patch
deleted file mode 100644
index 7b4c839dccb8..000000000000
--- a/dev-scheme/gauche/files/gauche-0.9.5-libressl.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit c26a4836e767807dd8c98d280c4d9e742b759edd
-Author: Shiro Kawai <shiro@acm.org>
-Date: Sun Oct 9 02:04:19 2016 -1000
-
- rfc.tls - Detect LibreSSL as well
-
-diff --git a/ext/tls/test.scm b/ext/tls/test.scm
-index 63a1d04..efbfbca 100644
---- a/ext/tls/test.scm
-+++ b/ext/tls/test.scm
-@@ -37,7 +37,7 @@
- [(not gauche.os.windows)
- (guard (e [(<process-abnormal-exit> e)
- (no-openssl "couldn't run openssl command")])
-- (if-let1 m ($ #/OpenSSL\s+([\d\.]+\w*)/
-+ (if-let1 m ($ #/(?:OpenSSL|LibreSSL)\s+([\d\.]+\w*)/
- $ process-output->string `(,openssl-cmd "version"))
- (let1 vers (m 1)
- (unless (version>=? vers "1.0.1")
diff --git a/dev-scheme/gauche/files/gauche-0.9.5-unicode.patch b/dev-scheme/gauche/files/gauche-0.9.5-unicode.patch
deleted file mode 100644
index a87ca5d7c39c..000000000000
--- a/dev-scheme/gauche/files/gauche-0.9.5-unicode.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit d31eb5c02b65514e695b45c0c01cbd45a36bac4a
-Author: OOHASHI Daichi <dico.leque.comicron@gmail.com>
-Date: Thu Oct 20 10:48:17 2016 +0900
-
- (char-general-category #\x20000) should be Lo
-
-diff --git a/src/gauche/char_utf_8.h b/src/gauche/char_utf_8.h
-index 082e764..5f92d13 100644
---- a/src/gauche/char_utf_8.h
-+++ b/src/gauche/char_utf_8.h
-@@ -294,7 +294,7 @@ static inline unsigned char Scm__LookupCharCategory(ScmChar ch)
- {
- if (ch == SCM_CHAR_INVALID || ch >= 0x10ffff) {
- return SCM_CHAR_CATEGORY_Cn;
-- } else if (ch <= 0x20000) {
-+ } else if (ch < 0x20000) {
- return ucs_general_category_00000[ch];
- } else {
- return ucs_general_category_20000(ch);
diff --git a/dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch b/dev-scheme/gauche/files/gauche-0.9.6-rfc.tls.patch
index 1e5ef71b6c91..cf570df0ed38 100644
--- a/dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch
+++ b/dev-scheme/gauche/files/gauche-0.9.6-rfc.tls.patch
@@ -4,8 +4,8 @@
($ format #t "~a\n" $ regexp-replace-all* line
#/\.\.\/ssl\// srcpath-replace
#/openssl / kicker-replace
-- #/system/ "safe_system")))
-+ #/system/ "safe_system"
+- #/system\s*\(/ "safe_system(")))
++ #/system\s*\(/ "safe_system("
+ #/(s_server) / "\\1 -4 ")))
(p "#include <errno.h>"
diff --git a/dev-scheme/gauche/files/gauche-info.patch b/dev-scheme/gauche/files/gauche-info.patch
new file mode 100644
index 000000000000..f60f1f8a87d8
--- /dev/null
+++ b/dev-scheme/gauche/files/gauche-info.patch
@@ -0,0 +1,95 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -417,7 +417,6 @@
+ AC_CHECK_PROGS(AR, ar gar)
+ AC_CHECK_PROGS(AS, as gas)
+ AC_CHECK_PROGS(MAKEINFO, makeinfo)
+-AC_CHECK_PROGS(GZIP_PROGRAM, gzip)
+
+ dnl for cross build
+ AC_CHECK_PROGS(BUILD_CC, ${build}-gcc ${build_alias}-gcc gcc cc)
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -16,7 +16,6 @@
+ INSTALL_DATA = @INSTALL_DATA@
+ MKINSTDIR = $(top_srcdir)/mkinstalldirs
+ MAKEINFO = @MAKEINFO@
+-GZIP_PROGRAM = @GZIP_PROGRAM@
+ VERSION_INFO = @PACKAGE_STRING@
+
+ MAKEDOC = $(GOSH) $(srcdir)/makedoc.scm
+@@ -58,7 +57,7 @@
+ texi html htmls dvi pdf info \
+ clean distclean maintainer-clean
+
+-.SUFFIXES: .texi .html .info.gz .pdf .dvi
++.SUFFIXES: .texi .html .info .pdf .dvi
+
+ all: info
+
+@@ -66,7 +65,7 @@
+ if test ! -d "$(DESTDIR)$(mandir)/man1"; then $(MKINSTDIR) "$(DESTDIR)$(mandir)/man1"; fi
+ $(INSTALL_DATA) $(MANPAGES) "$(DESTDIR)$(mandir)/man1"
+ if test ! -d "$(DESTDIR)$(infodir)"; then $(MKINSTDIR) "$(DESTDIR)$(infodir)"; fi
+- if test -f gauche-refe.info.gz -o -f gauche-refj.info.gz; then \
++ if test -f gauche-refe.info -o -f gauche-refj.info; then \
+ for info in *.info*; do \
+ $(INSTALL_DATA) $$info "$(DESTDIR)$(infodir)/"; \
+ done; \
+@@ -94,8 +93,8 @@
+ %/index.html : %.texi
+ $(MAKEDOC) htmls $< "$(MAKEINFO)" "$(VERSION_INFO)"
+
+-%.info.gz : %.texi
+- $(MAKEDOC) info $< "$(MAKEINFO)" "$(GZIP_PROGRAM)"
++%.info : %.texi
++ $(MAKEDOC) info $< "$(MAKEINFO)"
+
+ %.pdf : %.texi
+ $(MAKEDOC) pdf $< "$(MAKEINFO)"
+@@ -113,7 +112,7 @@
+ htmls : gauche-refe/index.html gauche-refj/index.html
+ dvi : gauche-refe.dvi gauche-refj.dvi
+ pdf : gauche-refe.pdf gauche-refj.pdf
+-info : gauche-refe.info.gz gauche-refj.info.gz
++info : gauche-refe.info gauche-refj.info
+
+ gauche-refe.texi : $(TEXIS) extract.scm
+ $(GOSH) $(srcdir)/extract.scm -en -o gauche-refe.texi $(srcdir)/gauche-ref.texi
+--- a/doc/makedoc.scm
++++ b/doc/makedoc.scm
+@@ -16,7 +16,7 @@
+ [gauche.sys.setenv (sys-putenv "LANG=C")]
+ [else])
+ (if (match (cdr args)
+- [("info" input makeinfo gzip) (do-info input makeinfo gzip)]
++ [("info" input makeinfo) (do-info input makeinfo)]
+ [("html" input makeinfo) (do-html input makeinfo)]
+ [("htmls" input makeinfo version) (do-htmls input makeinfo version)]
+ [("pdf" input makeinfo) (do-pdf input makeinfo)]
+@@ -27,7 +27,7 @@
+ (define (usage)
+ (print "Usage: gosh makedoc.scm command args ...")
+ (print "Valid commands (and args):")
+- (print " info input MAKEINFO GZIP - generate info doc")
++ (print " info input MAKEINFO - generate info doc")
+ (print " html input MAKEINFO - generate single html")
+ (print " htmls input MAKEINFO VERSION-STRING - generate html files in subdir")
+ (print " pdf input MAKEINFO - generate pdf")
+@@ -55,14 +55,11 @@
+ (warn "makeinfo version ~a or greater is required, but ~a's \
+ version is ~a. Skipping.\n" min-version makeinfo vers)))))
+
+-(define (do-info input makeinfo gzip)
++(define (do-info input makeinfo)
+ (define info (path-swap-extension input "info"))
+ (or (string-null? makeinfo)
+- (string-null? gzip)
+ (not (check-makeinfo-version makeinfo "5.0"))
+- (and (do-process (make-cmd `(,makeinfo ,input)))
+- (begin (remove-files (glob #"~|info|*.gz"))
+- (do-process (make-cmd `(,gzip ,info ,@(glob #"~|info|-[0-9]*"))))))))
++ (and (do-process (make-cmd `(,makeinfo ,input))))))
+
+ (define (do-html input makeinfo)
+ (or (string-null? makeinfo)
diff --git a/dev-scheme/gauche/files/gauche-rfc.tls.patch b/dev-scheme/gauche/files/gauche-rfc.tls.patch
index cf570df0ed38..5eb3b991d3b7 100644
--- a/dev-scheme/gauche/files/gauche-rfc.tls.patch
+++ b/dev-scheme/gauche/files/gauche-rfc.tls.patch
@@ -1,12 +1,10 @@
--- a/ext/tls/ssltest-mod.scm
+++ b/ext/tls/ssltest-mod.scm
-@@ -53,7 +53,8 @@
- ($ format #t "~a\n" $ regexp-replace-all* line
+@@ -87,6 +87,7 @@
#/\.\.\/ssl\// srcpath-replace
#/openssl / kicker-replace
-- #/system\s*\(/ "safe_system(")))
-+ #/system\s*\(/ "safe_system("
-+ #/(s_server) / "\\1 -4 ")))
+ #/system\s*\(/ "safe_system("
++ #/(s_server) / "\\1 -4 "
+ )))
(p "#include <errno.h>"
- "int safe_system(const char *commands)"
diff --git a/dev-scheme/gauche/files/gauche-rpath.patch b/dev-scheme/gauche/files/gauche-rpath.patch
deleted file mode 100644
index 8774bac7be13..000000000000
--- a/dev-scheme/gauche/files/gauche-rpath.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -709,7 +709,6 @@
- fi
- if test "$RPATH_FLAG" != ""; then
- RPATH_TMP=$RPATH_FLAG'`pwd`'
-- RPATH_REAL=$RPATH_FLAG'$(LIB_INSTALL_DIR)'
- fi
- fi
- AC_SUBST(RPATH_FLAG)
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 12:05:44 +0000