commit:     7988b41505fc29433890ea1bf4a9822bec339f3d
Author:     Marco Leise <marco.leise <AT> gmx <DOT> de>
AuthorDate: Mon Jan 25 16:27:15 2021 +0000
Commit:     Marco Leise <marco.leise <AT> gmx <DOT> de>
CommitDate: Mon Jan 25 16:49:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/user/dlang.git/commit/?id=7988b415

dmd-2.094.2

Signed-off-by: Marco Leise <marco.leise <AT> gmx.de>

 dev-lang/dmd/Manifest                                         |  2 +-
 dev-lang/dmd/{dmd-2.094.1.ebuild => dmd-2.094.2.ebuild}       |  0
 dev-util/dlang-tools/Manifest                                 |  2 +-
 ...{dlang-tools-2.094.1.ebuild => dlang-tools-2.094.2.ebuild} |  0
 eclass/dmd.eclass                                             | 11 +++++++++--
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/dev-lang/dmd/Manifest b/dev-lang/dmd/Manifest
index 95055ba..36f5a3a 100644
--- a/dev-lang/dmd/Manifest
+++ b/dev-lang/dmd/Manifest
@@ -29,4 +29,4 @@ DIST dmd.2.090.1.linux.tar.xz 25595804 BLAKE2B 
addd21fc482aa90d816593312aa649094
 DIST dmd.2.091.1.linux.tar.xz 23977732 BLAKE2B 
4db4c1733ecfdaa79a396039b8be735c217841deefd41b91b72a25e075e0f064892aa07497d840ef738021f66b58071d3d8c228573110614c43036ad51d7f701
 SHA512 
94db61b8cabd6229b404ce34e1618a710d6780bd7ce6db4ac666221b9bef616046ab9e4e793651e4e976fb4dd0eeedd5445abc9169ca27be753ff5611001e6bb
 DIST dmd.2.092.1.linux.tar.xz 24354760 BLAKE2B 
dd342c7cbb22f081720719a9aa2af40adb6bd9b6f25257eb85dc1e8b977dc80de87475b7fd9652c0c1cbba0e5115febd69969dce1f883e1a87e0f2a45b105d82
 SHA512 
df02256148a06bdab1427bed4428230b804da45e5241e6289f72fbc2bbf64020fe63a84b7aa91c36acb60ea8fb048933dc5a8c31f954df2637fd44a2964da0a3
 DIST dmd.2.093.1.linux.tar.xz 24506488 BLAKE2B 
101edbe659ddb3ce6ed0d66762a0d476d839c9baf3de8aa9e0bfbe67345c6a35412313070a77169e20bfe1b7a1dced2aade1d0f67f9a866ca0037dee425d3fab
 SHA512 
47b366c5f3ebfc52324706d79a595daf61bc9a95d8a12237ff2920795dea165daccce659a30cd89dfd221ebfae43f9ce6234a37bd10af63c20222fe9e4482c5d
-DIST dmd.2.094.1.linux.tar.xz 22232788 BLAKE2B 
90021cbf8f9febcb6bc51d40008aa509b43915c05fa906ece98022d21ca0c44e1fb714516704e6a2305e20467906824b069f9760076c057144594d57b027597c
 SHA512 
1cbf445ca9ffc38a899cbfcdf826cdff98342a62f7a34e41f22f17e777215636e6eb0c480b5c64b1773d58276a3df567f41beaf65a94bfbf3efc071f6d30397a
+DIST dmd.2.094.2.linux.tar.xz 22232888 BLAKE2B 
ba3116f3a9fd9516cd1ac792f950d4ba6c27a51631e2f48698f92506daa77b0cb45e238292b0200a85def5013e5272a9d2725f74b85e5cbe1cfabf8fcdb568eb
 SHA512 
a880928aeb6f16dc1dea7ac406cca2f8dfa75030725e5cefc9a48c1cc3e5c884800367efc293d7f9eaceb3c6c6cae2e3baea781786ccb438231c0734267ad0f0

diff --git a/dev-lang/dmd/dmd-2.094.1.ebuild b/dev-lang/dmd/dmd-2.094.2.ebuild
similarity index 100%
rename from dev-lang/dmd/dmd-2.094.1.ebuild
rename to dev-lang/dmd/dmd-2.094.2.ebuild

diff --git a/dev-util/dlang-tools/Manifest b/dev-util/dlang-tools/Manifest
index f4207a6..637f34f 100644
--- a/dev-util/dlang-tools/Manifest
+++ b/dev-util/dlang-tools/Manifest
@@ -28,7 +28,7 @@ DIST dlang-tools-2.090.1.tar.gz 117709 BLAKE2B 
8a714a5bd6860bf4a856fbbde2a7188b4
 DIST dlang-tools-2.091.1.tar.gz 117714 BLAKE2B 
bd0957f0e70401b1ededf29be7f942da1445c66e3ea4b47f31b136413b506c3dd03faa4cb1962a10ae51edd0cb18b282da072b0ba63f0f0d7e2cd3e460924e3a
 SHA512 
b8fb4f4c1e9aed1e2134644152a32a7c6073d801458bf0a45a23e86cd761a19c4b517365112edc7af73fbef3c26b4106fa0ee7478a78fa41c531a060c25e3955
 DIST dlang-tools-2.092.1.tar.gz 119015 BLAKE2B 
35121ccda680297d686b6133b80f27d04c133d3d6add4a335294c203a58475326563b5f81cd90a3d1b261c7799b244b739924ec32a6bbf887a98dcad486b64b4
 SHA512 
84d69e2b5e073bc038f438304060a490bc41c740eba14599b911aa66cc40b0f4ba1fa55536c77f01c6964210025283a3c6d32768493e9ca1e021eadaaa38f8b2
 DIST dlang-tools-2.093.1.tar.gz 118852 BLAKE2B 
d797d8eb5de2e8a8a404b0b77cff3fb8812bddf6e0b796396971fe0b409a11f882d1d5e54bbda0c477e710cdfe3e63578da0e8b6fc3929be7b062a01673d31f8
 SHA512 
db6de62436b10c5e52516b96ee695c2ed5952a8a4fc3fdc27b31596c02f5674afb0b5e40833b32f633fb5ac58cbafc934c0cdacb7826d0a1ca1658bd7301ddcf
-DIST dlang-tools-2.094.1.tar.gz 118431 BLAKE2B 
c493152178914026929aa0bc323908c5ccf29199b9d19431acaae0a70acd9b27bba00b054d2fa4efa5a1ddf7ff6705b1a9d6922ea609db38d34011cc2f2351ad
 SHA512 
7ca5641951c31e345b0965d52d4086eb6eb981ae9bf6e0db4489633c2c165e3b5d9c88b96c22578ab77641b52ab6005f12d65c1d7444a17880165fab4cf5bc69
+DIST dlang-tools-2.094.2.tar.gz 118427 BLAKE2B 
a590f5e5490e3f51b55a9bd4018d38ea0ee84865af52869666ca9afbec1041ce4463dab707997b1d927a0c6284cbf82f248999582ea4c0fbc72fa7fffc4df1c4
 SHA512 
8fc9d95e77317afd0c73c8e2b85b01175d4d3494116ec6550f8c9d99d5ecfde9e8e4ff1aa8eb7477e4974faf6b66fb0dbc32bcb7d2facf7cec6cfadd8ea9ad81
 DIST dlang.org-2.064.2.tar.gz 963131 BLAKE2B 
a7cf0d43a1cd531722bda717882a34e01c0186f0832a12064bf0600aede0a0913190724011f0b13c76cf794434e1c82490f48e9fda66409aa2820adc7c8a40f9
 SHA512 
a1284955764385539dcd8949cd851100af9be47908e85d8cfd897d6409903763919dc082fc0ca88fbaaf49647168357656aee82717a375ed45407eb15ccd44cf
 DIST dlang.org-2.065.0.tar.gz 1005429 BLAKE2B 
01fc8ec0c5148f910e2923be556208c08a18f00453ffa1f1a22d6725db6489b6f9022cd170caa3a05078baddde353ee819984da5efa53547e78006d2f0a97b9c
 SHA512 
0fb185603766b54c3b9dc57824b18ec7ea9f37281610729860543630f4546591f9523bff48eee5414235d2ee656201c444e6d2efc44ba66a052b98a0d9b4729e
 DIST dlang.org-2.066.1.tar.gz 1024075 BLAKE2B 
cfdb4922c38d9f0ced941eeb4578d71f09d65201d2f89cfc73e46ae73f0939c74fa92d7f003b87a28f814c5b2cc0dda6855b86e64fd86be3920c129f8c20df6a
 SHA512 
d3838cc2ab6236d57c17f92fa5eaef8458176715985aecbea9653cc772725e1b9f813c9ffc8e06490e08c1031826ab84d1fcfbd88008791cac3257db814e3dc8

diff --git a/dev-util/dlang-tools/dlang-tools-2.094.1.ebuild 
b/dev-util/dlang-tools/dlang-tools-2.094.2.ebuild
similarity index 100%
rename from dev-util/dlang-tools/dlang-tools-2.094.1.ebuild
rename to dev-util/dlang-tools/dlang-tools-2.094.2.ebuild

diff --git a/eclass/dmd.eclass b/eclass/dmd.eclass
index 8373f5f..6d29a46 100644
--- a/eclass/dmd.eclass
+++ b/eclass/dmd.eclass
@@ -122,7 +122,6 @@ dmd_src_compile() {
        # A native build of dmd is used to compile the runtimes for both x86 
and amd64
        # We cannot use multilib-minimal yet, as we have to be sure dmd for 
amd64
        # always gets build first.
-       einfo "Building dmd..."
 
        # 2.068 used HOST_DC instead of HOST_DMD
        dmd_eq 2.068 && HOST_DMD="HOST_DC" || HOST_DMD="HOST_DMD"
@@ -149,7 +148,15 @@ dmd_src_compile() {
                esac
                export DMD="../../${kernel}/bin${model}/dmd"
        fi
-       emake -C dmd/src -f posix.mak TARGET_CPU=X86 ${HOST_DMD}="${DMD}" 
${HOST_CXX}="$(tc-getCXX)" ${ENABLE_RELEASE}=1 ${LTO}
+       if dmd_ge 2.094; then
+               einfo "Building dmd build script..."
+               dlang_compile_bin dmd/generated/build dmd/src/build.d
+               einfo "Building dmd..."
+               env ${ENABLE_RELEASE}=1 ${LTO} dmd/generated/build dmd
+       else
+               einfo "Building dmd..."
+               emake -C dmd/src -f posix.mak TARGET_CPU=X86 
${HOST_DMD}="${DMD}" ${HOST_CXX}="$(tc-getCXX)" ${ENABLE_RELEASE}=1 ${LTO}
+       fi
 
        # Don't pick up /etc/dmd.conf when calling $(dmd_gen_exe_dir)/dmd !
        if [ ! -f "$(dmd_gen_exe_dir)/dmd.conf" ]; then

Reply via email to