From 4ad5e3488b8d95667457a6bbc72abd98f19805a3 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Tue, 5 Apr 2022 22:37:30 -0500 Subject: [PATCH] Update: The example project build settings and fakefiles. These fell out of sync. Add support for building via clang. The "example-objects" project doesn't include support for clang because it is providing a minimalistic example. The "path_standard" is now "has_path_standard". --- level_3/fake/data/projects/bzip2/1.0.8/settings-bzip2 | 8 +++++++- level_3/fake/data/projects/bzip2/1.0.8/settings-bzip2recover | 8 +++++++- level_3/fake/data/projects/cmocka/1.1.5/settings | 10 +++++++++- level_3/fake/data/projects/example-objects/data/build/settings | 2 +- .../fake/data/projects/example-objects/data/build/settings-a | 2 +- .../fake/data/projects/example-objects/data/build/settings-e | 2 +- .../fake/data/projects/example-objects/data/build/settings-f | 2 +- .../fake/data/projects/example-objects/data/build/settings-k | 2 +- 8 files changed, 28 insertions(+), 8 deletions(-) diff --git a/level_3/fake/data/projects/bzip2/1.0.8/settings-bzip2 b/level_3/fake/data/projects/bzip2/1.0.8/settings-bzip2 index de100a1..78bd98a 100644 --- a/level_3/fake/data/projects/bzip2/1.0.8/settings-bzip2 +++ b/level_3/fake/data/projects/bzip2/1.0.8/settings-bzip2 @@ -17,7 +17,11 @@ version_micro 8 version_file micro version_target major +modes individual gcc clang +modes_default gcc + build_compiler gcc +build_compiler-clang clang build_indexer ar build_indexer_arguments rcs build_language c @@ -27,10 +31,12 @@ build_sources_headers bzlib.h build_script no path_sources -path_standard no +has_path_standard no +preserve_path_headers no defines -D_FILE_OFFSET_BITS=64 flags -z now -g -fdiagnostics-color=always -Wall -Winline -O2 +flags-clang -Wno-logical-op-parentheses flags_library -fPIC flags_program -fPIE diff --git a/level_3/fake/data/projects/bzip2/1.0.8/settings-bzip2recover b/level_3/fake/data/projects/bzip2/1.0.8/settings-bzip2recover index d0b8389..22a23a7 100644 --- a/level_3/fake/data/projects/bzip2/1.0.8/settings-bzip2recover +++ b/level_3/fake/data/projects/bzip2/1.0.8/settings-bzip2recover @@ -17,7 +17,11 @@ version_micro 8 version_file micro version_target major +modes individual gcc clang +modes_default gcc + build_compiler gcc +build_compiler-clang clang build_indexer ar build_indexer_arguments rcs build_language c @@ -26,10 +30,12 @@ build_sources_program bzip2recover.c build_script no path_sources -path_standard no +has_path_standard no +preserve_path_headers no defines -D_FILE_OFFSET_BITS=64 flags -z now -g -fdiagnostics-color=always -Wall -Winline -O2 +flags-clang -Wno-logical-op-parentheses flags_library -fPIC flags_program -fPIE diff --git a/level_3/fake/data/projects/cmocka/1.1.5/settings b/level_3/fake/data/projects/cmocka/1.1.5/settings index e0b847a..32568a5 100644 --- a/level_3/fake/data/projects/cmocka/1.1.5/settings +++ b/level_3/fake/data/projects/cmocka/1.1.5/settings @@ -19,7 +19,11 @@ version_micro 5 version_file micro version_target major +modes individual gcc clang +modes_default gcc + build_compiler gcc +build_compiler-clang clang build_indexer ar build_indexer_arguments rcs build_language c @@ -27,13 +31,17 @@ build_libraries -pthread -lrt -lc build_sources_library src/cmocka.c build_sources_headers include/cmocka.h include/cmocka_pbc.h build_script no +build_shared yes +build_static no path_sources -path_standard no +has_path_standard no +preserve_path_headers no defines -DHAVE_MALLOC_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_SIGNAL_H=1 -DHAVE_STRINGS_H=1 -DHAVE_GCC_THREAD_LOCAL_STORAGE=1 -DHAVE_CLOCK_REALTIME=1 -DHAVE_SIGLONGJMP=1 -DHAVE_STRSIGNAL=1 flags -z now -g -fdiagnostics-color=always -Wall -Winline -O2 -Iinclude/ -std=gnu99 flags -Wpedantic -Wall -Wshadow -Wmissing-prototypes -Wcast-align -Werror=address -Wstrict-prototypes -Werror=strict-prototypes -Wwrite-strings -Werror=write-strings -Werror-implicit-function-declaration -Wpointer-arith -Werror=pointer-arith -Wdeclaration-after-statement -Werror=declaration-after-statement -Wreturn-type -Werror=return-type -Wuninitialized -Werror=uninitialized -Wimplicit-fallthrough -Werror=strict-overflow -Wstrict-overflow=2 -Wno-format-zero-length -Wmissing-field-initializers -Wformat -Wformat-security -Werror=format-security flags -fno-common -fstack-protector-strong -fstack-clash-protection +flags-clang -Wno-logical-op-parentheses flags_library -fPIC diff --git a/level_3/fake/data/projects/example-objects/data/build/settings b/level_3/fake/data/projects/example-objects/data/build/settings index f4916ed..0068d39 100644 --- a/level_3/fake/data/projects/example-objects/data/build/settings +++ b/level_3/fake/data/projects/example-objects/data/build/settings @@ -16,7 +16,7 @@ build_sources_program fake.c build_script no path_sources sources -path_standard no +has_path_standard no flags -z now -g -fdiagnostics-color=always flags_object_shared -fPIC diff --git a/level_3/fake/data/projects/example-objects/data/build/settings-a b/level_3/fake/data/projects/example-objects/data/build/settings-a index 6fb8f86..52ef68d 100644 --- a/level_3/fake/data/projects/example-objects/data/build/settings-a +++ b/level_3/fake/data/projects/example-objects/data/build/settings-a @@ -15,7 +15,7 @@ build_sources_object a.c build_script no path_sources_object sources_object -path_standard no +has_path_standard no flags -z now -g -fdiagnostics-color=always flags_object_shared -fPIC diff --git a/level_3/fake/data/projects/example-objects/data/build/settings-e b/level_3/fake/data/projects/example-objects/data/build/settings-e index f454c2f..160629f 100644 --- a/level_3/fake/data/projects/example-objects/data/build/settings-e +++ b/level_3/fake/data/projects/example-objects/data/build/settings-e @@ -15,7 +15,7 @@ build_sources_object e.c build_script no path_sources_object sources_object -path_standard no +has_path_standard no flags -z now -g -fdiagnostics-color=always flags_object_shared -fPIC diff --git a/level_3/fake/data/projects/example-objects/data/build/settings-f b/level_3/fake/data/projects/example-objects/data/build/settings-f index a5991a9..dd25627 100644 --- a/level_3/fake/data/projects/example-objects/data/build/settings-f +++ b/level_3/fake/data/projects/example-objects/data/build/settings-f @@ -15,7 +15,7 @@ build_sources_object f.c build_script no path_sources_object sources_object -path_standard no +has_path_standard no flags -z now -g -fdiagnostics-color=always flags_object_shared -fPIC diff --git a/level_3/fake/data/projects/example-objects/data/build/settings-k b/level_3/fake/data/projects/example-objects/data/build/settings-k index 35768d3..a88e370 100644 --- a/level_3/fake/data/projects/example-objects/data/build/settings-k +++ b/level_3/fake/data/projects/example-objects/data/build/settings-k @@ -15,7 +15,7 @@ build_sources_object k.c build_script no path_sources_object sources_object -path_standard no +has_path_standard no flags -z now -g -fdiagnostics-color=always flags_object_shared -fPIC -- 1.8.3.1