From d8720508397d14f0de95abb43a8d8ce43bcc592f Mon Sep 17 00:00:00 2001 From: Markham Date: Sat, 28 Apr 2018 22:45:24 +0200 Subject: [PATCH] extend target midnight commander for hd1 --- make/applications.mk | 2 ++ make/libraries.mk | 12 ++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/make/applications.mk b/make/applications.mk index 67b1d8d..520d7fe 100755 --- a/make/applications.mk +++ b/make/applications.mk @@ -813,6 +813,7 @@ $(D)/mc: $(D)/libncurses $(D)/libglib2 $(ARCHIVE)/mc-$(MC_VER).tar.xz | $(TARGET set -e; cd $(BUILD_TMP)/mc-$(MC_VER); \ $(PATCH)/mc-$(MC_VER).patch; \ autoreconf -fi; \ + export LIBS="-lrt -lglib-2.0"; \ $(CONFIGURE) \ --prefix= \ --mandir=/.remove \ @@ -830,6 +831,7 @@ $(D)/mc: $(D)/libncurses $(D)/libglib2 $(ARCHIVE)/mc-$(MC_VER).tar.xz | $(TARGET $(MAKE) all; \ $(MAKE) install DESTDIR=$(TARGETPREFIX) rm -rf $(TARGETPREFIX)/usr/share/mc/examples + rm -rf $(TARGETPREFIX)/usr/share/mc/syntax find $(TARGETPREFIX)/usr/share/mc/skins -type f ! -name default.ini | xargs --no-run-if-empty rm $(REMOVE)/mc-$(MC_VER) $(TOUCH) diff --git a/make/libraries.mk b/make/libraries.mk index 16146ab..22e0835 100755 --- a/make/libraries.mk +++ b/make/libraries.mk @@ -941,6 +941,10 @@ $(D)/libfribidi: $(ARCHIVE)/fribidi-$(FRIBIDI_VER).tar.bz2 | $(TARGETPREFIX) # # libffi # +LIBFFI_CONF = +ifeq ($(BOXSERIES), hd1) + LIBFFI_CONF = --enable-static --disable-shared +endif $(D)/libffi: $(ARCHIVE)/libffi-$(LIBFFI_VER).tar.gz $(START_BUILD) $(REMOVE)/libffi-$(LIBFFI_VER) @@ -952,8 +956,8 @@ $(D)/libffi: $(ARCHIVE)/libffi-$(LIBFFI_VER).tar.gz --prefix=/ \ --mandir=/.remove \ --infodir=/.remove \ - --disable-static \ --enable-builddir=libffi \ + $(LIBFFI_CONF) \ ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGETPREFIX) @@ -969,6 +973,10 @@ ifeq ($(BOXSERIES), hd2) ICONV_CONF = --with-libiconv=gnu LIBGLIB2_DEPS = $(D)/gettext endif +LIBGLIB2_CONF = +ifeq ($(BOXSERIES), hd1) + LIBGLIB2_CONF = --enable-static --disable-shared +endif $(D)/libglib2: $(D)/zlib $(D)/libffi $(LIBGLIB2_DEPS) $(ARCHIVE)/glib-$(LIBGLIB2_VER).tar.xz $(START_BUILD) $(REMOVE)/glib-$(LIBGLIB2_VER) @@ -985,7 +993,6 @@ $(D)/libglib2: $(D)/zlib $(D)/libffi $(LIBGLIB2_DEPS) $(ARCHIVE)/glib-$(LIBGLIB2 autoreconf -fi; \ $(CONFIGURE) \ --prefix= \ - --enable-static \ --bindir=/.remove \ --datarootdir=/.remove \ --cache-file=config.cache \ @@ -998,6 +1005,7 @@ $(D)/libglib2: $(D)/zlib $(D)/libffi $(LIBGLIB2_DEPS) $(ARCHIVE)/glib-$(LIBGLIB2 --with-html-dir=/.remove \ --with-pcre=internal \ $(ICONV_CONF) \ + $(LIBGLIB2_CONF) \ ; \ $(MAKE) all; \ $(MAKE) install DESTDIR=$(TARGETPREFIX) -- 2.39.5