mirror of
https://github.com/systemd/systemd
synced 2025-09-27 15:54:47 +02:00
Compare commits
3 Commits
56347fe7f3
...
f82d80da06
Author | SHA1 | Date | |
---|---|---|---|
![]() |
f82d80da06 | ||
![]() |
6becea2859 | ||
![]() |
b7d3b45017 |
@ -14,7 +14,11 @@ PassEnvironment=
|
|||||||
NO_BUILD
|
NO_BUILD
|
||||||
WIPE
|
WIPE
|
||||||
SANITIZERS
|
SANITIZERS
|
||||||
|
CC
|
||||||
|
CXX
|
||||||
CFLAGS
|
CFLAGS
|
||||||
|
CPPFLAGS
|
||||||
|
CXXFLAGS
|
||||||
LDFLAGS
|
LDFLAGS
|
||||||
LLVM
|
LLVM
|
||||||
MESON_VERBOSE
|
MESON_VERBOSE
|
||||||
|
@ -57,6 +57,7 @@ Packages=
|
|||||||
knot
|
knot
|
||||||
libapparmor1
|
libapparmor1
|
||||||
libcap-progs
|
libcap-progs
|
||||||
|
libtss2-tcti-device0
|
||||||
multipath-tools
|
multipath-tools
|
||||||
ncat
|
ncat
|
||||||
open-iscsi
|
open-iscsi
|
||||||
|
@ -36,10 +36,10 @@ fi
|
|||||||
# instead. The rootfs is overlaid with a writable tmpfs during the build script so these changes don't end up
|
# instead. The rootfs is overlaid with a writable tmpfs during the build script so these changes don't end up
|
||||||
# in the image itself.
|
# in the image itself.
|
||||||
tee --append /etc/makepkg.conf >/dev/null <<EOF
|
tee --append /etc/makepkg.conf >/dev/null <<EOF
|
||||||
export CC="$( ((LLVM)) && echo clang || echo gcc)"
|
export CC="$( ((CC)) && echo "$CC" || ((LLVM)) && echo clang || echo gcc)"
|
||||||
export CXX="$( ((LLVM)) && echo clang++ || echo g++)"
|
export CXX="$( ((CXX)) && echo "$CXX" || ((LLVM)) && echo clang++ || echo g++)"
|
||||||
export CC_LD="$( ((LLVM)) && echo lld)"
|
export CC_LD="$( ((LD)) && echo "$LD" || ((LLVM)) && echo lld)"
|
||||||
export CXX_LD="$( ((LLVM)) && echo lld)"
|
export CXX_LD="$( ((LD)) && echo "$LD" || ((LLVM)) && echo lld)"
|
||||||
export CFLAGS="\$CFLAGS $MKOSI_CFLAGS $CFLAGS"
|
export CFLAGS="\$CFLAGS $MKOSI_CFLAGS $CFLAGS"
|
||||||
export CXXFLAGS="\$CXXFLAGS $MKOSI_CFLAGS $CFLAGS"
|
export CXXFLAGS="\$CXXFLAGS $MKOSI_CFLAGS $CFLAGS"
|
||||||
export LDFLAGS="\$LDFLAGS $MKOSI_LDFLAGS $LDFLAGS"
|
export LDFLAGS="\$LDFLAGS $MKOSI_LDFLAGS $LDFLAGS"
|
||||||
|
@ -67,12 +67,14 @@ DEB_BUILD_PROFILES="$(awk '$1=$1' <<<"\
|
|||||||
")"
|
")"
|
||||||
|
|
||||||
# TODO: Drop GENSYMBOLS_LEVEL once https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=986746 is fixed.
|
# TODO: Drop GENSYMBOLS_LEVEL once https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=986746 is fixed.
|
||||||
|
# Note that CXXFLAGS is for the C++ compiler, and CPPFLAGS is for the C/C++ preprocessor, they are not the same:
|
||||||
|
# https://en.wikipedia.org/wiki/CFLAGS
|
||||||
build() {
|
build() {
|
||||||
env \
|
env \
|
||||||
CC="$( ((LLVM)) && echo clang || echo gcc)" \
|
CC="$( ((CC)) && echo "$CC" || ((LLVM)) && echo clang || echo gcc)" \
|
||||||
CXX="$( ((LLVM)) && echo clang++ || echo g++)" \
|
CXX="$( ((CXX)) && echo "$CXX" || ((LLVM)) && echo clang++ || echo g++)" \
|
||||||
CC_LD="$( ((LLVM)) && echo lld)" \
|
CC_LD="$( ((LD)) && echo "$LD" || ((LLVM)) && echo lld)" \
|
||||||
CXX_LD="$( ((LLVM)) && echo lld)" \
|
CXX_LD="$( ((LD)) && echo "$LD" || ((LLVM)) && echo lld)" \
|
||||||
DEB_BUILD_OPTIONS="$(awk '$1=$1' <<<"\
|
DEB_BUILD_OPTIONS="$(awk '$1=$1' <<<"\
|
||||||
$( ((WITH_TESTS)) || echo nocheck) \
|
$( ((WITH_TESTS)) || echo nocheck) \
|
||||||
$( ((WITH_DOCS)) || echo nodoc) \
|
$( ((WITH_DOCS)) || echo nodoc) \
|
||||||
@ -84,6 +86,7 @@ build() {
|
|||||||
DEB_BUILD_PROFILES="$DEB_BUILD_PROFILES" \
|
DEB_BUILD_PROFILES="$DEB_BUILD_PROFILES" \
|
||||||
DEB_CFLAGS_APPEND="$MKOSI_CFLAGS $CFLAGS" \
|
DEB_CFLAGS_APPEND="$MKOSI_CFLAGS $CFLAGS" \
|
||||||
DEB_CXXFLAGS_APPEND="$MKOSI_CFLAGS $CFLAGS" \
|
DEB_CXXFLAGS_APPEND="$MKOSI_CFLAGS $CFLAGS" \
|
||||||
|
DEB_CPPFLAGS_APPEND="$CPPFLAGS" \
|
||||||
DEB_LDFLAGS_APPEND="$MKOSI_LDFLAGS $LDFLAGS" \
|
DEB_LDFLAGS_APPEND="$MKOSI_LDFLAGS $LDFLAGS" \
|
||||||
DPKG_FORCE="unsafe-io" \
|
DPKG_FORCE="unsafe-io" \
|
||||||
DPKG_DEB_COMPRESSOR_TYPE="none" \
|
DPKG_DEB_COMPRESSOR_TYPE="none" \
|
||||||
|
@ -86,10 +86,10 @@ build() {
|
|||||||
--unset CFLAGS \
|
--unset CFLAGS \
|
||||||
--unset CXXFLAGS \
|
--unset CXXFLAGS \
|
||||||
--unset LDFLAGS \
|
--unset LDFLAGS \
|
||||||
CC="$( ((LLVM)) && echo clang || echo gcc)" \
|
CC="$( ((CC)) && echo "$CC" || ((LLVM)) && echo clang || echo gcc)" \
|
||||||
CXX="$( ((LLVM)) && echo clang++ || echo g++)" \
|
CXX="$( ((CXX)) && echo "$CXX" || ((LLVM)) && echo clang++ || echo g++)" \
|
||||||
CC_LD="$( ((LLVM)) && echo lld)" \
|
CC_LD="$( ((LD)) && echo "$LD" || ((LLVM)) && echo lld)" \
|
||||||
CXX_LD="$( ((LLVM)) && echo lld)" \
|
CXX_LD="$( ((LD)) && echo "$LD" || ((LLVM)) && echo lld)" \
|
||||||
rpmbuild \
|
rpmbuild \
|
||||||
-bb \
|
-bb \
|
||||||
--noprep \
|
--noprep \
|
||||||
|
@ -36,18 +36,20 @@ void reset_ansi_feature_caches(void) {
|
|||||||
ColorMode parse_systemd_colors(void) {
|
ColorMode parse_systemd_colors(void) {
|
||||||
const char *e;
|
const char *e;
|
||||||
|
|
||||||
|
/* Note: do not log in this function, to avoid infinite recursion issues, as the log functions call
|
||||||
|
* this when deciding whether to color the output. */
|
||||||
|
|
||||||
e = getenv("SYSTEMD_COLORS");
|
e = getenv("SYSTEMD_COLORS");
|
||||||
if (!e)
|
if (!e)
|
||||||
return _COLOR_MODE_INVALID;
|
return _COLOR_MODE_INVALID;
|
||||||
|
|
||||||
ColorMode m = color_mode_from_string(e);
|
return color_mode_from_string(e);
|
||||||
if (m < 0)
|
|
||||||
return log_debug_errno(m, "Failed to parse $SYSTEMD_COLORS value '%s', ignoring: %m", e);
|
|
||||||
|
|
||||||
return m;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static ColorMode get_color_mode_impl(void) {
|
static ColorMode get_color_mode_impl(void) {
|
||||||
|
/* Note: do not log in this function, to avoid infinite recursion issues, as the log functions call
|
||||||
|
* this when deciding whether to color the output. */
|
||||||
|
|
||||||
/* Returns the mode used to choose output colors. The possible modes are COLOR_OFF for no colors,
|
/* Returns the mode used to choose output colors. The possible modes are COLOR_OFF for no colors,
|
||||||
* COLOR_16 for only the base 16 ANSI colors, COLOR_256 for more colors, and COLOR_24BIT for
|
* COLOR_16 for only the base 16 ANSI colors, COLOR_256 for more colors, and COLOR_24BIT for
|
||||||
* unrestricted color output. */
|
* unrestricted color output. */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user