rust-indoc-impl: New package.

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

diff --git a/make.sh b/make.sh
index 6a7f2db666bb47769087fa7f44e7b782d6c125aa..d01c7a90bf7af2c4ea2c8ec057d9ddf6edcc7f17 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="163"                                                     # 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
@@ -170,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)
@@ -205,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
@@ -1128,6 +1129,7 @@ buildbase() {
        lfsmake2 util-linux
        lfsmake2 vim
        lfsmake2 e2fsprogs
+       lfsmake2 jq
 }
 
 buildipfire() {
@@ -1213,6 +1215,74 @@ buildipfire() {
   lfsmake2 sqlite
   lfsmake2 libffi
   lfsmake2 python3
+  lfsmake2 rust
+  lfsmake2 rust-dissimilar
+  lfsmake2 rust-cfg-if
+  lfsmake2 rust-libc
+  lfsmake2 rust-getrandom
+  lfsmake2 rust-typenum
+  lfsmake2 rust-version-check
+  lfsmake2 rust-generic-array
+  lfsmake2 rust-cipher
+  lfsmake2 rust-hex
+  lfsmake2 rust-unicode-xid
+  lfsmake2 rust-proc-macro2
+  lfsmake2 rust-quote
+  lfsmake2 rust-syn
+  lfsmake2 rust-home
+  lfsmake2 rust-lazy-static
+  lfsmake2 rust-memchr
+  lfsmake2 rust-aho-corasick
+  lfsmake2 rust-regex-syntax
+  lfsmake2 rust-regex
+  lfsmake2 rust-ucd-trie
+  lfsmake2 rust-pest
+  lfsmake2 rust-semver-parser
+  lfsmake2 rust-semver
+  lfsmake2 rust-same-file
+  lfsmake2 rust-walkdir
+  lfsmake2 rust-dirs
+  lfsmake2 rust-toolchain_find
+  lfsmake2 rust-serde
+  lfsmake2 rust-itoa
+  lfsmake2 rust-ryu
+  lfsmake2 rust-serde_json
+  lfsmake2 rust-synstructure
+  lfsmake2 rust-block-buffer
+  lfsmake2 rust-crypto-common
+  lfsmake2 rust-digest
+  lfsmake2 rust-ppv-lite86
+  lfsmake2 rust-rand_core
+  lfsmake2 rust-rand_core-0.4.2
+  lfsmake2 rust-rand_core-0.3.1
+  lfsmake2 rust-rand_chacha
+  lfsmake2 rust-rand_hc
+  lfsmake2 rust-rand
+  lfsmake2 rust-rdrand
+  lfsmake2 rust-rand-0.4
+  lfsmake2 rust-log
+  lfsmake2 rust-num_cpus
+  lfsmake2 rust-crossbeam-utils
+  lfsmake2 rust-autocfg
+  lfsmake2 rust-memoffset
+  lfsmake2 rust-scopeguard
+  lfsmake2 rust-crossbeam-epoch
+  lfsmake2 rust-crossbeam-deque
+  lfsmake2 rust-either
+  lfsmake2 rust-crossbeam-channel
+  lfsmake2 rust-rayon-core
+  lfsmake2 rust-rayon
+  lfsmake2 rust-remove_dir_all
+  lfsmake2 rust-tempdir
+  lfsmake2 rust-glob
+  lfsmake2 rust-once_cell
+  lfsmake2 rust-termcolor
+  lfsmake2 rust-toml
+  lfsmake2 rust-serde_derive
+  lfsmake2 rust-trybuild
+  lfsmake2 rust-unindent
+  lfsmake2 rust-proc-macro-hack
+  lfsmake2 rust-indoc-impl
   lfsmake2 gdb
   lfsmake2 grub
   lfsmake2 efivar
@@ -1339,7 +1409,6 @@ buildipfire() {
   lfsmake2 rrdtool
   lfsmake2 setup
   lfsmake2 libdnet
-  lfsmake2 rust
   lfsmake2 jansson
   lfsmake2 yaml
   lfsmake2 libhtp
@@ -1566,7 +1635,6 @@ buildipfire() {
   lfsmake2 frr
   lfsmake2 dmidecode
   lfsmake2 mcelog
-  lfsmake2 util-macros
   lfsmake2 libpciaccess
   lfsmake2 libyajl
   lfsmake2 libvirt
@@ -1600,6 +1668,7 @@ buildipfire() {
   lfsmake2 libcdada
   lfsmake2 pmacct
   lfsmake2 squid-asnbl
+  lfsmake2 qemu-ga
 }
 
 buildinstaller() {
@@ -1958,7 +2027,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