Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ which use the `basement` layer. They act as smoke tests for this project.
First you need to add the `basement` layer to your project. To do so, add a
`layers` entry to `config.yaml`:

bobMinimumVersion: "1.0"
bobMinimumVersion: "1.2"
layers:
- name: basement
scm: git
Expand Down
2 changes: 1 addition & 1 deletion classes/make.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
jobServer: True
jobServer: "fifo-or-pipe"
buildToolsWeak: [make]
buildVarsWeak: [MAKE_JOBS]
buildSetup: |
Expand Down
3 changes: 2 additions & 1 deletion classes/ninja.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
jobServer: True
# Ninja can only work with named pipes!
jobServer: "fifo"
buildToolsWeak: [ninja]
buildVarsWeak: [MAKE_JOBS]
buildSetup: |
Expand Down
1 change: 0 additions & 1 deletion classes/strip.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
jobServer: True
packageToolsWeak:
- name: pxargs
if: !expr |
Expand Down
2 changes: 1 addition & 1 deletion config.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
bobMinimumVersion: "1.1.0rc1"
bobMinimumVersion: "1.2"

plugins:
- multiarch
Expand Down
2 changes: 1 addition & 1 deletion doc/usage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ First, you need to add the basement layer to your project. To do so, add a
:external:ref:`configuration-config-layers` entry to your
:external:ref:`config.yaml <configuration-config>`::

bobMinimumVersion: "1.0"
bobMinimumVersion: "1.2"
layers:
- name: basement
scm: git
Expand Down
4 changes: 2 additions & 2 deletions recipes/devel/make.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
inherit: [cpackage, libtool, install, "basement::update-config"]

metaEnvironment:
PKG_VERSION: "4.3"
PKG_VERSION: "4.4.1"
PKG_LICENSE: "GPL-3.0-only"

checkoutSCM:
scm: url
url: ${GNU_MIRROR}/make/make-${PKG_VERSION}.tar.gz
digestSHA256: "e05fdde47c5f7ca45cb697e973894ff4f5d79e13b750ed57d7b66d8defc78e19"
digestSHA256: "dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3"
stripComponents: 1

# We do not build make with make. Instead call the manual build script that is
Expand Down
10 changes: 3 additions & 7 deletions recipes/devel/ninja.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
inherit: [cpackage, install, patch]

metaEnvironment:
PKG_VERSION: "1.11.1.g95dee.kitware.jobserver-1"
PKG_VERSION: "1.13.1"
PKG_LICENSE: "Apache-2.0"

checkoutSCM:
scm: url
url: ${GITHUB_MIRROR}/Kitware/ninja/archive/v${PKG_VERSION}.tar.gz
digestSHA256: 7ba84551f5b315b4270dc7c51adef5dff83a2154a3665a6c9744245c122dd0db
url: ${GITHUB_MIRROR}/ninja-build/ninja/archive/v1.13.1.tar.gz
digestSHA256: f0055ad0369bf2e372955ba55128d000cfcc21777057806015b45e4accbebf23
stripComponents: 1

checkoutDeterministic: True
checkoutScript: |
patchApplySeries $<@ninja/*.patch@>

buildVars: [AR, CC, CXX, CFLAGS, CXXFLAGS, LDFLAGS]
buildToolsWeak: [python3]
multiPackage:
Expand Down

This file was deleted.

2 changes: 1 addition & 1 deletion tests/cross-platform/config.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
bobMinimumVersion: "1.1.0rc1"
bobMinimumVersion: "1.2"
layers:
- self
2 changes: 1 addition & 1 deletion tests/licenses/config.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
bobMinimumVersion: "1.1.0"
bobMinimumVersion: "1.2"
layers:
- self
2 changes: 1 addition & 1 deletion tests/linux/config.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
bobMinimumVersion: "1.1.0rc1"
bobMinimumVersion: "1.2"

layers:
- self