aboutsummaryrefslogtreecommitdiff
path: root/package/guile
diff options
context:
space:
mode:
Diffstat (limited to 'package/guile')
-rw-r--r--package/guile/0003-Makefile.am-fix-build-without-makeinfo.patch (renamed from package/guile/0004-Makefile.am-fix-build-without-makeinfo.patch)0
-rw-r--r--package/guile/guile.mk14
2 files changed, 13 insertions, 1 deletions
diff --git a/package/guile/0004-Makefile.am-fix-build-without-makeinfo.patch b/package/guile/0003-Makefile.am-fix-build-without-makeinfo.patch
index 0d16f92387..0d16f92387 100644
--- a/package/guile/0004-Makefile.am-fix-build-without-makeinfo.patch
+++ b/package/guile/0003-Makefile.am-fix-build-without-makeinfo.patch
diff --git a/package/guile/guile.mk b/package/guile/guile.mk
index 5750b85f49..44f4d1c85e 100644
--- a/package/guile/guile.mk
+++ b/package/guile/guile.mk
@@ -9,7 +9,7 @@ GUILE_SOURCE = guile-$(GUILE_VERSION).tar.xz
GUILE_SITE = $(BR2_GNU_MIRROR)/guile
GUILE_INSTALL_STAGING = YES
# For 0002-calculate-csqrt_manually.patch and
-# 0004-Makefile.am-fix-build-without-makeinfo.patch
+# 0003-Makefile.am-fix-build-without-makeinfo.patch
GUILE_AUTORECONF = YES
GUILE_LICENSE = LGPL-3.0+
GUILE_LICENSE_FILES = LICENSE COPYING COPYING.LESSER
@@ -29,6 +29,10 @@ GUILE_CFLAGS = \
-DHAVE_GC_GET_FREE_SPACE_DIVISOR \
-DHAVE_GC_SET_FINALIZE_ON_DEMAND
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
+GUILE_CONF_ENV += LIBS=-latomic
+endif
+
ifeq ($(BR2_STATIC_LIBS),y)
GUILE_CFLAGS += -DGC_NO_DLOPEN
endif
@@ -38,6 +42,14 @@ ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM)$(BR2_OPTIMIZE_S),yy)
GUILE_CFLAGS += -O2
endif
+# jit triggers build failures with gcc < 5
+ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_5),)
+GUILE_CONF_OPTS += --disable-jit
+endif
+ifeq ($(BR2_HOST_GCC_AT_LEAST_5),)
+HOST_GUILE_CONF_OPTS += --disable-jit
+endif
+
# It can use readline, but on the condition that it was build against
# ncurses. If both aren't present disable readline support since the
# host readline/ncurses support can poison the build.