|
23 | 23 | esac
|
24 | 24 | fi
|
25 | 25 |
|
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). |
28 | 28 | # Do directory-based auto-detection.
|
29 | 29 | if [ -z "$PROJECT" ]
|
30 | 30 | then
|
@@ -59,24 +59,20 @@ export SYSTEM_SSL
|
59 | 59 |
|
60 | 60 | case "$OS_FAMILY" in
|
61 | 61 | 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. |
65 | 64 | LDFLAGS="-Wl,-brtl"
|
66 | 65 |
|
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. |
69 | 67 | LDFLAGS="$LDFLAGS -L$BUILDPREFIX/lib -Wl,-blibpath:$BUILDPREFIX/lib:/usr/lib:/lib"
|
70 | 68 | ;;
|
71 | 69 | hpux)
|
72 | 70 | LDFLAGS="-L$BUILDPREFIX/lib -Wl,+b$BUILDPREFIX/lib"
|
73 | 71 |
|
74 | 72 | # Use ‘gcc’ when building things on HP-UX
|
75 | 73 | #
|
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. |
80 | 76 | CC=gcc
|
81 | 77 | export CC
|
82 | 78 | ;;
|
@@ -114,21 +110,19 @@ DEPS=
|
114 | 110 |
|
115 | 111 | # Windows specific dependencies
|
116 | 112 | 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. |
119 | 115 | var_append DEPS "pthreads-w32"
|
120 | 116 |
|
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 |
123 | 118 | var_append DEPS "libgnurx"
|
124 | 119 | fi
|
125 | 120 |
|
126 | 121 | # AIX / Solaris specific dependencies
|
127 | 122 | case "$OS_FAMILY" in
|
128 | 123 | solaris|aix)
|
129 | 124 |
|
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! |
132 | 126 | var_append DEPS "libgcc"
|
133 | 127 |
|
134 | 128 | # iconv is needed for libxml2 on some platforms
|
|
139 | 133 | # We use system bundled SSL on RHEL >= 8
|
140 | 134 | if ! [ "$SYSTEM_SSL" = 1 ]
|
141 | 135 | 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)? |
144 | 138 | var_append DEPS "zlib"
|
145 | 139 |
|
146 | 140 | # Toolkit for TLS
|
|
150 | 144 | # Solaris / HP-UX specific dependencies
|
151 | 145 | case "$OS_FAMILY" in
|
152 | 146 | 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 |
155 | 148 | var_append DEPS "sasl2"
|
156 | 149 | ;;
|
157 | 150 | esac
|
@@ -212,9 +205,9 @@ export ROLE
|
212 | 205 | case "$ROLE" in
|
213 | 206 | # HUB-ONLY dependencies
|
214 | 207 | 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. |
218 | 211 | var_append DEPS "libcurl-hub" # Provides API for performing network requests
|
219 | 212 | var_append DEPS "nghttp2" # Provides implementation of the HTTP/2 protocol.
|
220 | 213 | var_append DEPS "libexpat" # Provides stream-oriented XML parser
|
|
233 | 226 |
|
234 | 227 | # Make sure init.d script and systemd service is used where needed.
|
235 | 228 | #
|
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. |
239 | 231 | if [ "$OS_FAMILY" = linux ]; then
|
240 | 232 | WITH_SYSTEMD=yes
|
241 | 233 | else
|
|
0 commit comments