From 28180c39ff31e029dd3791af10f43972c20e9067 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Thu, 21 May 2020 12:02:16 -0600
Subject: [PATCH] Set CPPFLAGS, add more recipes
---
recipes/libpng/recipe.toml | 13 +++++++++++++
recipes/libvorbis/recipe.toml | 9 +++++++++
recipes/logd/recipe.toml | 5 +++++
recipes/nasm/recipe.toml | 5 +++++
recipes/netstack/recipe.toml | 5 +++++
recipes/netutils/recipe.toml | 6 ++++++
recipes/nulld/recipe.toml | 5 +++++
recipes/pkgar/recipe.toml | 5 +++++
recipes/pkgutils/recipe.toml | 5 +++++
recipes/ptyd/recipe.toml | 5 +++++
recipes/ramfs/recipe.toml | 5 +++++
recipes/redoxerd/recipe.toml | 12 ++++++++++++
recipes/redoxfs/recipe.toml | 5 +++++
recipes/sed/recipe.toml | 5 +++++
recipes/shellstorm/recipe.toml | 5 +++++
recipes/smith/recipe.toml | 5 +++++
recipes/zerod/recipe.toml | 5 +++++
src/bin/cook.rs | 1 +
18 files changed, 106 insertions(+)
create mode 100644 recipes/libpng/recipe.toml
create mode 100644 recipes/libvorbis/recipe.toml
create mode 100644 recipes/logd/recipe.toml
create mode 100644 recipes/nasm/recipe.toml
create mode 100644 recipes/netstack/recipe.toml
create mode 100644 recipes/netutils/recipe.toml
create mode 100644 recipes/nulld/recipe.toml
create mode 100644 recipes/pkgar/recipe.toml
create mode 100644 recipes/pkgutils/recipe.toml
create mode 100644 recipes/ptyd/recipe.toml
create mode 100644 recipes/ramfs/recipe.toml
create mode 100644 recipes/redoxerd/recipe.toml
create mode 100644 recipes/redoxfs/recipe.toml
create mode 100644 recipes/sed/recipe.toml
create mode 100644 recipes/shellstorm/recipe.toml
create mode 100644 recipes/smith/recipe.toml
create mode 100644 recipes/zerod/recipe.toml
diff --git a/recipes/libpng/recipe.toml b/recipes/libpng/recipe.toml
new file mode 100644
index 000000000..ed7b95f14
--- /dev/null
+++ b/recipes/libpng/recipe.toml
@@ -0,0 +1,13 @@
+[source]
+tar = "https://github.com/glennrp/libpng/archive/v1.6.36.tar.gz"
+script = """
+chmod +w config.sub
+wget -O config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub
+"""
+
+
+[build]
+template = "configure"
+dependencies = [
+ "zlib"
+]
diff --git a/recipes/libvorbis/recipe.toml b/recipes/libvorbis/recipe.toml
new file mode 100644
index 000000000..47facfd66
--- /dev/null
+++ b/recipes/libvorbis/recipe.toml
@@ -0,0 +1,9 @@
+[source]
+tar = "http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.6.tar.xz"
+sha256 = "af00bb5a784e7c9e69f56823de4637c350643deedaf333d0fa86ecdba6fcb415"
+
+[build]
+template = "configure"
+dependencies = [
+ "libogg"
+]
diff --git a/recipes/logd/recipe.toml b/recipes/logd/recipe.toml
new file mode 100644
index 000000000..6e906f119
--- /dev/null
+++ b/recipes/logd/recipe.toml
@@ -0,0 +1,5 @@
+[source]
+git = "https://gitlab.redox-os.org/redox-os/logd.git"
+
+[build]
+template = "cargo"
diff --git a/recipes/nasm/recipe.toml b/recipes/nasm/recipe.toml
new file mode 100644
index 000000000..384cd9e1f
--- /dev/null
+++ b/recipes/nasm/recipe.toml
@@ -0,0 +1,5 @@
+[source]
+tar = "http://www.nasm.us/pub/nasm/releasebuilds/2.14.02/nasm-2.14.02.tar.gz"
+
+[build]
+template = "configure"
diff --git a/recipes/netstack/recipe.toml b/recipes/netstack/recipe.toml
new file mode 100644
index 000000000..c2a534a28
--- /dev/null
+++ b/recipes/netstack/recipe.toml
@@ -0,0 +1,5 @@
+[source]
+git = "https://gitlab.redox-os.org/redox-os/netstack.git"
+
+[build]
+template = "cargo"
diff --git a/recipes/netutils/recipe.toml b/recipes/netutils/recipe.toml
new file mode 100644
index 000000000..e46f33a08
--- /dev/null
+++ b/recipes/netutils/recipe.toml
@@ -0,0 +1,6 @@
+[source]
+git = "https://gitlab.redox-os.org/redox-os/netutils.git"
+branch = "redox-unix"
+
+[build]
+template = "cargo"
diff --git a/recipes/nulld/recipe.toml b/recipes/nulld/recipe.toml
new file mode 100644
index 000000000..f9c725468
--- /dev/null
+++ b/recipes/nulld/recipe.toml
@@ -0,0 +1,5 @@
+[source]
+git = "https://gitlab.redox-os.org/redox-os/nulld.git"
+
+[build]
+template = "cargo"
diff --git a/recipes/pkgar/recipe.toml b/recipes/pkgar/recipe.toml
new file mode 100644
index 000000000..6770c627d
--- /dev/null
+++ b/recipes/pkgar/recipe.toml
@@ -0,0 +1,5 @@
+[source]
+git = "https://gitlab.redox-os.org/redox-os/pkgar.git"
+
+[build]
+template = "cargo"
diff --git a/recipes/pkgutils/recipe.toml b/recipes/pkgutils/recipe.toml
new file mode 100644
index 000000000..e222cb459
--- /dev/null
+++ b/recipes/pkgutils/recipe.toml
@@ -0,0 +1,5 @@
+[source]
+git = "https://gitlab.redox-os.org/redox-os/pkgutils.git"
+
+[build]
+template = "cargo"
diff --git a/recipes/ptyd/recipe.toml b/recipes/ptyd/recipe.toml
new file mode 100644
index 000000000..6984bbd95
--- /dev/null
+++ b/recipes/ptyd/recipe.toml
@@ -0,0 +1,5 @@
+[source]
+git = "https://gitlab.redox-os.org/redox-os/ptyd.git"
+
+[build]
+template = "cargo"
diff --git a/recipes/ramfs/recipe.toml b/recipes/ramfs/recipe.toml
new file mode 100644
index 000000000..dd8e751ee
--- /dev/null
+++ b/recipes/ramfs/recipe.toml
@@ -0,0 +1,5 @@
+[source]
+git = "https://gitlab.redox-os.org/redox-os/ramfs.git"
+
+[build]
+template = "cargo"
diff --git a/recipes/redoxerd/recipe.toml b/recipes/redoxerd/recipe.toml
new file mode 100644
index 000000000..16d4a5a7f
--- /dev/null
+++ b/recipes/redoxerd/recipe.toml
@@ -0,0 +1,12 @@
+[source]
+git = "https://gitlab.redox-os.org/redox-os/redoxer.git"
+
+[build]
+template = "custom"
+script = """
+COOKBOOK_CARGO_FLAGS=(
+ --path "${COOKBOOK_SOURCE}/daemon"
+ --root "${COOKBOOK_STAGE}"
+)
+cookbook_cargo
+"""
diff --git a/recipes/redoxfs/recipe.toml b/recipes/redoxfs/recipe.toml
new file mode 100644
index 000000000..31fdb491e
--- /dev/null
+++ b/recipes/redoxfs/recipe.toml
@@ -0,0 +1,5 @@
+[source]
+git = "https://gitlab.redox-os.org/redox-os/redoxfs.git"
+
+[build]
+template = "cargo"
diff --git a/recipes/sed/recipe.toml b/recipes/sed/recipe.toml
new file mode 100644
index 000000000..37f5f2fb6
--- /dev/null
+++ b/recipes/sed/recipe.toml
@@ -0,0 +1,5 @@
+[source]
+tar = "http://ftp.gnu.org/gnu/sed/sed-4.4.tar.xz"
+
+[build]
+template = "configure"
diff --git a/recipes/shellstorm/recipe.toml b/recipes/shellstorm/recipe.toml
new file mode 100644
index 000000000..daa6d4d46
--- /dev/null
+++ b/recipes/shellstorm/recipe.toml
@@ -0,0 +1,5 @@
+[source]
+git = "https://gitlab.redox-os.org/redox-os/shellstorm.git"
+
+[build]
+template = "cargo"
diff --git a/recipes/smith/recipe.toml b/recipes/smith/recipe.toml
new file mode 100644
index 000000000..fabc0dee4
--- /dev/null
+++ b/recipes/smith/recipe.toml
@@ -0,0 +1,5 @@
+[source]
+git = "https://gitlab.redox-os.org/redox-os/Smith.git"
+
+[build]
+template = "cargo"
diff --git a/recipes/zerod/recipe.toml b/recipes/zerod/recipe.toml
new file mode 100644
index 000000000..4606caf43
--- /dev/null
+++ b/recipes/zerod/recipe.toml
@@ -0,0 +1,5 @@
+[source]
+git = "https://gitlab.redox-os.org/redox-os/zerod.git"
+
+[build]
+template = "cargo"
diff --git a/src/bin/cook.rs b/src/bin/cook.rs
index db2d2bdec..303579421 100644
--- a/src/bin/cook.rs
+++ b/src/bin/cook.rs
@@ -345,6 +345,7 @@ export CARGO_TARGET_DIR="${COOKBOOK_BUILD}/target"
# This adds the sysroot includes for most C compilation
#TODO: check paths for spaces!
export CFLAGS="-I${COOKBOOK_SYSROOT}/include"
+export CPPFLAGS="-I${COOKBOOK_SYSROOT}/include"
# This adds the sysroot libraries and compiles binaries statically for most C compilation
#TODO: check paths for spaces!
--
GitLab