Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions build-config/make/crosstool-ng.make
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ XTOOLS_LIBC_VERSION ?= 1.0.38

# http://crosstool-ng.github.io/
CROSSTOOL_NG_DESC = crosstool-NG
CROSSTOOL_NG_VERSION = 1.24.0
CROSSTOOL_NG_VERSION ?= 1.24.0
CROSSTOOL_NG_TARBALL = crosstool-ng-$(CROSSTOOL_NG_VERSION).tar.xz
CROSSTOOL_NG_URLS += $(ONIE_MIRROR) http://crosstool-ng.org/download/crosstool-ng
CROSSTOOL_NG_URLS += $(ONIE_MIRROR) https://github.com/crosstool-ng/crosstool-ng/releases/download/crosstool-ng-$(CROSSTOOL_NG_VERSION)/
CROSSTOOL_NG_BUILD_DIR = $(BUILDDIR)/crosstool-ng
CROSSTOOL_NG_STAMP_DIR = $(CROSSTOOL_NG_BUILD_DIR)/stamp
CROSSTOOL_NG_DIR = $(CROSSTOOL_NG_BUILD_DIR)/crosstool-ng-$(CROSSTOOL_NG_VERSION)

CROSSTOOL_NG_SRCPATCHDIR = $(PATCHDIR)/crosstool-NG
CROSSTOOL_NG_SRCPATCHDIR = $(PATCHDIR)/crosstool-NG/$(CROSSTOOL_NG_VERSION)
CROSSTOOL_NG_LOCAL_PATCHDIR = $(CROSSTOOL_NG_SRCPATCHDIR)/local
CROSSTOOL_NG_DOWNLOAD_STAMP = $(DOWNLOADDIR)/crosstool-ng-$(CROSSTOOL_NG_VERSION)-download
CROSSTOOL_NG_SOURCE_STAMP = $(CROSSTOOL_NG_STAMP_DIR)/crosstool-ng-source
Expand Down
2 changes: 2 additions & 0 deletions build-config/make/images.make
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,8 @@ ifeq ($(REQUIRE_CXX_LIBS),yes)
SYSROOT_LIBS += libstdc++.so.6.0.20
else ifeq ($(GCC_VERSION),8.3.0)
SYSROOT_LIBS += libstdc++.so.6.0.25
else ifeq ($(GCC_VERSION),8.5.0)
SYSROOT_LIBS += libstdc++.so.6.0.25
else
$(error C++ support: Unsupported GCC version: $(GCC_VERSION))
endif
Expand Down
27 changes: 26 additions & 1 deletion build-config/make/xtools.make
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,15 @@ PHONY += xtools xtools-prep xtools-download xtools-config \
xtools-build xtools-clean xtools-distclean uclibc-menuconfig

# List of common packages needed by crosstool-NG
ifeq ($(CROSSTOOL_NG_VERSION),1.28.0)
CT_NG_COMPONENTS = \
autoconf-2.72.tar.xz \
automake-1.17.tar.xz \
libelf-0.8.13.tar.gz \
libtool-2.5.4.tar.xz \
m4-1.4.20.tar.xz \
make-4.4.1.tar.gz
else
CT_NG_COMPONENTS = \
autoconf-2.69.tar.xz \
automake-1.15.1.tar.xz \
Expand All @@ -55,8 +64,21 @@ CT_NG_COMPONENTS = \
m4-1.4.18.tar.xz \
make-4.2.1.tar.bz2 \
ncurses-6.0.tar.gz
endif

ifeq ($(GCC_VERSION),8.3.0)
ifeq ($(GCC_VERSION),8.5.0)
CT_NG_COMPONENTS += \
binutils-2.32.tar.bz2 \
expat-2.2.6.tar.bz2 \
gcc-8.5.0.tar.xz \
gmp-6.3.0.tar.xz \
isl-0.27.tar.xz \
mpc-1.3.1.tar.gz \
mpfr-4.2.2.tar.xz \
strace-6.16.tar.xz \
zlib-1.3.1.tar.xz \
zstd-1.5.7.tar.gz
else ifeq ($(GCC_VERSION),8.3.0)
CT_NG_COMPONENTS += \
binutils-2.32.tar.bz2 \
expat-2.2.6.tar.bz2 \
Expand Down Expand Up @@ -174,6 +196,9 @@ xtools-distclean:
# The new .config will need to be merged (or upgraded)
# with the existing one to actually be applied, though.
uclibc-menuconfig:
# TODO: after crosstool-NG 1.24.0 uClibc is called uClibc-ng so the code below
# needs to adapt to use src/uClibc or src/uClibc-ng based on the ctng
# version
# The rest of the path can be hardcodeed since only x86 uses uClibc
$(Q) cd $(XTOOLS_BUILD_DIR)/build/x86_64-onie-linux-uclibc/src/uClibc \
&& make menuconfig
Expand Down
6 changes: 5 additions & 1 deletion machine/kvm_x86_64/machine.make
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,12 @@ ifeq ($(SECURE_BOOT_EXT),yes)
SECURE_BOOT_ENABLE = yes
endif

# Specify the version of crosstool-NG. 1.28.0 gives access to newer compiler
# versions
CROSSTOOL_NG_VERSION = 1.28.0


# Specify the version of GCC
GCC_VERSION = 8.5.0

#-------------------------------------------------------------------------------
#
Expand Down
File renamed without changes.
1 change: 1 addition & 0 deletions upstream/autoconf-2.72.tar.xz.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1d082d999ff4506ec8f92c6ecb9732546f5204fb autoconf-2.72.tar.xz
1 change: 1 addition & 0 deletions upstream/automake-1.17.tar.xz.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
626e4e1fe203cddb1d50ca7e6a3a396baa8190b8 automake-1.17.tar.xz
1 change: 1 addition & 0 deletions upstream/crosstool-ng-1.28.0.tar.xz.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cdeeea026046bd4408e1e6248ae96b7383665110 crosstool-ng-1.28.0.tar.xz
1 change: 1 addition & 0 deletions upstream/gcc-8.5.0.tar.xz.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2e93f85672f57023d45c20fef9572b72f8a3e7f1 gcc-8.5.0.tar.xz
1 change: 1 addition & 0 deletions upstream/gmp-6.3.0.tar.xz.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b4043dd2964ab1a858109da85c44de224384f352 gmp-6.3.0.tar.xz
1 change: 1 addition & 0 deletions upstream/isl-0.27.tar.xz.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8778bdabc1fbebe392564440c1ebbaaa45cdaf85 isl-0.27.tar.xz
1 change: 1 addition & 0 deletions upstream/libtool-2.5.4.tar.xz.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9781a113fe6af1b150571410b29d3eee2e792516 libtool-2.5.4.tar.xz
1 change: 1 addition & 0 deletions upstream/m4-1.4.20.tar.xz.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
025df51430845178f926b20a078f994eefaa50fd m4-1.4.20.tar.xz
1 change: 1 addition & 0 deletions upstream/make-4.4.1.tar.gz.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5ca41d365c35a4ded07d616190baf38814c25f2a make-4.4.1.tar.gz
1 change: 1 addition & 0 deletions upstream/mpc-1.3.1.tar.gz.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bac1c1fa79f5602df1e29e4684e103ad55714e02 mpc-1.3.1.tar.gz
1 change: 1 addition & 0 deletions upstream/mpfr-4.2.2.tar.xz.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a63a264b273a652e27518443640e69567da498ce mpfr-4.2.2.tar.xz
1 change: 1 addition & 0 deletions upstream/strace-6.16.tar.xz.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4e89c156d9754056cfae9fdc87b4f9ee2b3510af strace-6.16.tar.xz
1 change: 1 addition & 0 deletions upstream/zlib-1.3.1.tar.xz.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
30b78dfdbe5d23d697738eb175ed34a3c4c2b561 zlib-1.3.1.tar.xz
1 change: 1 addition & 0 deletions upstream/zstd-1.5.7.tar.gz.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6c7dd9c829561ac5475b72592a079a01ab7f3eab zstd-1.5.7.tar.gz