WIP: split off unrelated linux/win32 stuff #115
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I was able to build and run our AppImage with your split recipes so it seems to still be functional. However, I needed the following changes to make it compile: diff --git a/classes/basement/buildall.yaml b/classes/basement/buildall.yaml
index 77efffc..c989250 100644
--- a/classes/basement/buildall.yaml
+++ b/classes/basement/buildall.yaml
@@ -22,3 +22,4 @@ packageTools:
- meson
- ninja
- pkg-config
+ - curl
diff --git a/classes/basement/rootrecipe.yaml b/classes/basement/rootrecipe.yaml
index 695247e..2ee822f 100644
--- a/classes/basement/rootrecipe.yaml
+++ b/classes/basement/rootrecipe.yaml
@@ -56,6 +56,9 @@ depends:
- name: devel::cmake # Overwrite "cmake" tool with properly
use: [tools] # built one.
forward: True
+ - name: net::curl-tools
+ use: [tools]
+ forward: True
- if: !expr |
"${BOB_HOST_PLATFORM}" == "msys"
diff --git a/config.yaml b/config.yaml
index 81c9818..fb8b8eb 100644
--- a/config.yaml
+++ b/config.yaml
@@ -5,3 +5,6 @@ plugins:
- paths
- vsenv
- msbuild
+
+layers:
+ - gnu-linux
diff --git a/recipes/devel/git.yaml b/recipes/devel/git.yaml
index 4cdb71c..f86ef6d 100644
--- a/recipes/devel/git.yaml
+++ b/recipes/devel/git.yaml
@@ -20,7 +20,7 @@ checkoutSCM:
digestSHA1: "851537fc03f5a99419ef20e9b836de965c7928bd"
extract: False
-buildTools: [target-toolchain]
+buildTools: [target-toolchain, curl]
buildVars: [PKG_VERSION, AUTOCONF_HOST,
CPPFLAGS, CFLAGS, LDFLAGS]
buildScript: |
diff --git a/recipes/devel/sandbox.yaml b/recipes/devel/sandbox.yaml
index 01faee0..a5a6b8e 100644
--- a/recipes/devel/sandbox.yaml
+++ b/recipes/devel/sandbox.yaml
@@ -42,6 +42,10 @@ depends:
name: python::python3-minimal
use: [tools]
forward: True
+ -
+ name: net::curl-tools
+ use: [tools]
+ forward: True
# target toolchain
-
diff --git a/recipes/net/curl.yaml b/recipes/net/curl.yaml
index da1c18f..bffe5a5 100644
--- a/recipes/net/curl.yaml
+++ b/recipes/net/curl.yaml
@@ -38,3 +38,8 @@ multiPackage:
tgt:
packageScript: autotoolsPackageTgt
provideDeps: [ "*-tgt" ]
+
+ tools:
+ packageScript: autotoolsPackageBin
+ provideTools:
+ curl: usr/binWithout these, git complains about being unable to find The chosen split itself seems reasonable to me. Time will tell if all recipes are in their right place. |
|
Nice. I see that buildroot does something similar. I still have to take care of the bob-examples repositories. Once they are building I can create the repositories and make the split... |
This class is no longer needed because it was replaced by tests/linux/...
Recipes that are not absolutely required to provide a core basement layer are moved into separate sub-layers. They are intended to be moved into separate repositories as a next step. Fixes BobBuildTool#107.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #107.