OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

libxx: Give VERSION make variable prefix to avoid the conflict 

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2021-08-30 11:48:56 +08:00 committed by Abdelatif Guettouche
parent e01e5f5008
commit 397d329966
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libs/libxx/libcxx.defs
View File

@ -18,15 +18,15 @@
#
###########################################################################
VERSION=12.0.0
LIBCXX_VERSION=12.0.0
libcxx-$(VERSION).src.tar.xz:
$(Q) curl -O -L https://github.com/llvm/llvm-project/releases/download/llvmorg-$(VERSION)/libcxx-$(VERSION).src.tar.xz
libcxx-$(LIBCXX_VERSION).src.tar.xz:
$(Q) curl -O -L https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LIBCXX_VERSION)/libcxx-$(LIBCXX_VERSION).src.tar.xz
libcxx: libcxx-$(VERSION).src.tar.xz
$(Q) tar -xf libcxx-$(VERSION).src.tar.xz \
--exclude libcxx-$(VERSION).src/test/std/pstl
$(Q) mv libcxx-$(VERSION).src libcxx
libcxx: libcxx-$(LIBCXX_VERSION).src.tar.xz
$(Q) tar -xf libcxx-$(LIBCXX_VERSION).src.tar.xz \
--exclude libcxx-$(LIBCXX_VERSION).src/test/std/pstl
$(Q) mv libcxx-$(LIBCXX_VERSION).src libcxx
$(Q) patch -p0 < 0001-Remove-the-locale-fallback-for-NuttX.patch
$(Q) patch -p0 < 0001-libc-avoid-the-waring-__EXCEPTIONS-is-not-defined-ev.patch
$(Q) touch $@
@ -37,7 +37,7 @@ $(TOPDIR)/include/libcxx: libcxx
context:: $(TOPDIR)/include/libcxx
distclean::
$(Q) $(DELFILE) libcxx-$(VERSION).src.tar.xz
$(Q) $(DELFILE) libcxx-$(LIBCXX_VERSION).src.tar.xz
$(Q) $(DIRUNLINK) $(TOPDIR)/include/libcxx
$(call DELDIR, libcxx)

14
libs/libxx/libcxxabi.defs
View File

@ -18,19 +18,19 @@
#
###########################################################################
VERSION=12.0.0
LIBCXXABI_VERSION=12.0.0
libcxxabi-$(VERSION).src.tar.xz:
$(Q) curl -O -L https://github.com/llvm/llvm-project/releases/download/llvmorg-$(VERSION)/libcxxabi-$(VERSION).src.tar.xz
libcxxabi-$(LIBCXXABI_VERSION).src.tar.xz:
$(Q) curl -O -L https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LIBCXXABI_VERSION)/libcxxabi-$(LIBCXXABI_VERSION).src.tar.xz
libcxxabi: libcxxabi-$(VERSION).src.tar.xz
$(Q) tar -xf libcxxabi-$(VERSION).src.tar.xz
$(Q) mv libcxxabi-$(VERSION).src libcxxabi
libcxxabi: libcxxabi-$(LIBCXXABI_VERSION).src.tar.xz
$(Q) tar -xf libcxxabi-$(LIBCXXABI_VERSION).src.tar.xz
$(Q) mv libcxxabi-$(LIBCXXABI_VERSION).src libcxxabi
$(Q) patch -p0 < 0001-libc-abi-avoid-the-waring-__EXCEPTIONS-is-not-define.patch
$(Q) touch $@
distclean::
$(Q) $(DELFILE) libcxxabi-$(VERSION).src.tar.xz
$(Q) $(DELFILE) libcxxabi-$(LIBCXXABI_VERSION).src.tar.xz
$(call DELDIR, libcxxabi)
context:: libcxxabi

10
libs/libxx/uClibc++.defs
View File

@ -18,13 +18,13 @@
#
###########################################################################
VERSION=0.2.5
UCLIBCXX_VERSION=0.2.5
$(TOPDIR)/include/uClibc++:
$(Q) curl -O -L https://git.busybox.net/uClibc++/snapshot/uClibc++-$(VERSION).tar.bz2
$(Q) tar -xf uClibc++-$(VERSION).tar.bz2
$(Q) $(DELFILE) uClibc++-$(VERSION).tar.bz2
$(Q) mv uClibc++-$(VERSION) uClibc++
curl -O -L https://git.busybox.net/uClibc++/snapshot/uClibc++-$(UCLIBCXX_VERSION).tar.bz2
$(Q) tar -xf uClibc++-$(UCLIBCXX_VERSION).tar.bz2
$(Q) $(DELFILE) uClibc++-$(UCLIBCXX_VERSION).tar.bz2
$(Q) mv uClibc++-$(UCLIBCXX_VERSION) uClibc++
$(Q) $(DIRLINK) $(CURDIR)/uClibc++/include $(TOPDIR)/include/uClibc++
$(Q) $(COPYFILE) $(CURDIR)/system_configuration.h $(TOPDIR)/include/uClibc++