X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=make.sh;h=e7b385ce90e7dcd23771c1cd0129b6864a167b30;hb=09cdb999daaad3488b749abc50dada43adaf9e12;hp=831faa728bf31266b7f062366f547539ab49e1ed;hpb=2c21c4e522fd5cb280a209544835e87f3c6d022f;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/make.sh b/make.sh
index 831faa728b..e7b385ce90 100755
--- a/make.sh
+++ b/make.sh
@@ -37,7 +37,7 @@ KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
 GIT_TAG=$(git tag | tail -1)					# Git Tag
 GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8)	# Last commit
 
-TOOLCHAINVER=20171121
+TOOLCHAINVER=20180126
 
 ###############################################################################
 #
@@ -144,14 +144,14 @@ configure_build() {
 			BUILDTARGET="${build_arch}-unknown-linux-gnu"
 			CROSSTARGET="${build_arch}-cross-linux-gnu"
 			BUILD_PLATFORM="x86"
-			CFLAGS_ARCH="-m64 -mtune=generic"
+			CFLAGS_ARCH="-m64 -mindirect-branch=thunk -mfunction-return=thunk -mtune=generic"
 			;;
 
 		i586)
 			BUILDTARGET="${build_arch}-pc-linux-gnu"
 			CROSSTARGET="${build_arch}-cross-linux-gnu"
 			BUILD_PLATFORM="x86"
-			CFLAGS_ARCH="-march=i586 -mtune=generic -fomit-frame-pointer"
+			CFLAGS_ARCH="-march=i586 -mindirect-branch=thunk -mfunction-return=thunk -mtune=generic -fomit-frame-pointer"
 			;;
 
 		aarch64)
@@ -952,6 +952,7 @@ buildtoolchain() {
 	lfsmake1 tar
 	lfsmake1 texinfo
 	lfsmake1 xz
+	lfsmake1 flex
 	lfsmake1 fake-environ
 	lfsmake1 strip
 	lfsmake1 cleanup-toolchain
@@ -982,7 +983,6 @@ buildbase() {
 	lfsmake2 iana-etc
 	lfsmake2 m4
 	lfsmake2 bison
-	lfsmake2 ncurses-compat
 	lfsmake2 ncurses
 	lfsmake2 procps
 	lfsmake2 libtool
@@ -1045,7 +1045,6 @@ buildipfire() {
   lfsmake2 dvb-firmwares
   lfsmake2 zd1211-firmware
   lfsmake2 rpi-firmware
-  lfsmake2 intel-microcode
   lfsmake2 bc
   lfsmake2 u-boot
   lfsmake2 cpio
@@ -1120,7 +1119,6 @@ buildipfire() {
 		lfsmake2 linux-initrd			KCFG="-kirkwood"
 		;;
   esac
-  lfsmake2 intel-microcode
   lfsmake2 xtables-addons			USPACE="1"
   lfsmake2 openssl
   [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2'
@@ -1282,6 +1280,7 @@ buildipfire() {
   lfsmake2 wireless
   lfsmake2 pakfire
   lfsmake2 spandsp
+  lfsmake2 lz4
   lfsmake2 lzo
   lfsmake2 openvpn
   lfsmake2 pammysql
@@ -1509,7 +1508,6 @@ buildipfire() {
   lfsmake2 libpciaccess
   lfsmake2 libyajl
   lfsmake2 libvirt
-  lfsmake2 python3-libvirt
   lfsmake2 freeradius
   lfsmake2 perl-common-sense
   lfsmake2 perl-inotify2