make.sh: Set a good default for rustc flags

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

diff --git a/make.sh b/make.sh
index e6f948ba073c14ca05f3374d620263fcb2990f7d..5f22f74091b4af3b9eb43d27f714c408a81619c7 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -26,7 +26,7 @@ NAME="IPFire"                                                 # Software name
 SNAME="ipfire"                                                 # Short name
 # If you update the version don't forget to update backupiso and add it to core update
 VERSION="2.27"                                                 # Version number
-CORE="162"                                                     # Core Level (Filename)
+CORE="164"                                                     # Core Level (Filename)
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
 MAX_RETRIES=1                                                  # prefetch/check loop
@@ -151,13 +151,6 @@ configure_build() {
                        CFLAGS_ARCH="-m64 -mtune=generic -fstack-clash-protection -fcf-protection"
                        ;;
 
-               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"
-                       ;;
-
                aarch64)
                        BUILDTARGET="${build_arch}-unknown-linux-gnu"
                        CROSSTARGET="${build_arch}-cross-linux-gnu"
@@ -177,7 +170,6 @@ configure_build() {
                        CROSSTARGET="${build_arch}-cross-linux-gnueabi"
                        BUILD_PLATFORM="arm"
                        CFLAGS_ARCH="-march=armv6zk+fp -mfpu=vfp -mfloat-abi=softfp -fomit-frame-pointer"
-                       #RUSTFLAGS="-Ccodegen-units=1"
                        ;;
 
                riscv64)
@@ -212,6 +204,8 @@ configure_build() {
        CFLAGS="-O2 -pipe -Wall -fexceptions -fPIC ${CFLAGS_ARCH}"
        CXXFLAGS="${CFLAGS}"
 
+       RUSTFLAGS="-Copt-level=3 -Clink-arg=-Wl,-z,relro,-z,now -Ccodegen-units=1 --cap-lints=warn ${RUSTFLAGS_ARCH}"
+
        # Determine parallelism
        # We assume that each process consumes about
        # 128MB of memory. Therefore we find out how
@@ -247,7 +241,7 @@ configure_build() {
 
        # XZ memory cannot be larger than 2GB on 32 bit systems
        case "${build_arch}" in
-               i*86|armv*)
+               armv*)
                        if [ ${xz_memory} -gt 2048 ]; then
                                xz_memory=2048
                        fi
@@ -262,9 +256,6 @@ configure_build_guess() {
                x86_64)
                        echo "x86_64"
                        ;;
-               i?86)
-                       echo "i586"
-                       ;;
 
                aarch64)
                        echo "aarch64"
@@ -990,14 +981,6 @@ buildtoolchain() {
                         # This is working.
                         ;;
 
-               # x86
-               i586:i586|i586:i686|i586:x86_64)
-                       # These are working.
-                       ;;
-               i586:*)
-                       error=true
-                       ;;
-
                # ARM
                arvm7hl:armv7hl|armv7hl:armv7l)
                        # These are working.
@@ -1280,6 +1263,7 @@ buildipfire() {
   lfsmake2 dosfstools
   lfsmake2 exfatprogs
   lfsmake2 reiserfsprogs
+  lfsmake2 liburcu
   lfsmake2 xfsprogs
   lfsmake2 sysfsutils
   lfsmake2 fuse
@@ -1350,6 +1334,8 @@ buildipfire() {
   lfsmake2 freefont
   lfsmake2 pixman
   lfsmake2 cairo
+  lfsmake2 harfbuzz
+  lfsmake2 fribidi
   lfsmake2 pango
   lfsmake2 rrdtool
   lfsmake2 setup
@@ -1581,7 +1567,6 @@ buildipfire() {
   lfsmake2 frr
   lfsmake2 dmidecode
   lfsmake2 mcelog
-  lfsmake2 util-macros
   lfsmake2 libpciaccess
   lfsmake2 libyajl
   lfsmake2 libvirt
@@ -1615,6 +1600,7 @@ buildipfire() {
   lfsmake2 libcdada
   lfsmake2 pmacct
   lfsmake2 squid-asnbl
+  lfsmake2 qemu-ga
 }
 
 buildinstaller() {
@@ -1973,7 +1959,7 @@ check-manualpages)
        fi
        ;;
 *)
-       echo "Usage: $0 {build|changelog|clean|gettoolchain|downloadsrc|shell|sync|toolchain|update-contributors|find-dependencies|check-manualpages}"
+       echo "Usage: $0 [OPTIONS] {build|changelog|clean|gettoolchain|downloadsrc|shell|sync|toolchain|update-contributors|find-dependencies|check-manualpages}"
        cat doc/make.sh-usage
        ;;
 esac