Skip to content

Commit afb1994

Browse files
jhgorseeli-schwartz
authored andcommitted
Update generator.sh to be more portable
xargs has different behavior across platforms, causing some paths to be omitted from the generation. This fixes those omissions. This is based on @eli-schwartz's proposal here: #830 (comment)
1 parent 7bfc905 commit afb1994

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

subprojects/packagefiles/openssl/generator.sh

+6-5
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,12 @@ rm -rf config/archs
3131
LANG=C make -C config
3232

3333
# Copy generated files back into correct place
34-
find config/archs -name 'meson.build' | xargs -I % sh -c 'mkdir -p ../../../generated-$(dirname %); cp % ../../../generated-%'
35-
find config/archs -name '*.asm' | xargs -I % sh -c 'mkdir -p ../../../generated-$(dirname %); cp % ../../../generated-%'
36-
find config/archs -name '*.c' | xargs -I % sh -c 'mkdir -p ../../../generated-$(dirname %); cp % ../../../generated-%'
37-
find config/archs -name '*.h' | xargs -I % sh -c 'mkdir -p ../../../generated-$(dirname %); cp % ../../../generated-%'
38-
find config/archs -iname '*.s' | xargs -I % sh -c 'mkdir -p ../../../generated-$(dirname %); cp % ../../../generated-%'
34+
cmd='mkdir -p ../../../generated-$(dirname "$1"); cp "$1" ../../../generated-"$1"'
35+
find config/archs -name 'meson.build' -exec sh -c "$cmd" _ignored {} \;
36+
find config/archs -name '*.asm' -exec sh -c "$cmd" _ignored {} \;
37+
find config/archs -name '*.c' -exec sh -c "$cmd" _ignored {} \;
38+
find config/archs -name '*.h' -exec sh -c "$cmd" _ignored {} \;
39+
find config/archs -iname '*.s' -exec sh -c "$cmd" _ignored {} \;
3940

4041
# AIX is not supported by Meson
4142
rm -rf ../../../generated-config/archs/aix*

0 commit comments

Comments
 (0)