From 6ab4fb52753e2ce9ba9094599c8fac0d88faaee9 Mon Sep 17 00:00:00 2001 From: cbdbc Date: Fri, 10 Jan 2025 13:36:46 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=B8=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D0=97=D0=9E=D0=A1=D0=A0=D0=92=20"=D0=9D=D0=B5=D0=B9=D1=82?= =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=BE"=20=D1=80=D0=B5=D0=B4=D0=B0=D0=BA?= =?UTF-8?q?=D1=86=D0=B8=D0=B8=202021?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- common.mk | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 89b7a6bc1..10d2e0102 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ mc: pcre s-lang s-lang: pcre include recurse.mk EOF -$ make CPULIST=x86 USE_INSTALL_ROOT=1 INSTALL_ROOT_nto=/tmp/mc install +$ make CPULIST="x86 e2k" USE_INSTALL_ROOT=1 INSTALL_ROOT_nto=/tmp/mc install ``` **Порт mc проверен на работоспособность условно и, вероятно, потребует дополнительной адаптации.** diff --git a/common.mk b/common.mk index 40f6e930c..76e4e3a96 100644 --- a/common.mk +++ b/common.mk @@ -3,6 +3,7 @@ QCONFIG=qconfig.mk endif include $(QCONFIG) +include $(MKFILES_ROOT)/qmacros.mk CONFIGUREFLAGS += --sysconfdir=/etc CONFIGUREFLAGS += --libexecdir=/lib @@ -22,6 +23,11 @@ CONFIGUREFLAGS += --with-screen=slang CONFIGUREFLAGS += --without-x CONFIGUREFLAGS += samba_cv_HAVE_GETTIMEOFDAY_TZ=yes CONFIGUREFLAGS += ac_cv_func_getmntinfo="yes" +CONFIGUREFLAGS += GLIB_CFLAGS=-I$(KPDA_TARGET)/usr/include/glib-2.0 +CONFIGUREFLAGS += GLIB_LIBS="-lglib-2.0" +CONFIGUREFLAGS += --with-slang-includes=$(INSTALL_ROOT_nto)/$(CPUVARDIR)/usr/include +CONFIGUREFLAGS += --with-slang-libs=$(INSTALL_ROOT_nto)/$(CPUVARDIR)/usr/lib +CONFIGUREFLAGS += LDFLAGS=-L$(KPDA_TARGET)/$(CPU)/usr/lib LIBS += nbutil LIBS += socket @@ -33,5 +39,8 @@ CPPFLAGS += -DREAL_UNIX_SYSTEM=1 CPPFLAGS += -D_FILE_OFFSET_BITS=64 CPPFLAGS += -include nbutil.h +EXTRA_INCVPATH:=$(wildcard $(addprefix $(KPDA_TARGET)/$(CPUVARDIR)/,usr/include/ usr/include/glib-2.0/ /usr/lib/glib-2.0/include/)) +EXTRA_INCVPATH+=$(wildcard $(addprefix $(KPDA_TARGET)/,usr/include/ usr/include/glib-2.0/ )) + include $(MKFILES_ROOT)/autotools.mk include $(MKFILES_ROOT)/qtargets.mk