You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2022/10/18 14:58:18 UTC
[incubator-nuttx-apps] branch master updated (c90866141 -> f844db519)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
from c90866141 Client & Server examples to use TCP/IP socket as an IPC Channel for LoRaWAN
new bca94fce5 CONFIG_BUILD_KERNEL/libapps.a: Allow creation of libapps.a separately
new f844db519 libapps.a: Add the static application library always to the target libraries
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Application.mk | 8 +++-----
Makefile | 4 +++-
import/Make.defs | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
[incubator-nuttx-apps] 01/02: CONFIG_BUILD_KERNEL/libapps.a: Allow creation of libapps.a separately
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit bca94fce5aafdb2a01962975c8435cf92688b51a
Author: Ville Juven <vi...@unikie.com>
AuthorDate: Fri Oct 14 09:59:49 2022 +0300
CONFIG_BUILD_KERNEL/libapps.a: Allow creation of libapps.a separately
Add rule to create libapps.a for CONFIG_BUILD_KERNEL=y, there is no
reason to disallow this.
The behavior of make import remains the same, so no regression is expected.
---
Makefile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 3f3d002bb..6344a513c 100644
--- a/Makefile
+++ b/Makefile
@@ -62,10 +62,12 @@ ifeq ($(CONFIG_BUILD_KERNEL),y)
install: $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_install)
-.import: $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_all)
+$(BIN): $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_all)
$(Q) for app in ${CONFIGURED_APPS}; do \
$(MAKE) -C "$${app}" archive ; \
done
+
+.import: $(BIN)
$(Q) install libapps.a $(APPDIR)$(DELIM)import$(DELIM)libs
$(Q) $(MAKE) install
[incubator-nuttx-apps] 02/02: libapps.a: Add the static application library always to the target libraries
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit f844db51942be35b5cbcfde0ba3077999c0d6b00
Author: Ville Juven <vi...@unikie.com>
AuthorDate: Fri Oct 14 10:01:50 2022 +0300
libapps.a: Add the static application library always to the target libraries
This error was made by me a long time ago, not understanding how the kernel
mode build is expected to work. So partially revert PR#946.
---
Application.mk | 8 +++-----
import/Make.defs | 2 +-
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/Application.mk b/Application.mk
index a8f6b4523..37b6c82d5 100644
--- a/Application.mk
+++ b/Application.mk
@@ -42,11 +42,9 @@ else
CWD = $(CURDIR)
endif
-# Add the static application library to the linked libraries. Don't do this
-# with CONFIG_BUILD_KERNEL as there is no static app library
-ifneq ($(CONFIG_BUILD_KERNEL),y)
- LDLIBS += $(call CONVERT_PATH,$(BIN))
-endif
+# Add the static application library to the linked libraries.
+
+LDLIBS += $(call CONVERT_PATH,$(BIN))
# When building a module, link with the compiler runtime.
# This should be linked after libapps. Consider that mbedtls in libapps
diff --git a/import/Make.defs b/import/Make.defs
index ae055a93b..f3f935188 100644
--- a/import/Make.defs
+++ b/import/Make.defs
@@ -66,7 +66,7 @@ LDLIBPATH = $(addprefix -L,$(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs))
# Link with user libraries
ifeq ($(CONFIG_BUILD_KERNEL),y)
- LDLIBS = -lapps -lmm -lc -lproxies
+ LDLIBS += -lmm -lc -lproxies
ifeq ($(CONFIG_HAVE_CXX),y)
LDLIBS += -lxx
endif