Skip to content

Commit 3ce2ef2

Browse files
authored
Merge pull request #143 from rhubert/basement_adaptions
Basement adaptions
2 parents bb5de2a + 9978bf0 commit 3ce2ef2

8 files changed

Lines changed: 14 additions & 8 deletions

File tree

recipes/core/busybox.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ buildScript: |
6262
popd #build
6363
6464
if [[ -f build/busybox_unstripped ]] ; then
65-
mkdir install/bin/.debug
65+
mkdir -p install/bin/.debug
6666
cp build/busybox_unstripped install/bin/.debug/busybox
6767
${CROSS_COMPILE}objcopy --add-gnu-debuglink=install/bin/.debug/busybox install/bin/busybox
6868
fi

recipes/libs/double-conversion.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
inherit: [cmake]
1+
inherit: ['cmake-3']
22

33
metaEnvironment:
44
PKG_VERSION: "3.3.0"

recipes/libs/jsonc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
inherit: [cmake]
1+
inherit: ['cmake-3']
22

33
metaEnvironment:
44
PKG_DESCRIPTION: "A JSON implementation in C"

recipes/libs/yajl.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
inherit: [cmake]
1+
inherit: ['cmake-3']
22

33
metaEnvironment:
44
PKG_VERSION: "2.1.0"

recipes/utils/efitools.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ depends:
1616
depends:
1717
- use: [tools]
1818
depends:
19-
- libs::openssl
19+
- libs::openssl-tool
2020
- utils::sbsigntools
2121
- name: utils::xxd
2222

recipes/utils/strace.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
inherit: [autotools]
22

33
metaEnvironment:
4-
PKG_VERSION: "6.10"
4+
PKG_VERSION: "6.18"
55
PKG_LICENSE: "LGPL-2.1-or-later"
66

77
checkoutSCM:
88
scm: url
99
url: https://strace.io/files/${PKG_VERSION}/strace-${PKG_VERSION}.tar.xz
10-
digestSHA256: 765ec71aa1de2fe37363c1e40c7b7669fc1d40c44bb5d38ba8e8cd82c4edcf07
10+
digestSHA256: 0ad5dcba973a69e779650ef1cb335b12ee60716fc7326609895bd33e6d2a7325
1111
stripComponents: 1
1212

1313
buildTools: [host-toolchain]

recipes/utils/tidy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
inherit: [cmake]
1+
inherit: ['cmake-3']
22

33
metaEnvironment:
44
PKG_VERSION: "5.8.0"

tests/buildall/recipes/all.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,12 @@ depends:
7070
- libs::mtdev-tgt
7171
- libs::nettle-tgt
7272
- libs::npth-tgt
73+
- libs::openssl
74+
- name: libs::openssl
75+
environment:
76+
OPENSSL_no_sse2: "1"
77+
alias: libs::openssl-no-sse2
78+
use: [result] # don't use the deps as they are causing incompatible variants...
7379
- libs::pango-tgt
7480
- libs::pcre2-tgt
7581
- libs::pixman-tgt

0 commit comments

Comments
 (0)