make.sh: make requires pkg-config to run autoconf

[ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index 9d59977afaeaa031a777acf0616d4cac3dcc90d4..4e690b7f99fa5089299b20f92582ea43571d57e5 100755 (executable)
--- 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,8 @@ buildtoolchain() {
        lfsmake1 tar
        lfsmake1 texinfo
        lfsmake1 xz
+       lfsmake1 bison
+       lfsmake1 flex
        lfsmake1 fake-environ
        lfsmake1 strip
        lfsmake1 cleanup-toolchain
@@ -982,7 +984,6 @@ buildbase() {
        lfsmake2 iana-etc
        lfsmake2 m4
        lfsmake2 bison
-       lfsmake2 ncurses-compat
        lfsmake2 ncurses
        lfsmake2 procps
        lfsmake2 libtool
@@ -1009,6 +1010,7 @@ buildbase() {
        lfsmake2 jwhois
        lfsmake2 kbd
        lfsmake2 less
+       lfsmake2 pkg-config
        lfsmake2 make
        lfsmake2 man
        lfsmake2 kmod
@@ -1033,7 +1035,6 @@ buildipfire() {
   lfsmake2 configroot
   lfsmake2 initscripts
   lfsmake2 backup
-  lfsmake2 pkg-config
   lfsmake2 libusb
   lfsmake2 libusb-compat
   lfsmake2 libpcap
@@ -1428,7 +1429,6 @@ buildipfire() {
   lfsmake2 libsrtp
   lfsmake2 jansson
   lfsmake2 asterisk
-  lfsmake2 lcr
   lfsmake2 usb_modeswitch
   lfsmake2 usb_modeswitch_data
   lfsmake2 zerofree