summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkinori Hattori <hattya@gentoo.org>2012-05-26 10:04:15 +0000
committerAkinori Hattori <hattya@gentoo.org>2012-05-26 10:04:15 +0000
commit7ca7b0933c88f7fb86950fcd6791dd2a9bb9faa7 (patch)
treef36bc292e9fd1f0f6af83644914f46e46771e959 /dev-scheme/gauche/files
parentarm stable, bug #415483 (diff)
downloadgentoo-2-7ca7b0933c88f7fb86950fcd6791dd2a9bb9faa7.tar.gz
gentoo-2-7ca7b0933c88f7fb86950fcd6791dd2a9bb9faa7.tar.bz2
gentoo-2-7ca7b0933c88f7fb86950fcd6791dd2a9bb9faa7.zip
new upstream release.
(Portage version: 2.1.10.49/cvs/Linux i686)
Diffstat (limited to 'dev-scheme/gauche/files')
-rw-r--r--dev-scheme/gauche/files/gauche-0.9.3.2-Makefile.diff52
-rw-r--r--dev-scheme/gauche/files/gauche-rfc.tls.diff11
2 files changed, 63 insertions, 0 deletions
diff --git a/dev-scheme/gauche/files/gauche-0.9.3.2-Makefile.diff b/dev-scheme/gauche/files/gauche-0.9.3.2-Makefile.diff
new file mode 100644
index 000000000000..399912b137ff
--- /dev/null
+++ b/dev-scheme/gauche/files/gauche-0.9.3.2-Makefile.diff
@@ -0,0 +1,52 @@
+commit 809ed95496ff1d753f34161f28f549248124bb63
+Author: Shiro Kawai <shiro@acm.org>
+Date: Sat May 12 14:47:15 2012 -1000
+
+ build fix when DESTDIR is used
+
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -415,10 +415,12 @@ INSTALL_DIRS = $(DESTDIR)$(HEADER_INSTALL_DIR) \
+ @CROSS_COMPILING_no@GAUCHE_INSTALL = ./gosh -ftest $(srcdir)/gauche-install.in
+ @CROSS_COMPILING_yes@GAUCHE_INSTALL = gosh $(srcdir)/gauche-install.in
+
+-install : install-core install-aux
++install : all install-dirs install-aux install-core
+
+-install-core : all relink
++install-dirs :
+ $(MKINSTDIR) $(INSTALL_DIRS)
++
++install-core : relink
+ $(INSTALL) $(INSTALL_LIBS) $(DESTDIR)$(LIB_INSTALL_DIR)
+ $(INSTALL) $(INSTALL_LIBS) $(DESTDIR)$(ARCH_INSTALL_DIR)
+ $(INSTALL) -m 555 $(INSTALL_BINS) $(DESTDIR)$(BIN_INSTALL_DIR)
+@@ -429,7 +431,7 @@ install-core : all relink
+ $(INSTALL) $(srcdir)/gauche-init.scm $(DESTDIR)$(SCM_INSTALL_DIR)
+ $(POSTINSTALL)
+
+-install-aux : install-core
++install-aux :
+ $(GAUCHE_INSTALL) -m 444 -S $(srcdir) $(INSTALL_HEADERS) $(DESTDIR)$(HEADER_INSTALL_DIR)
+ $(GAUCHE_INSTALL) -m 444 -S $(srcdir) $(INSTALL_SUBHEADERS) $(DESTDIR)$(HEADER_INSTALL_DIR)/gauche
+ $(GAUCHE_INSTALL) -m 444 -S $(srcdir) $(INSTALL_SCMS) $(DESTDIR)$(SCM_INSTALL_DIR)
+
+commit 0e669ec43bedce845d03c65a3bd1c233673e3fd6
+Author: Shiro Kawai <shiro@acm.org>
+Date: Sun May 13 22:42:22 2012 -1000
+
+ Make sure install gauche-init.scm with mode 444
+
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 485d2d0..7b74d53 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -428,7 +428,7 @@ install-core : relink
+ @case `$(GAUCHE_CONFIG) --arch` in *-cygwin*|*-mingw*) \
+ $(INSTALL) $(INSTALL_LIBS) $(DESTDIR)$(BIN_INSTALL_DIR);;\
+ esac
+- $(INSTALL) $(srcdir)/gauche-init.scm $(DESTDIR)$(SCM_INSTALL_DIR)
++ $(INSTALL) -m 444 $(srcdir)/gauche-init.scm $(DESTDIR)$(SCM_INSTALL_DIR)
+ $(POSTINSTALL)
+
+ install-aux :
diff --git a/dev-scheme/gauche/files/gauche-rfc.tls.diff b/dev-scheme/gauche/files/gauche-rfc.tls.diff
new file mode 100644
index 000000000000..662ab433ef5f
--- /dev/null
+++ b/dev-scheme/gauche/files/gauche-rfc.tls.diff
@@ -0,0 +1,11 @@
+--- Gauche-0.9.3.2.orig/ext/tls/Makefile.in
++++ Gauche-0.9.3.2/ext/tls/Makefile.in
+@@ -77,6 +77,8 @@
+ @sed -e "s@\.\./ssl/@../../$(srcdir)/axTLS/ssl/@g" \
+ -e "s/system/safe_system/g" \
+ -e "s@openssl @sh ../../$(srcdir)/kick_openssl @g" \
++ -e "/do_reneg = 1;/i#if 0" \
++ -e "/do_reneg = 0;/a#endif" \
+ $(srcdir)/axTLS/ssl/test/ssltest.c >> $(SSLTEST_GENERATED)
+ @cat $(srcdir)/system-fix.c >> $(SSLTEST_GENERATED)
+