Merge branch 'cargo-dynamic-all' into 'master'

Make cargo template dynamically linked

See merge request redox-os/cookbook!692

recipes/core/dash/recipe.toml

@@ -5,6 +5,7 @@ branch = "redox"
 [build]
 template = "custom"
 script = """
+DYNAMIC_INIT
 rsync -av --delete "${COOKBOOK_SOURCE}/" ./
 ./autogen.sh
 ./configure \

recipes/core/extrautils/recipe.toml

@@ -2,7 +2,16 @@
 git = "https://gitlab.redox-os.org/redox-os/extrautils.git"
 
 [build]
-template = "cargo"
+template = "custom"
 dependencies = [
     "xz"
 ]
+script = """
+DYNAMIC_INIT
+
+if [ "${COOKBOOK_DYNAMIC}" != "1" ]; then
+    install_flags+=" --features=static"
+fi
+
+cookbook_cargo
+"""

recipes/core/findutils/recipe.toml

@@ -4,5 +4,6 @@ git = "https://gitlab.redox-os.org/redox-os/findutils.git"
 [build]
 template = "custom"
 script = """
+DYNAMIC_INIT
 cookbook_cargo --bin find
 """

recipes/core/ion/recipe.toml

@@ -4,5 +4,6 @@ git = "https://gitlab.redox-os.org/redox-os/ion.git"
 [build]
 template = "custom"
 script = """
+# Must be statically linked
 cookbook_cargo
 """

recipes/core/pkgar/recipe.toml

@@ -2,11 +2,5 @@
 git = "https://gitlab.redox-os.org/redox-os/pkgar.git"
 
 [build]
-template = "custom"
-script = """
-"${COOKBOOK_CARGO}" install \
-    --path "${COOKBOOK_SOURCE}/pkgar" \
-    --root "${COOKBOOK_STAGE}/usr" \
-    --locked \
-    --no-track
-"""
+template = "cargo"
+package_path = "pkgar"

recipes/core/pkgutils/recipe.toml

@@ -4,6 +4,7 @@ git = "https://gitlab.redox-os.org/redox-os/pkgutils.git"
 [build]
 template = "custom"
 script = """
+# Must be statically linked
 PACKAGE_PATH=pkg-cli
 cookbook_cargo
 """

recipes/core/profiled/recipe.toml

@@ -2,4 +2,8 @@
 git = "https://gitlab.redox-os.org/redox-os/profiled.git"
 
 [build]
-template = "cargo"
+template = "custom"
+script = """
+# Must be statically linked
+cookbook_cargo
+"""

recipes/core/redoxfs/recipe.toml

@@ -2,4 +2,8 @@
 git = "https://gitlab.redox-os.org/redox-os/redoxfs.git"
 
 [build]
-template = "cargo"
+template = "custom"
+script = """
+# Must be statically linked
+cookbook_cargo
+"""

recipes/core/userutils/recipe.toml

@@ -4,6 +4,7 @@ git = "https://gitlab.redox-os.org/redox-os/userutils.git"
 [build]
 template = "custom"
 script = """
+DYNAMIC_INIT
 cookbook_cargo
 cp -rv "${COOKBOOK_SOURCE}/res" "${COOKBOOK_STAGE}/etc"
 ln -s id "${COOKBOOK_STAGE}/usr/bin/whoami"

recipes/core/uutils/recipe.toml

@@ -5,6 +5,7 @@ git = "https://github.com/uutils/coreutils"
 [build]
 template = "custom"
 script = """
+DYNAMIC_INIT
 cookbook_cargo --no-default-features --features feat_os_unix_redox --bin coreutils
 
 BINS=(

recipes/graphics/procedural-wallpapers-rs/recipe.toml

@@ -2,8 +2,5 @@
 git = "https://github.com/lukas-kirschner/procedural-wallpapers-rs.git"
 
 [build]
-template = "custom"
-script = """
-COOKBOOK_SOURCE="${COOKBOOK_SOURCE}"/procedural_wallpapers
-cookbook_cargo
-"""
+template = "cargo"
+package_path = "procedural_wallpapers"

recipes/gui/installer-gui/recipe.toml

@@ -4,6 +4,7 @@ git = "https://gitlab.redox-os.org/redox-os/installer-gui.git"
 [build]
 template = "custom"
 script = """
+DYNAMIC_INIT
 cookbook_cargo
 
 mkdir -pv "${COOKBOOK_STAGE}/ui/apps"

recipes/gui/orbterm/recipe.toml

@@ -4,6 +4,7 @@ git = "https://gitlab.redox-os.org/redox-os/orbterm.git"
 [build]
 template = "custom"
 script = """
+DYNAMIC_INIT
 mkdir -pv "${COOKBOOK_STAGE}/ui"
 cp -rv "${COOKBOOK_SOURCE}/apps" "${COOKBOOK_STAGE}/ui/apps"
 

recipes/gui/orbutils/recipe.toml

@@ -4,6 +4,7 @@ git = "https://gitlab.redox-os.org/redox-os/orbutils.git"
 [build]
 template = "custom"
 script = """
+DYNAMIC_INIT
 mkdir -pv "${COOKBOOK_STAGE}/ui"
 cp -rv "${COOKBOOK_SOURCE}/apps" "${COOKBOOK_STAGE}/ui/apps"
 

recipes/net/curl/recipe.toml

@@ -12,6 +12,7 @@ dependencies = [
     "zlib"
 ]
 script = """
+DYNAMIC_INIT
 rsync -av --delete "${COOKBOOK_SOURCE}/" ./
 GNU_CONFIG_GET config.sub
 DYNAMIC_INIT

recipes/shells/bash/recipe.toml

@@ -12,6 +12,7 @@ dependencies = [
     "readline",
 ]
 script = """
+DYNAMIC_INIT
 COOKBOOK_CONFIGURE_FLAGS+=(
     ac_cv_func_wcwidth=no # TODO: add more wc functions and remove this
     bash_cv_func_sigsetjmp=no

recipes/tools/diffutils/recipe.toml

@@ -9,7 +9,7 @@ autoreconf
 [build]
 template = "custom"
 script = """
-export LDFLAGS="-static"
+DYNAMIC_INIT
 COOKBOOK_CONFIGURE_FLAGS+=(
     gt_cv_locale_fr=false
     gt_cv_locale_fr_utf8=false

recipes/tools/gnu-grep/recipe.toml

@@ -6,12 +6,10 @@ patches = ["grep.patch"]
 [build]
 template = "custom"
 script = """
+DYNAMIC_INIT
 COOKBOOK_CONFIGURE_FLAGS+=(
     --prefix=/
 )
 cookbook_configure
-
-"${TARGET}-strip" "${COOKBOOK_STAGE}/bin/grep"
-
 rm -rf "${COOKBOOK_STAGE}"/{lib,share}
-"""
+"""

recipes/tools/periodictable/recipe.toml

@@ -4,6 +4,8 @@ git = "https://gitlab.redox-os.org/redox-os/periodictable.git"
 [build]
 template = "custom"
 script = """
+DYNAMIC_INIT
+cookbook_cargo
 mkdir -pv "${COOKBOOK_STAGE}/ui/apps"
 cp -v "${COOKBOOK_SOURCE}/pkg/manifest" "${COOKBOOK_STAGE}/ui/apps/periodictable"
 mkdir -pv "${COOKBOOK_STAGE}/ui/icons"

recipes/tools/sodium/recipe.toml

@@ -4,6 +4,7 @@ git = "https://gitlab.redox-os.org/redox-os/sodium.git"
 [build]
 template = "custom"
 script = """
+DYNAMIC_INIT
 "${COOKBOOK_CARGO}" install \
     --path "${COOKBOOK_SOURCE}" \
     --root "${COOKBOOK_STAGE}/usr" \

recipes/tools/vim/recipe.toml

@@ -7,6 +7,7 @@ patches = ["vim.patch"]
 dependencies = ["ncurses"]
 template = "custom"
 script = """
+DYNAMIC_INIT
 rsync -av --delete "${COOKBOOK_SOURCE}/" ./
 
 export vim_cv_toupper_broken=no

src/cook/cook_build.rs

@@ -298,7 +298,7 @@ pub fn build(
                 cargoflags,
             } => {
                 format!(
-                    "PACKAGE_PATH={} cookbook_cargo {cargoflags}",
+                    "DYNAMIC_INIT\nPACKAGE_PATH={} cookbook_cargo {cargoflags}",
                     package_path.as_deref().unwrap_or(".")
                 )
             }