omnibus-software 23.7.295 → 3002.0.0

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of omnibus-software might be problematic. Click here for more details.

Files changed (248) hide show
  1. checksums.yaml +4 -4
  2. data/lib/omnibus-software.rb +87 -102
  3. metadata +13 -273
  4. data/.buildkite/hooks/pre-command +0 -9
  5. data/.expeditor/Version_inspector/README.md +0 -21
  6. data/.expeditor/Version_inspector/SW-Version-update.py +0 -243
  7. data/.expeditor/Version_inspector/manual_prod_list.json +0 -29
  8. data/.expeditor/Version_inspector/prod_default_version.json +0 -103
  9. data/.expeditor/Version_inspector/prod_list.json +0 -194
  10. data/.expeditor/Version_inspector/requirements.txt +0 -4
  11. data/.expeditor/Version_inspector/update_prod_default_version.sh +0 -24
  12. data/.expeditor/Version_inspector/update_prod_list.sh +0 -35
  13. data/.expeditor/config.yml +0 -44
  14. data/.expeditor/determine_version.sh +0 -15
  15. data/.expeditor/push_git_tag.sh +0 -12
  16. data/.expeditor/run_linux_tests.sh +0 -16
  17. data/.expeditor/software_upload.pipeline.yml +0 -17
  18. data/.expeditor/verify.pipeline.yml +0 -52
  19. data/.github/CODEOWNERS +0 -5
  20. data/.github/ISSUE_TEMPLATE/BUG_TEMPLATE.md +0 -29
  21. data/.github/ISSUE_TEMPLATE/DESIGN_PROPOSAL.md +0 -40
  22. data/.github/ISSUE_TEMPLATE/ENHANCEMENT_REQUEST_TEMPLATE.md +0 -17
  23. data/.github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md +0 -11
  24. data/.github/dependabot.yml +0 -9
  25. data/.github/lock.yml +0 -1
  26. data/.gitignore +0 -17
  27. data/CHANGELOG.md +0 -18
  28. data/CODE_OF_CONDUCT.md +0 -1
  29. data/CONTRIBUTING.md +0 -1
  30. data/Dockerfile +0 -21
  31. data/Gemfile +0 -10
  32. data/LICENSE +0 -201
  33. data/README.md +0 -99
  34. data/Rakefile +0 -56
  35. data/VERSION +0 -1
  36. data/config/patches/bash/race-condition.patch +0 -15
  37. data/config/patches/bash/updated_race-condition.patch +0 -15
  38. data/config/patches/bzip2/aix_makefile.patch +0 -11
  39. data/config/patches/bzip2/makefile_no_bins.patch +0 -77
  40. data/config/patches/bzip2/makefile_take_env_vars.patch +0 -31
  41. data/config/patches/bzip2/soname_install_dir.patch +0 -11
  42. data/config/patches/curl/curl-aix-disable-alpn.patch +0 -22
  43. data/config/patches/curl/curl-freebsd-hostcheck.patch +0 -10
  44. data/config/patches/erlang/epmd-require-explicitly-adding-loopback-address.patch +0 -84
  45. data/config/patches/erlang/updated-epmd-require-explicitly-adding-loopback-address.patch +0 -75
  46. data/config/patches/expat/configure_xlc_visibility.patch +0 -58
  47. data/config/patches/expat/configure_xlc_visibility_2.4.7.patch +0 -59
  48. data/config/patches/figlet/aix-figlet-cdefs.patch +0 -48
  49. data/config/patches/gdbm/v1.8.3-Makefile.in.patch +0 -32
  50. data/config/patches/git/aix-endian-fix.patch +0 -20
  51. data/config/patches/gtar/aix_extra_case.patch +0 -13
  52. data/config/patches/keepalived/keepalived-1.2.9_opscode_centos_5.patch +0 -15
  53. data/config/patches/libedit/freebsd-vi-fix.patch +0 -24
  54. data/config/patches/libedit/openbsd-weak-alias-fix.patch +0 -48
  55. data/config/patches/libedit/solaris.patch +0 -36
  56. data/config/patches/libffi/libffi-3.2.1-disable-multi-os-directory.patch +0 -83
  57. data/config/patches/libffi/libffi-3.3-arm64.patch +0 -9608
  58. data/config/patches/libxslt/libxslt-solaris-configure.patch +0 -19
  59. data/config/patches/libxslt/libxslt-windows-relocate.patch +0 -12
  60. data/config/patches/libyaml/windows-configure.patch +0 -26
  61. data/config/patches/libzmq/zeromq-4.0.11_mingw_inet_pton.patch +0 -37
  62. data/config/patches/libzmq/zeromq-aix-4.2.2-LARGE_FILES.patch +0 -56
  63. data/config/patches/libzmq/zeromq-aix-4.2.2-atomic-counter-fetch_and_add.patch +0 -59
  64. data/config/patches/logrotate/logrotate_basedir_override.patch +0 -17
  65. data/config/patches/m4/m4-1.4.18-glibc-change-work-around.patch +0 -115
  66. data/config/patches/make/deb-make-glob.patch +0 -31
  67. data/config/patches/ncurses/ncurses-5.9-gcc-5.patch +0 -46
  68. data/config/patches/ncurses/ncurses-5.9-solaris-xopen_source_extended-detection.patch +0 -11
  69. data/config/patches/ncurses/ncurses-clang.patch +0 -43
  70. data/config/patches/ncurses/patch-aa +0 -23
  71. data/config/patches/ncurses/patch-ab +0 -44
  72. data/config/patches/ncurses/patch-ac +0 -40
  73. data/config/patches/ncurses/patch-ad +0 -13
  74. data/config/patches/ncurses/patch-cxx_cursesf.h +0 -22
  75. data/config/patches/ncurses/patch-cxx_cursesm.h +0 -22
  76. data/config/patches/ncurses/patch-ncurses_tinfo_lib__baudrate.c +0 -24
  77. data/config/patches/openssl/openssl-1.0.1f-do-not-build-docs.patch +0 -28
  78. data/config/patches/openssl/openssl-1.0.1j-windows-relocate-dll.patch +0 -44
  79. data/config/patches/openssl/openssl-1.0.1q-fix-compiler-flags-table-for-msys.patch +0 -20
  80. data/config/patches/openssl/openssl-1.0.2x-darwin-arm64.patch +0 -54
  81. data/config/patches/openssl/openssl-1.1.0f-do-not-install-docs.patch +0 -11
  82. data/config/patches/openssl/openssl-3.0.1-do-not-install-docs.patch +0 -22
  83. data/config/patches/openssl-fips/openssl-fips-fix-compiler-flags-table-for-msys.patch +0 -11
  84. data/config/patches/perl/perl-5.18.1-remove_lnsl.patch +0 -441
  85. data/config/patches/perl/perl-5.22.1-remove_lnsl.patch +0 -512
  86. data/config/patches/perl/perl-5.30.0-remove_lnsl.patch +0 -518
  87. data/config/patches/perl/perl-5.32.1-remove_lnsl.patch +0 -456
  88. data/config/patches/perl/perl-5.34.0-remove_lnsl.patch +0 -516
  89. data/config/patches/pkg-config/openbsd-charset.patch +0 -19
  90. data/config/patches/popt/v1.16.ppc64le-configure.patch +0 -18
  91. data/config/patches/redis/password-from-environment.patch +0 -19
  92. data/config/patches/ruby/patch-configure +0 -103
  93. data/config/patches/ruby/remove_nano.patch +0 -10
  94. data/config/patches/ruby/ruby-2.6.7_c99.patch +0 -12
  95. data/config/patches/ruby/ruby-3.0.1-configure.patch +0 -281
  96. data/config/patches/ruby/ruby-3.0.2-configure.patch +0 -251
  97. data/config/patches/ruby/ruby-3.0.5-configure.patch +0 -260
  98. data/config/patches/ruby/ruby-aix-atomic.patch +0 -11
  99. data/config/patches/ruby/ruby-aix-configure_26_and_later.patch +0 -19
  100. data/config/patches/ruby/ruby-aix-vm-core.patch +0 -14
  101. data/config/patches/ruby/ruby-fast-load_26.patch +0 -16
  102. data/config/patches/ruby/ruby-fast-load_31.patch +0 -16
  103. data/config/patches/ruby/ruby-faster-load_26.patch +0 -11
  104. data/config/patches/ruby/ruby-faster-load_27.patch +0 -11
  105. data/config/patches/ruby/ruby-mkmf.patch +0 -29
  106. data/config/patches/ruby/ruby-no-stack-protector-strong.patch +0 -11
  107. data/config/patches/ruby/ruby-no-stack-protector.patch +0 -13
  108. data/config/patches/ruby/ruby-win32_warning_removal.patch +0 -12
  109. data/config/patches/ruby/ruby_aix_openssl.patch +0 -10
  110. data/config/patches/ruby/ruby_aix_ssl_EAGAIN.patch +0 -19
  111. data/config/patches/ruby/rvm-cflags.patch +0 -27
  112. data/config/patches/stunnel/stunnel-on-windows.patch +0 -42
  113. data/config/patches/zlib/zlib-windows-relocate.patch +0 -20
  114. data/config/software/autoconf.rb +0 -46
  115. data/config/software/automake.rb +0 -49
  116. data/config/software/bash.rb +0 -81
  117. data/config/software/berkshelf-no-depselector.rb +0 -46
  118. data/config/software/berkshelf.rb +0 -34
  119. data/config/software/binutils.rb +0 -47
  120. data/config/software/bundler.rb +0 -38
  121. data/config/software/bzip2.rb +0 -57
  122. data/config/software/cacerts.rb +0 -52
  123. data/config/software/chef-gem.rb +0 -35
  124. data/config/software/chef.rb +0 -113
  125. data/config/software/cmake.rb +0 -100
  126. data/config/software/config_guess.rb +0 -37
  127. data/config/software/cpanminus.rb +0 -50
  128. data/config/software/curl.rb +0 -105
  129. data/config/software/delivery-cli.rb +0 -89
  130. data/config/software/dep-selector-libgecode.rb +0 -48
  131. data/config/software/elasticsearch.rb +0 -67
  132. data/config/software/elixir.rb +0 -35
  133. data/config/software/erlang.rb +0 -134
  134. data/config/software/expat.rb +0 -66
  135. data/config/software/fakeroot.rb +0 -41
  136. data/config/software/ffi-yajl.rb +0 -46
  137. data/config/software/figlet-fonts.rb +0 -31
  138. data/config/software/figlet.rb +0 -44
  139. data/config/software/gcc.rb +0 -60
  140. data/config/software/gdbm.rb +0 -54
  141. data/config/software/gecode.rb +0 -64
  142. data/config/software/gem-permissions.rb +0 -43
  143. data/config/software/git-windows.rb +0 -98
  144. data/config/software/git.rb +0 -142
  145. data/config/software/gmp.rb +0 -50
  146. data/config/software/go-uninstall.rb +0 -33
  147. data/config/software/go.rb +0 -123
  148. data/config/software/google-protobuf.rb +0 -45
  149. data/config/software/gtar.rb +0 -64
  150. data/config/software/help2man.rb +0 -40
  151. data/config/software/highline-gem.rb +0 -37
  152. data/config/software/ibm-jre.rb +0 -59
  153. data/config/software/inspec.rb +0 -43
  154. data/config/software/jre-from-jdk.rb +0 -67
  155. data/config/software/keepalived.rb +0 -68
  156. data/config/software/libarchive.rb +0 -74
  157. data/config/software/libedit.rb +0 -76
  158. data/config/software/libffi.rb +0 -71
  159. data/config/software/libgcc.rb +0 -52
  160. data/config/software/libiconv.rb +0 -57
  161. data/config/software/libintl-perl.rb +0 -59
  162. data/config/software/liblzma.rb +0 -63
  163. data/config/software/libossp-uuid.rb +0 -47
  164. data/config/software/libsodium.rb +0 -42
  165. data/config/software/libtool.rb +0 -58
  166. data/config/software/libuuid.rb +0 -44
  167. data/config/software/libxml2.rb +0 -65
  168. data/config/software/libxslt.rb +0 -68
  169. data/config/software/libyajl2-gem.rb +0 -44
  170. data/config/software/libyaml.rb +0 -52
  171. data/config/software/libzmq.rb +0 -93
  172. data/config/software/logrotate.rb +0 -64
  173. data/config/software/lua.rb +0 -48
  174. data/config/software/m4.rb +0 -40
  175. data/config/software/make.rb +0 -46
  176. data/config/software/makedepend.rb +0 -47
  177. data/config/software/mpc.rb +0 -48
  178. data/config/software/mpfr.rb +0 -48
  179. data/config/software/musl.rb +0 -107
  180. data/config/software/mysql2.rb +0 -50
  181. data/config/software/ncurses.rb +0 -162
  182. data/config/software/nginx.rb +0 -57
  183. data/config/software/nodejs-binary.rb +0 -93
  184. data/config/software/nodejs.rb +0 -58
  185. data/config/software/nokogiri.rb +0 -92
  186. data/config/software/omnibus-ctl.rb +0 -42
  187. data/config/software/openresty.rb +0 -96
  188. data/config/software/opensearch.rb +0 -59
  189. data/config/software/openssl-customization.rb +0 -81
  190. data/config/software/openssl-fips.rb +0 -85
  191. data/config/software/openssl.rb +0 -199
  192. data/config/software/patch.rb +0 -48
  193. data/config/software/patchelf.rb +0 -70
  194. data/config/software/pcre.rb +0 -55
  195. data/config/software/perl-extutils-embed.rb +0 -38
  196. data/config/software/perl-extutils-makemaker.rb +0 -47
  197. data/config/software/perl-thread-queue.rb +0 -41
  198. data/config/software/perl.rb +0 -80
  199. data/config/software/perl_pg_driver.rb +0 -46
  200. data/config/software/pg-gem.rb +0 -36
  201. data/config/software/pkg-config-lite.rb +0 -48
  202. data/config/software/pkg-config.rb +0 -68
  203. data/config/software/popt.rb +0 -59
  204. data/config/software/postgresql.rb +0 -71
  205. data/config/software/preparation.rb +0 -31
  206. data/config/software/python.rb +0 -83
  207. data/config/software/rabbitmq.rb +0 -58
  208. data/config/software/rb-readline.rb +0 -33
  209. data/config/software/rbnacl-libsodium.rb +0 -42
  210. data/config/software/rbzmq.rb +0 -44
  211. data/config/software/rebar.rb +0 -42
  212. data/config/software/redis-gem.rb +0 -36
  213. data/config/software/redis.rb +0 -54
  214. data/config/software/relx.rb +0 -39
  215. data/config/software/rsync.rb +0 -57
  216. data/config/software/ruby-cleanup.rb +0 -271
  217. data/config/software/ruby-msys2-devkit.rb +0 -72
  218. data/config/software/ruby-windows-devkit-bash.rb +0 -43
  219. data/config/software/ruby-windows-devkit.rb +0 -84
  220. data/config/software/ruby.rb +0 -315
  221. data/config/software/rubygems.rb +0 -73
  222. data/config/software/runit.rb +0 -68
  223. data/config/software/rust-uninstall.rb +0 -32
  224. data/config/software/rust.rb +0 -97
  225. data/config/software/sequel-gem.rb +0 -36
  226. data/config/software/server-jre.rb +0 -132
  227. data/config/software/server-open-jre.rb +0 -146
  228. data/config/software/setuptools.rb +0 -48
  229. data/config/software/shebang-cleanup.rb +0 -101
  230. data/config/software/sqitch.rb +0 -92
  231. data/config/software/stunnel.rb +0 -88
  232. data/config/software/util-macros.rb +0 -44
  233. data/config/software/version-manifest.rb +0 -33
  234. data/config/software/xproto.rb +0 -43
  235. data/config/software/zlib.rb +0 -88
  236. data/config/templates/git/config.mak.erb +0 -31
  237. data/config/templates/rubygems/register_devtools.rb.erb +0 -33
  238. data/config/templates/runit/runsvdir-start.erb +0 -42
  239. data/docker-compose.yml +0 -15
  240. data/lib/omnibus-software/version.rb +0 -3
  241. data/omnibus-software.gemspec +0 -20
  242. data/scripts/internal_sources.rb +0 -78
  243. data/scripts/internal_sources.yml +0 -419
  244. data/test/Gemfile +0 -10
  245. data/test/config/projects/test.rb +0 -14
  246. data/test/generate_steps.rb +0 -65
  247. data/test/omnibus-build.sh +0 -55
  248. data/test/omnibus.rb +0 -59
@@ -1,24 +0,0 @@
1
- diff -ruN libedit-20120601-3.0/src/vi.c libedit-20120601-3.0.fixed/src/vi.c
2
- --- libedit-20120601-3.0/src/vi.c 2012-03-11 09:54:58.000000000 +0000
3
- +++ libedit-20120601-3.0.fixed/src/vi.c 2013-02-08 05:22:16.338954507 +0000
4
- @@ -918,17 +918,15 @@
5
- * NB: posix implies that we should enter insert mode, however
6
- * this is against historical precedent...
7
- */
8
- -#ifdef __weak_reference
9
- -__weakref_visible char *my_get_alias_text(const char *)
10
- - __weak_reference(get_alias_text);
11
- -#endif
12
- protected el_action_t
13
- /*ARGSUSED*/
14
- vi_alias(EditLine *el, Int c __attribute__((__unused__)))
15
- {
16
- -#ifdef __weak_reference
17
- +#ifdef __weak_extern
18
- char alias_name[3];
19
- char *alias_text;
20
- + extern __weakref_visible char *my_get_alias_text(const char *);
21
- + __weak_extern(get_alias_text);
22
-
23
- if (my_get_alias_text == 0) {
24
- return CC_ERROR;
@@ -1,48 +0,0 @@
1
- diff -ur libedit-20120601-3.0.orig/src/strlcat.c libedit-20120601-3.0/src/strlcat.c
2
- --- libedit-20120601-3.0.orig/src/strlcat.c Wed May 13 17:47:58 2015
3
- +++ libedit-20120601-3.0/src/strlcat.c Wed May 13 17:48:14 2015
4
- @@ -29,7 +29,7 @@
5
-
6
- #ifdef _LIBC
7
- # ifdef __weak_alias
8
- -__weak_alias(strlcat, _strlcat)
9
- +//__weak_alias(strlcat, _strlcat)
10
- # endif
11
- #endif
12
-
13
- diff -ur libedit-20120601-3.0.orig/src/strlcpy.c libedit-20120601-3.0/src/strlcpy.c
14
- --- libedit-20120601-3.0.orig/src/strlcpy.c Wed May 13 17:47:58 2015
15
- +++ libedit-20120601-3.0/src/strlcpy.c Wed May 13 17:48:14 2015
16
- @@ -29,7 +29,7 @@
17
-
18
- #ifdef _LIBC
19
- # ifdef __weak_alias
20
- -__weak_alias(strlcpy, _strlcpy)
21
- +//__weak_alias(strlcpy, _strlcpy)
22
- # endif
23
- #endif
24
-
25
- diff -ur libedit-20120601-3.0.orig/src/unvis.c libedit-20120601-3.0/src/unvis.c
26
- --- libedit-20120601-3.0.orig/src/unvis.c Wed May 13 17:47:58 2015
27
- +++ libedit-20120601-3.0/src/unvis.c Wed May 13 17:48:14 2015
28
- @@ -50,7 +50,7 @@
29
- #include <vis.h>
30
-
31
- #ifdef __weak_alias
32
- -__weak_alias(strnunvisx,_strnunvisx)
33
- +//__weak_alias(strnunvisx,_strnunvisx)
34
- #endif
35
-
36
- #if !HAVE_VIS
37
- diff -ur libedit-20120601-3.0.orig/src/vis.c libedit-20120601-3.0/src/vis.c
38
- --- libedit-20120601-3.0.orig/src/vis.c Wed May 13 17:47:58 2015
39
- +++ libedit-20120601-3.0/src/vis.c Wed May 13 17:48:14 2015
40
- @@ -69,7 +69,7 @@
41
- #include <stdlib.h>
42
-
43
- #ifdef __weak_alias
44
- -__weak_alias(strvisx,_strvisx)
45
- +//__weak_alias(strvisx,_strvisx)
46
- #endif
47
-
48
- #if !HAVE_VIS || !HAVE_SVIS
@@ -1,36 +0,0 @@
1
- diff -ur libedit-20120601-3.0.orig/src/sys.h libedit-20120601-3.0/src/sys.h
2
- --- libedit-20120601-3.0.orig/src/sys.h 2022-05-18 07:01:46.000000000 -0400
3
- +++ libedit-20120601-3.0/src/sys-new.h 2022-05-18 07:01:30.000000000 -0400
4
- @@ -132,11 +132,11 @@
5
-
6
- #if defined(__sun)
7
- extern int tgetent(char *, const char *);
8
- -extern int tgetflag(char *);
9
- -extern int tgetnum(char *);
10
- +extern int tgetflag(const char *);
11
- +extern int tgetnum(const char *);
12
- extern int tputs(const char *, int, int (*)(int));
13
- extern char* tgoto(const char*, int, int);
14
- -extern char* tgetstr(char*, char**);
15
- +extern char* tgetstr(const char*, char**);
16
- #endif
17
-
18
- #endif /* _h_sys */
19
- diff -ur libedit-20120601-3.0.orig/src/terminal.h libedit-20120601-3.0/src/terminal.h
20
- --- libedit-20120601-3.0.orig/src/terminal.h 2022-05-18 07:02:46.000000000 -0400
21
- +++ libedit-20120601-3.0/src/terminal.h 2022-05-18 07:02:30.000000000 -0400
22
- @@ -84,11 +84,11 @@
23
-
24
- #ifdef __sun
25
- extern int tgetent(char *, const char *);
26
- -extern int tgetflag(char *);
27
- -extern int tgetnum(char *);
28
- +extern int tgetflag(const char *);
29
- +extern int tgetnum(const char *);
30
- extern int tputs(const char *, int, int (*)(int));
31
- extern char* tgoto(const char*, int, int);
32
- -extern char* tgetstr(char*, char**);
33
- +extern char* tgetstr(const char*, char**);
34
- #endif
35
-
36
- protected void terminal_move_to_line(EditLine *, int);
@@ -1,83 +0,0 @@
1
- --- libffi-3.2.1-orig/configure.ac 2014-11-12 05:56:51.000000000 -0600
2
- +++ libffi-3.2.1/configure.ac 2015-10-29 15:53:41.695055040 -0500
3
- @@ -590,6 +590,10 @@
4
- AC_DEFINE(USING_PURIFY, 1, [Define this if you are using Purify and want to suppress spurious messages.])
5
- fi)
6
-
7
- +AC_ARG_ENABLE(multi-os-directory,
8
- +[ --disable-multi-os-directory
9
- + disable use of gcc --print-multi-os-directory to change the library installation directory])
10
- +
11
- # These variables are only ever used when we cross-build to X86_WIN32.
12
- # And we only support this with GCC, so...
13
- if test "x$GCC" = "xyes"; then
14
- @@ -601,11 +605,13 @@
15
- toolexecdir="${libdir}"/gcc-lib/'$(target_alias)'
16
- toolexeclibdir="${libdir}"
17
- fi
18
- - multi_os_directory=`$CC $CFLAGS -print-multi-os-directory`
19
- - case $multi_os_directory in
20
- - .) ;; # Avoid trailing /.
21
- - ../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
22
- - esac
23
- + if test x"$enable_multi_os_directory" != x"no"; then
24
- + multi_os_directory=`$CC $CFLAGS -print-multi-os-directory`
25
- + case $multi_os_directory in
26
- + .) ;; # Avoid trailing /.
27
- + ../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
28
- + esac
29
- + fi
30
- AC_SUBST(toolexecdir)
31
- else
32
- toolexeclibdir="${libdir}"
33
- --- libffi-3.2.1-orig/configure 2014-11-12 11:59:57.000000000 +0000
34
- +++ libffi-3.2.1/configure 2015-10-30 19:50:51.082221000 +0000
35
- @@ -886,6 +886,7 @@
36
- enable_structs
37
- enable_raw_api
38
- enable_purify_safety
39
- +enable_multi_os_directory
40
- '
41
- ac_precious_vars='build_alias
42
- host_alias
43
- @@ -1538,6 +1539,8 @@
44
- --disable-structs omit code for struct support
45
- --disable-raw-api make the raw api unavailable
46
- --enable-purify-safety purify-safe mode
47
- + --disable-multi-os-directory
48
- + disable use of gcc --print-multi-os-directory to change the library installation directory
49
-
50
- Optional Packages:
51
- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
52
- @@ -18714,6 +18717,12 @@
53
- fi
54
-
55
-
56
- +# Check whether --enable-multi-os-directory was given.
57
- +if test "${enable_multi_os_directory+set}" = set; then :
58
- + enableval=$enable_multi_os_directory;
59
- +fi
60
- +
61
- +
62
- # These variables are only ever used when we cross-build to X86_WIN32.
63
- # And we only support this with GCC, so...
64
- if test "x$GCC" = "xyes"; then
65
- @@ -18725,11 +18734,13 @@
66
- toolexecdir="${libdir}"/gcc-lib/'$(target_alias)'
67
- toolexeclibdir="${libdir}"
68
- fi
69
- - multi_os_directory=`$CC $CFLAGS -print-multi-os-directory`
70
- - case $multi_os_directory in
71
- - .) ;; # Avoid trailing /.
72
- - ../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
73
- - esac
74
- + if test x"$enable_multi_os_directory" != x"no"; then
75
- + multi_os_directory=`$CC $CFLAGS -print-multi-os-directory`
76
- + case $multi_os_directory in
77
- + .) ;; # Avoid trailing /.
78
- + ../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
79
- + esac
80
- + fi
81
-
82
- else
83
- toolexeclibdir="${libdir}"