diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /dev-scheme/gauche/files | |
parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-scheme/gauche/files')
-rw-r--r-- | dev-scheme/gauche/files/gauche-0.9-ext-ldflags.patch | 11 | ||||
-rw-r--r-- | dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch | 12 | ||||
-rw-r--r-- | dev-scheme/gauche/files/gauche-0.9.5-bsd.patch | 25 | ||||
-rw-r--r-- | dev-scheme/gauche/files/gauche-0.9.5-libressl.patch | 19 | ||||
-rw-r--r-- | dev-scheme/gauche/files/gauche-0.9.5-unicode.patch | 19 | ||||
-rw-r--r-- | dev-scheme/gauche/files/gauche-ext-ldflags.patch | 11 | ||||
-rw-r--r-- | dev-scheme/gauche/files/gauche-gauche.m4.patch | 18 | ||||
-rw-r--r-- | dev-scheme/gauche/files/gauche-rfc.tls.patch | 12 | ||||
-rw-r--r-- | dev-scheme/gauche/files/gauche-rpath.patch | 10 | ||||
-rw-r--r-- | dev-scheme/gauche/files/gauche-xz-info.patch | 31 |
10 files changed, 168 insertions, 0 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 new file mode 100644 index 000000000000..b4aedef2a316 --- /dev/null +++ b/dev-scheme/gauche/files/gauche-0.9-ext-ldflags.patch @@ -0,0 +1,11 @@ +--- 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-rfc.tls.patch b/dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch new file mode 100644 index 000000000000..1e5ef71b6c91 --- /dev/null +++ b/dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch @@ -0,0 +1,12 @@ +--- a/ext/tls/ssltest-mod.scm ++++ b/ext/tls/ssltest-mod.scm +@@ -53,7 +53,8 @@ + ($ format #t "~a\n" $ regexp-replace-all* line + #/\.\.\/ssl\// srcpath-replace + #/openssl / kicker-replace +- #/system/ "safe_system"))) ++ #/system/ "safe_system" ++ #/(s_server) / "\\1 -4 "))) + + (p "#include <errno.h>" + "int safe_system(const char *commands)" diff --git a/dev-scheme/gauche/files/gauche-0.9.5-bsd.patch b/dev-scheme/gauche/files/gauche-0.9.5-bsd.patch new file mode 100644 index 000000000000..615020df8dfe --- /dev/null +++ b/dev-scheme/gauche/files/gauche-0.9.5-bsd.patch @@ -0,0 +1,25 @@ +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 new file mode 100644 index 000000000000..7b4c839dccb8 --- /dev/null +++ b/dev-scheme/gauche/files/gauche-0.9.5-libressl.patch @@ -0,0 +1,19 @@ +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 new file mode 100644 index 000000000000..a87ca5d7c39c --- /dev/null +++ b/dev-scheme/gauche/files/gauche-0.9.5-unicode.patch @@ -0,0 +1,19 @@ +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-ext-ldflags.patch b/dev-scheme/gauche/files/gauche-ext-ldflags.patch new file mode 100644 index 000000000000..a5a21532d1ee --- /dev/null +++ b/dev-scheme/gauche/files/gauche-ext-ldflags.patch @@ -0,0 +1,11 @@ +--- 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@ + BUILD_GOSH_FLAGS = + + # These are set by configure diff --git a/dev-scheme/gauche/files/gauche-gauche.m4.patch b/dev-scheme/gauche/files/gauche-gauche.m4.patch new file mode 100644 index 000000000000..1b9947cf5798 --- /dev/null +++ b/dev-scheme/gauche/files/gauche-gauche.m4.patch @@ -0,0 +1,18 @@ +--- a/m4/gauche.m4 ++++ b/m4/gauche.m4 +@@ -103,13 +103,10 @@ + AS_CASE(["$target"], + [i686-*], [I686OPT="-DUSE_I686_PREFETCH"]) + AS_CASE(["$CC"], +- [gcc*], [ dnl some systems may have gcc-2.95, gcc-3, etc. ++ [*gcc*], [ dnl some systems may have gcc-2.95, gcc-3, etc. + AS_CASE(["$target"], + [*mingw*], [], +- [GCCOPT="-fomit-frame-pointer"]) +- AS_CASE(["$target"], +- [i586-*], [GCCOPT="$GCCOPT -march=i586"], +- [i686-*], [GCCOPT="$GCCOPT -march=i686"])])]) ++ [GCCOPT="-fomit-frame-pointer"])])]) + OPTFLAGS="$GCCOPT $I686OPT" + AC_SUBST(OPTFLAGS) + ]) diff --git a/dev-scheme/gauche/files/gauche-rfc.tls.patch b/dev-scheme/gauche/files/gauche-rfc.tls.patch new file mode 100644 index 000000000000..cf570df0ed38 --- /dev/null +++ b/dev-scheme/gauche/files/gauche-rfc.tls.patch @@ -0,0 +1,12 @@ +--- a/ext/tls/ssltest-mod.scm ++++ b/ext/tls/ssltest-mod.scm +@@ -53,7 +53,8 @@ + ($ format #t "~a\n" $ regexp-replace-all* line + #/\.\.\/ssl\// srcpath-replace + #/openssl / kicker-replace +- #/system\s*\(/ "safe_system("))) ++ #/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 new file mode 100644 index 000000000000..8774bac7be13 --- /dev/null +++ b/dev-scheme/gauche/files/gauche-rpath.patch @@ -0,0 +1,10 @@ +--- 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) diff --git a/dev-scheme/gauche/files/gauche-xz-info.patch b/dev-scheme/gauche/files/gauche-xz-info.patch new file mode 100644 index 000000000000..e55f53606005 --- /dev/null +++ b/dev-scheme/gauche/files/gauche-xz-info.patch @@ -0,0 +1,31 @@ +--- a/lib/gauche/interactive/info.scm ++++ b/lib/gauche/interactive/info.scm +@@ -137,7 +137,8 @@ + :paths paths + :pred (^p (or (file-is-readable? p) + (file-is-readable? #"~|p|.gz") +- (file-is-readable? #"~|p|.bz2")))) ++ (file-is-readable? #"~|p|.bz2") ++ (file-is-readable? #"~|p|.xz")))) + (errorf "couldn't find info file ~s in paths: ~s" *info-file* paths)) + )) + +--- a/lib/text/info.scm ++++ b/lib/text/info.scm +@@ -64,6 +64,7 @@ + + ;; Find bzip2 location + (define bzip2 (find-file-in-paths "bzip2")) ++(define xz (find-file-in-paths "xz")) + + ;; Read an info file FILE, and returns a list of strings splitted by ^_ (#\u001f) + ;; If FILE is not found, look for compressed one. +@@ -78,6 +79,8 @@ + (close-input-port zp)))))] + [(and bzip2 (file-exists? #"~|file|.bz2")) + (with-input-from-process #"~bzip2 -c -d ~|file|.bz2" thunk)] ++ [(and xz (file-exists? #"~|file|.xz")) ++ (with-input-from-process #"~xz -c -d ~|file|.xz" thunk)] + [else (error "can't find info file" file)])) + (with-input-from-info + (lambda () |