Skip to content

Commit 61170dd

Browse files
committed
compile-options: split comments on dots and commas
It makes it easier to read diffs. Ticket: ENT-12600 Signed-off-by: Lars Erik Wik <[email protected]>
1 parent 7a5ab4c commit 61170dd

File tree

1 file changed

+19
-27
lines changed

1 file changed

+19
-27
lines changed

build-scripts/compile-options

Lines changed: 19 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ then
2323
esac
2424
fi
2525

26-
# If still not set, then either we are running outside Jenkins, or this
27-
# is not a main "build" type job (it could be the bootstrap job).
26+
# If still not set, then either we are running outside Jenkins,
27+
# or this is not a main "build" type job (it could be the bootstrap job).
2828
# Do directory-based auto-detection.
2929
if [ -z "$PROJECT" ]
3030
then
@@ -59,24 +59,20 @@ export SYSTEM_SSL
5959

6060
case "$OS_FAMILY" in
6161
aix)
62-
# This flag is needed because AIX defaults to producing .a shared libraries,
63-
# but we need it to make .so libraries. It doesn't work correctly when
64-
# specified in the Makefile, so we specify it in the environment instead.
62+
# This flag is needed because AIX defaults to producing .a shared libraries, but we need it to make .so libraries.
63+
# It doesn't work correctly when specified in the Makefile, so we specify it in the environment instead.
6564
LDFLAGS="-Wl,-brtl"
6665

67-
# AIX needs default RPATH (libpath on AIX) specified as well, otherwise it
68-
# won't find libc.
66+
# AIX needs default RPATH (libpath on AIX) specified as well, otherwise it won't find libc.
6967
LDFLAGS="$LDFLAGS -L$BUILDPREFIX/lib -Wl,-blibpath:$BUILDPREFIX/lib:/usr/lib:/lib"
7068
;;
7169
hpux)
7270
LDFLAGS="-L$BUILDPREFIX/lib -Wl,+b$BUILDPREFIX/lib"
7371

7472
# Use ‘gcc’ when building things on HP-UX
7573
#
76-
# HP-UX ships with ‘cc’ which invokes the ‘HP-UX bundled C compiler’ which
77-
# lacks some functionality we need to build things. Among the other things,
78-
# it doesn’t know how to link ‘.so’ files directly and it doesn’t recognize
79-
# them as valid input type.
74+
# HP-UX ships with ‘cc’ which invokes the ‘HP-UX bundled C compiler’ which lacks some functionality we need to build things.
75+
# Among the other things, it doesn’t know how to link ‘.so’ files directly and it doesn’t recognize them as valid input type.
8076
CC=gcc
8177
export CC
8278
;;
@@ -114,21 +110,19 @@ DEPS=
114110

115111
# Windows specific dependencies
116112
if [ "$OS_FAMILY" = mingw ]; then
117-
# Win32 does not support pthreads natively. The pthreads-w32 project provide
118-
# solution to this problem.
113+
# Win32 does not support pthreads natively.
114+
# The pthreads-w32 project provides a solution to this problem.
119115
var_append DEPS "pthreads-w32"
120116

121-
# A port of the regex functionality from the glibc Library for use on
122-
# Windows platforms
117+
# A port of the regex functionality from the glibc Library for use on Windows platforms
123118
var_append DEPS "libgnurx"
124119
fi
125120

126121
# AIX / Solaris specific dependencies
127122
case "$OS_FAMILY" in
128123
solaris|aix)
129124

130-
# libgcc_s.so is needed before we compile any other dependency
131-
# on some platforms!
125+
# libgcc_s.so is needed before we compile any other dependency on some platforms!
132126
var_append DEPS "libgcc"
133127

134128
# iconv is needed for libxml2 on some platforms
@@ -139,8 +133,8 @@ esac
139133
# We use system bundled SSL on RHEL >= 8
140134
if ! [ "$SYSTEM_SSL" = 1 ]
141135
then
142-
# zlib is a compression library witch is a dependency of OpenSSL. However,
143-
# can we remove it (CFE-4013)?
136+
# zlib is a compression library witch is a dependency of OpenSSL.
137+
# However, can we remove it (CFE-4013)?
144138
var_append DEPS "zlib"
145139

146140
# Toolkit for TLS
@@ -150,8 +144,7 @@ fi
150144
# Solaris / HP-UX specific dependencies
151145
case "$OS_FAMILY" in
152146
solaris|hpux)
153-
# Generic library that implements the Simple Authentication and Security
154-
# Layer (SASL) framework
147+
# Generic library that implements the Simple Authentication and Security Layer (SASL) framework
155148
var_append DEPS "sasl2"
156149
;;
157150
esac
@@ -212,9 +205,9 @@ export ROLE
212205
case "$ROLE" in
213206
# HUB-ONLY dependencies
214207
hub)
215-
# Note that we make a separate curl package for the hub. This is because
216-
# the hub will include the curl binary, but we don't want that for the
217-
# clients.
208+
# Note that we make a separate curl package for the hub.
209+
# This is because the hub will include the curl binary,
210+
# but we don't want that for the clients.
218211
var_append DEPS "libcurl-hub" # Provides API for performing network requests
219212
var_append DEPS "nghttp2" # Provides implementation of the HTTP/2 protocol.
220213
var_append DEPS "libexpat" # Provides stream-oriented XML parser
@@ -233,9 +226,8 @@ esac
233226

234227
# Make sure init.d script and systemd service is used where needed.
235228
#
236-
# We install in all Linux platforms, because it does no harm on platforms
237-
# without systemd, and it has the advantage of working out of the box on
238-
# platforms that adopt systemd later.
229+
# We install in all Linux platforms, because it does no harm on platforms without systemd,
230+
# and it has the advantage of working out of the box on platforms that adopt systemd later.
239231
if [ "$OS_FAMILY" = linux ]; then
240232
WITH_SYSTEMD=yes
241233
else

0 commit comments

Comments
 (0)