From bf70771d03716280a78254bc18e87b735e5ab687 Mon Sep 17 00:00:00 2001 From: Markham Date: Wed, 29 Sep 2021 12:29:46 +0200 Subject: [PATCH] fix libraries.mk: libopenthreads & libglib2 --- make/libraries.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/make/libraries.mk b/make/libraries.mk index 71646ed..2e0225d 100755 --- a/make/libraries.mk +++ b/make/libraries.mk @@ -846,10 +846,14 @@ $(D)/libexif: $(ARCHIVE)/libexif-$(LIBEXIF_VER).tar.gz | $(TARGETPREFIX) $(REMOVE)/libexif-$(LIBEXIF_VER) $(TOUCH) +ifeq ($(BOXTYPE), armbox) OPENTHREADS_CONF_OPTS = \ -DCMAKE_SUPPRESS_DEVELOPER_WARNINGS="1" \ -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE="0" \ -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE__TRYRUN_OUTPUT="1" +else +OPENTHREADS_CONF_OPTS = +endif $(D)/libopenthreads: $(ARCHIVE)/OpenThreads-$(LIBOPENTHREADS_VER).tar.gz | $(TARGETPREFIX) $(START_BUILD) @@ -862,7 +866,7 @@ $(D)/libopenthreads: $(ARCHIVE)/OpenThreads-$(LIBOPENTHREADS_VER).tar.gz | $(TAR -DCMAKE_INSTALL_PREFIX="" \ -DCMAKE_C_COMPILER="$(TARGET)-gcc" \ -DCMAKE_CXX_COMPILER="$(TARGET)-g++" \ - -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE=1 \ + $(OPENTHREADS_CONF_OPTS) \ ; \ find . -name cmake_install.cmake -print0 | xargs -0 \ sed -i 's@SET(CMAKE_INSTALL_PREFIX "/usr/local")@SET(CMAKE_INSTALL_PREFIX "")@'; \ @@ -1262,7 +1266,7 @@ $(D)/libglib2: $(D)/zlib $(D)/libffi $(LIBGLIB2_DEPS) $(ARCHIVE)/glib-$(LIBGLIB2 --disable-gtk-doc-html \ --disable-compile-warnings \ --with-threads="posix" \ - --with-html-dir=/.remove \ + --with-html-dir=/.remove/html \ --with-pcre=internal \ $(ICONV_CONF) \ $(LIBGLIB2_CONF) \ -- 2.39.5