Skip to contentSkip to conversation

package/gauche: bump to version 0.9.8

PATCH New Fabrice Fontaine 2 participants 3 messages Aug 18, 2019 – Aug 19, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/gauche: bump to version 0.9.8

- Remove second, third and fourth patches (already in version)
- Update first patch and sent it upstream
- Add AUTORECONF=YES to avoid patching configure in first patch
- Add hash for license file

---
 package/gauche/0001-fix-so-suffix.patch       | 43 ++++++-------
 ...d-check-for-NO_GETCONTEXT-definition.patch | 62 -------------------
 ...-version.h-build-error-uClibc-x86-_6.patch | 46 --------------
 package/gauche/0004-rfc-needs-srfi.patch      | 35 -----------
 package/gauche/gauche.hash                    |  7 ++-
 package/gauche/gauche.mk                      |  4 +-
 6 files changed, 29 insertions(+), 168 deletions(-)
 delete mode 100644 package/gauche/0002-gc-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch
 delete mode 100644 package/gauche/0003-Fix-missing-libc-version.h-build-error-uClibc-x86-_6.patch
 delete mode 100644 package/gauche/0004-rfc-needs-srfi.patch
package/gauche/0001-fix-so-suffix.patch +22 -21
index b65e269981..8a0937681c 100644
@@ -1,31 +1,32 @@
+From cefd57f76f7faec4143bf1e42ed148cad973c1f4 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <[email protected]>
+Date: Mon, 12 Aug 2019 23:17:21 +0200
+Subject: [PATCH] configure.ac: fix so suffix
+
 With uclibc or musl configuration, $host does not match to '*-linux-gnu*'.
-I touch configure directly instead of configure.ac because autoreconf
-failed by version mismatch of autotools.
 
 Signed-off-by: Hiroshi Kawashima <[email protected]>
+[Retrieved (and slightly updated) from:
+https://git.buildroot.net/buildroot/tree/package/gauche/0001-fix-so-suffix.patch]
+Signed-off-by: Fabrice Fontaine <[email protected]>
+[Upstream status: https://github.com/shirok/Gauche/pull/508]
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff -ur a/configure b/configure
---- a/configure	2014-07-20 15:15:05.000000000 +0900
-+++ b/configure	2015-10-20 21:52:32.791442291 +0900
-@@ -6843,7 +6843,7 @@
+diff --git a/configure.ac b/configure.ac
+index 15092a2d6..b82b762a9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -641,7 +641,7 @@ AS_CASE([$host],
      SHLIB_MAIN_LDFLAGS=""
      SHLIB_OK=ok
-     ;;
--  *-linux-gnu*|*-*-gnu*|*freebsd*|*dragonfly*)
-+  *-linux-*|*-*-gnu*|*freebsd*|*dragonfly*)
+     ],
+-  [*-linux-gnu*|*-*-gnu*|*freebsd*|*dragonfly*], [
++  [*-linux-*|*-*-gnu*|*freebsd*|*dragonfly*], [
      SHLIB_SO_CFLAGS="-fPIC"
      SHLIB_SO_LDFLAGS="$rpath -shared -o"
      SHLIB_SO_SUFFIX="so"
+-- 
+2.20.1
 
-diff -ur a/configure.ac b/configure.ac
---- a/configure.ac	2015-10-21 21:33:17.370000200 +0900
-+++ b/configure.ac	2015-10-21 21:33:39.784110527 +0900
-@@ -572,7 +572,7 @@
-     SHLIB_MAIN_LDFLAGS=""
-     SHLIB_OK=ok
-     ;;
--  *-linux-gnu*|*-*-gnu*|*freebsd*|*dragonfly*)
-+  *-linux-*|*-*-gnu*|*freebsd*|*dragonfly*)
-     SHLIB_SO_CFLAGS="-fPIC"
-     SHLIB_SO_LDFLAGS="$rpath -shared -o"
-     SHLIB_SO_SUFFIX="so"
package/gauche/0002-gc-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch deleted +0 -62

62 lines not on this page · raw message

package/gauche/0003-Fix-missing-libc-version.h-build-error-uClibc-x86-_6.patch deleted +0 -46

46 lines not on this page · raw message

package/gauche/0004-rfc-needs-srfi.patch deleted +0 -35
deleted file mode 100644
index 8b83b7872b..0000000000
@@ -1,35 +0,0 @@
-From 33ba5e73ec09f1308f897128334e955debd9ea43 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <[email protected]>
-Date: Wed, 21 Nov 2018 08:58:25 +0100
-Subject: [PATCH] rfc: needs srfi
-
-ext/rfc needs srfi-19 since version 0.9.5 and
-https://github.com/shirok/Gauche/commit/bd22bc82361c5eeb5d3b58c3836236566746bb96
-
-So add a dependency on srfi for rfc target in Makefile.in
-
-Fixes:
- - http://autobuild.buildroot.org/results/f4935e29ce6aaebdaa47d46c56120b7e97145d1b
-
-Signed-off-by: Fabrice Fontaine <[email protected]>
-[Upstream status: https://github.com/shirok/Gauche/pull/397]
----
- ext/Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ext/Makefile.in b/ext/Makefile.in
-index 57ddf457e..de8d59a4d 100644
---- a/ext/Makefile.in
-+++ b/ext/Makefile.in
-@@ -54,7 +54,7 @@ bcrypt: mt-random
- 
- dbm : threads
- 
--rfc: gauche util
-+rfc: gauche srfi util
- 
- test : check
- 
--- 
-2.14.1
-
package/gauche/gauche.hash +4 -3
index 8f45ef997b..600c46fbdc 100644
@@ -1,5 +1,6 @@
 # From https://sourceforge.net/projects/gauche/files/Gauche/
-sha1 c3e1ea21f3acc66fd26eced117caab3f86531db4  Gauche-0.9.5.tgz
-md5 8bac7cbd99a91f6f2c037ac6988db14d  Gauche-0.9.5.tgz
+sha1 ff7878ab19c56b49b4b6d77009300a3592cc903c  Gauche-0.9.8.tgz
+md5 efd1b12cd5708d9e1e4358ab2d2e1e32  Gauche-0.9.8.tgz
 # Locally calculated
-sha256 4c8a53213de112708bbda5fa9648c21497d43ebf809ed5b32b15f21266b4e73c  Gauche-0.9.5.tgz
+sha256 3eb30d1051d8b48999fe46511c9f6983057735312c9832b7db13f9db140db74b  Gauche-0.9.8.tgz
+sha256 d537f80c0bb3cc203bc2675b766b9de9573243026fa3e8ad78368abd4b14aac8  COPYING
package/gauche/gauche.mk +3 -1
index 0b4185f5bf..1f66e28de7 100644
@@ -4,12 +4,14 @@
 #
 ################################################################################
 
-GAUCHE_VERSION = 0.9.5
+GAUCHE_VERSION = 0.9.8
 GAUCHE_SOURCE = Gauche-$(GAUCHE_VERSION).tgz
 GAUCHE_SITE = http://downloads.sourceforge.net/project/gauche/Gauche
 GAUCHE_LICENSE = BSD-3-Clause, Boehm-gc, SRFI (srfi-11.scm), reload (reload.scm)
 GAUCHE_LICENSE_FILES = COPYING
 GAUCHE_DEPENDENCIES = host-gauche
+# We're patching configure.ac
+GAUCHE_AUTORECONF = YES
 
 HOST_GAUCHE_CONF_OPTS = --without-zlib
 GAUCHE_CONF_OPTS = --without-libatomic-ops
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/2 package/gauche: add optional mbedtls dependency

mbedtls support has been added in version 0.9.6 with
https://github.com/shirok/Gauche/commit/d449f013fae79639bb300d783962328c6b6b1bd0

So enable it if mbedtls is enabled and always enable embedded axTLS support to keep existing behavior

---
 package/gauche/gauche.mk | 10 ++++++++++
 1 file changed, 10 insertions(+)
package/gauche/gauche.mk +10 -0
index 1f66e28de7..2a30a2b39a 100644
@@ -16,6 +16,16 @@ GAUCHE_AUTORECONF = YES
 HOST_GAUCHE_CONF_OPTS = --without-zlib
 GAUCHE_CONF_OPTS = --without-libatomic-ops
 
+# Enable embedded axTLS
+GAUCHE_TLS_LIBS = axtls
+
+ifeq ($(BR2_PACKAGE_MBEDTLS),y)
+GAUCHE_TLS_LIBS += mbedtls
+GAUCHE_DEPENDENCIES += mbedtls
+endif
+
+GAUCHE_CONF_OPTS += --with-tls="$(GAUCHE_TLS_LIBS)"
+
 ifeq ($(BR2_PACKAGE_ZLIB),y)
 GAUCHE_CONF_OPTS += --with-zlib=$(STAGING_DIR)
 GAUCHE_DEPENDENCIES += zlib
Signature · 1 line
2.20.1
#2 lore raw

PATCH 1/2 package/gauche: bump to version 0.9.8

In reply to Fabrice Fontaine
Quoted 6 lines · On Sun, 18 Aug 2019 12:12:25 +0200 Fabrice Fontaine…

- Remove second, third and fourth patches (already in version)
- Update first patch and sent it upstream
- Add AUTORECONF=YES to avoid patching configure in first patch
- Add hash for license file

Quoted 11 lines
---
 package/gauche/0001-fix-so-suffix.patch       | 43 ++++++-------
 ...d-check-for-NO_GETCONTEXT-definition.patch | 62 -------------------
 ...-version.h-build-error-uClibc-x86-_6.patch | 46 --------------
 package/gauche/0004-rfc-needs-srfi.patch      | 35 -----------
 package/gauche/gauche.hash                    |  7 ++-
 package/gauche/gauche.mk                      |  4 +-
 6 files changed, 29 insertions(+), 168 deletions(-)
 delete mode 100644 package/gauche/0002-gc-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch
 delete mode 100644 package/gauche/0003-Fix-missing-libc-version.h-build-error-uClibc-x86-_6.patch
 delete mode 100644 package/gauche/0004-rfc-needs-srfi.patch

Applied to next, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com