diff options
author | Richard Levitte <levitte@openssl.org> | 2019-01-30 18:58:01 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2019-01-31 16:19:49 +0100 |
commit | 77adb75e16142cd4da2af8814090a4f2c2bd5aea (patch) | |
tree | b59a8159809fbedd9034c64ef2d2c647da31b996 /Configurations | |
parent | 77550dbf7af4d31b915d076ee968cfc75e14a411 (diff) | |
download | openssl-77adb75e16142cd4da2af8814090a4f2c2bd5aea.zip openssl-77adb75e16142cd4da2af8814090a4f2c2bd5aea.tar.gz openssl-77adb75e16142cd4da2af8814090a4f2c2bd5aea.tar.bz2 |
Build: Remove BEGINRAW / ENDRAW / OVERRIDE
It was an ugly hack to avoid certain problems that are no more.
Also added GENERATE lines for perlasm scripts that didn't have that
explicitly.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8125)
Diffstat (limited to 'Configurations')
-rw-r--r-- | Configurations/README | 42 | ||||
-rw-r--r-- | Configurations/README.design | 11 | ||||
-rw-r--r-- | Configurations/common.tmpl | 4 |
3 files changed, 0 insertions, 57 deletions
diff --git a/Configurations/README b/Configurations/README index c1f80fe..65841b3 100644 --- a/Configurations/README +++ b/Configurations/README @@ -486,48 +486,6 @@ be used in that case: NOTE: GENERATE lines are limited to one command only per GENERATE. -As a last resort, it's possible to have raw build file lines, between -BEGINRAW and ENDRAW lines as follows: - - BEGINRAW[Makefile(unix)] - haha.h: {- $builddir -}/Makefile - echo "/* haha */" > haha.h - ENDRAW[Makefile(unix)] - -The word within square brackets is the build_file configuration item -or the build_file configuration item followed by the second word in the -build_scheme configuration item for the configured target within -parenthesis as shown above. For example, with the following relevant -configuration items: - - build_file => "build.ninja" - build_scheme => [ "unified", "unix" ] - -... these lines will be considered: - - BEGINRAW[build.ninja] - build haha.h: echo "/* haha */" > haha.h - ENDRAW[build.ninja] - - BEGINRAW[build.ninja(unix)] - build hoho.h: echo "/* hoho */" > hoho.h - ENDRAW[build.ninja(unix)] - -Should it be needed because the recipes within a RAW section might -clash with those generated by Configure, it's possible to tell it -not to generate them with the use of OVERRIDES, for example: - - SOURCE[libfoo]=foo.c bar.c - - OVERRIDES=bar.o - BEGINRAW[Makefile(unix)] - bar.o: bar.c - $(CC) $(CFLAGS) -DSPECIAL -c -o $@ $< - ENDRAW[Makefile(unix)] - -See the documentation further up for more information on configuration -items. - Finally, you can have some simple conditional use of the build.info information, looking like this: diff --git a/Configurations/README.design b/Configurations/README.design index c0b05bd..43b6a66 100644 --- a/Configurations/README.design +++ b/Configurations/README.design @@ -112,9 +112,6 @@ Two things are worth an extra note: 'DEPEND[cversion.o]' mentions an object file. DEPEND indexes is the only location where it's valid to mention them -Lines in 'BEGINRAW'..'ENDRAW' sections must always mention files as -seen from the top directory, no exception. - # ssl/build.info LIBS=../libssl SOURCE[../libssl]=tls.c @@ -234,11 +231,6 @@ indexes: programs => a list of programs. These are directly inferred from the PROGRAMS variable in build.info files. - rawlines => a list of build-file lines. These are a direct copy of - the BEGINRAW..ENDRAW lines in build.info files. Note: - only the BEGINRAW..ENDRAW section for the current - platform are copied, the rest are ignored. - scripts => a list of scripts. There are directly inferred from the SCRIPTS variable in build.info files. @@ -352,9 +344,6 @@ section above would be digested into a %unified_info table: [ "apps/openssl", ], - "rawlines" => - [ - ], "sources" => { "apps/openssl" => diff --git a/Configurations/common.tmpl b/Configurations/common.tmpl index 53384c7..a15971e 100644 --- a/Configurations/common.tmpl +++ b/Configurations/common.tmpl @@ -217,8 +217,4 @@ foreach (@{$unified_info{scripts}}) { doscript($_); } foreach (sort keys %{$unified_info{dirinfo}}) { dodir($_); } - - # Finally, should there be any applicable BEGINRAW/ENDRAW sections, - # they are added here. - $OUT .= $_."\n" foreach @{$unified_info{rawlines}}; -} |