sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

system/argtable3: Update to the latest version(v3.1.5.1c1bb23)

Browse Source 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2021-01-14 01:57:46 +08:00 committed by Masayuki Ishikawa
parent ebe3b0d302
commit 35f3b609fe
4 changed files with 1456 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1448
system/argtable3/0001-feat-Switch-to-FreeBSD-getopt-library.patch Normal file
View File

File diff suppressed because it is too large Load Diff

2
system/argtable3/Kconfig
View File

@ -13,6 +13,6 @@ if SYSTEM_ARGTABLE3
config SYSTEM_ARGTABLE3_VERSION config SYSTEM_ARGTABLE3_VERSION
string "ARGTABLE3 Version" string "ARGTABLE3 Version"
default "3.0.0" default "3.1.5.1c1bb23"
endif endif

4
system/argtable3/Make.defs
View File

@ -22,6 +22,6 @@
ifneq ($(CONFIG_SYSTEM_ARGTABLE3),) ifneq ($(CONFIG_SYSTEM_ARGTABLE3),)
CONFIGURED_APPS += $(APPDIR)/system/argtable3 CONFIGURED_APPS += $(APPDIR)/system/argtable3
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(APPDIR)/system/argtable3/argtable3/"} CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(APPDIR)/system/argtable3/argtable3/src"}
CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(APPDIR)/system/argtable3/argtable3/"} CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(APPDIR)/system/argtable3/argtable3/src"}
endif endif

9
system/argtable3/Makefile
View File

@ -23,24 +23,25 @@ include $(APPDIR)/Make.defs
ARGTABLE3_VERSION := $(patsubst "%",%,$(CONFIG_SYSTEM_ARGTABLE3_VERSION)) ARGTABLE3_VERSION := $(patsubst "%",%,$(CONFIG_SYSTEM_ARGTABLE3_VERSION))
ARGTABLE3_TARBALL = v$(ARGTABLE3_VERSION).tar.gz ARGTABLE3_TARBALL = v$(ARGTABLE3_VERSION).tar.gz
ARGTABLE3_UNPACK = argtable3 ARGTABLE3_UNPACK = argtable3
ARGTABLE3_SRCDIR = $(ARGTABLE3_UNPACK) ARGTABLE3_SRCDIR = $(ARGTABLE3_UNPACK)$(DELIM)src
DEPPATH += --dep-path $(ARGTABLE3_SRCDIR) DEPPATH += --dep-path $(ARGTABLE3_SRCDIR)
VPATH += :$(ARGTABLE3_SRCDIR) VPATH += :$(ARGTABLE3_SRCDIR)
CSRCS := $(notdir $(wildcard $(ARGTABLE3_SRCDIR)$(DELIM)argtable3.c)) CFLAGS += ${shell $(DEFINE) "$(CC)" ARG_REPLACE_GETOPT=0}
CSRCS := $(notdir $(wildcard $(ARGTABLE3_SRCDIR)$(DELIM)*.c))
$(ARGTABLE3_TARBALL): $(ARGTABLE3_TARBALL):
$(Q) echo "Downloading argtable3-$(ARGTABLE3_VERSION)" $(Q) echo "Downloading argtable3-$(ARGTABLE3_VERSION)"
$(Q) echo "$(ARGTABLE3_SRCDIR)" $(Q) echo "$(ARGTABLE3_SRCDIR)"
$(Q) echo "$(ARGTABLE3_TARBALL)--$(ARGTABLE3_UNPACK)" $(Q) echo "$(ARGTABLE3_TARBALL)--$(ARGTABLE3_UNPACK)"
$(Q) wget https://github.com/argtable/argtable3/archive/$(ARGTABLE3_TARBALL) $(Q) curl -O -L https://github.com/argtable/argtable3/archive/$(ARGTABLE3_TARBALL)
$(ARGTABLE3_UNPACK): $(ARGTABLE3_TARBALL) $(ARGTABLE3_UNPACK): $(ARGTABLE3_TARBALL)
$(Q) tar zxf $(ARGTABLE3_TARBALL) $(Q) tar zxf $(ARGTABLE3_TARBALL)
$(Q) mv argtable3-$(ARGTABLE3_VERSION) $(ARGTABLE3_UNPACK) $(Q) mv argtable3-$(ARGTABLE3_VERSION) $(ARGTABLE3_UNPACK)
$(Q) echo "Patching $(ARGTABLE3_UNPACK)" $(Q) echo "Patching $(ARGTABLE3_UNPACK)"
$(Q) patch -p0 < argtable3.patch $(Q) patch -p0 < 0001-feat-Switch-to-FreeBSD-getopt-library.patch
$(ARGTABLE3_UNPACK)/.patch: $(ARGTABLE3_UNPACK) $(ARGTABLE3_UNPACK)/.patch: $(ARGTABLE3_UNPACK)
$(Q) touch $(ARGTABLE3_UNPACK)/.patch $(Q) touch $(ARGTABLE3_UNPACK)/.patch