fix libraries.mk: libopenthreads & libglib2

diff --git a/make/libraries.mk b/make/libraries.mk
index 71646ed5904a80a39a791aa7792ec42eeb501e50..2e0225d14e2d2c600222629257949b3b7d82b2eb 100755 (executable)
--- 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) \