commit: 6288d6520535f62f6259333d8ad3aff6a65b6c28 Author: Andrei Horodniceanu <a.horodniceanu <AT> proton <DOT> me> AuthorDate: Fri Aug 8 14:44:14 2025 +0000 Commit: Horodniceanu Andrei <a.horodniceanu <AT> proton <DOT> me> CommitDate: Sun Aug 24 15:29:18 2025 +0000 URL: https://gitweb.gentoo.org/repo/user/dlang.git/commit/?id=6288d652
dev-lang/ldc2: Drop old Signed-off-by: Andrei Horodniceanu <a.horodniceanu <AT> proton.me> Part-of: https://github.com/gentoo/dlang/pull/140 Signed-off-by: Andrei Horodniceanu <a.horodniceanu <AT> proton.me> dev-lang/ldc2/Manifest | 4 -- .../files/ldc2-1.15.0-link-defaultlib-shared.patch | 11 --- dev-lang/ldc2/ldc2-1.32.2-r1.ebuild | 79 -------------------- dev-lang/ldc2/ldc2-1.33.0-r1.ebuild | 79 -------------------- dev-lang/ldc2/ldc2-1.34.0-r1.ebuild | 80 --------------------- dev-lang/ldc2/ldc2-1.35.0-r2.ebuild | 84 ---------------------- eclass/dlang-compilers-r1.eclass | 8 +-- eclass/dlang-compilers.eclass | 4 -- eclass/tests/dlang-utils.sh | 4 +- profiles/use.desc | 12 ---- 10 files changed, 6 insertions(+), 359 deletions(-) diff --git a/dev-lang/ldc2/Manifest b/dev-lang/ldc2/Manifest index 4acf346..48c1506 100644 --- a/dev-lang/ldc2/Manifest +++ b/dev-lang/ldc2/Manifest @@ -1,7 +1,3 @@ -DIST ldc-1.32.2-src.tar.gz 8116363 BLAKE2B 2fb0c2c01bc6257dcaeca75318e241ebdb9b6212a5a368ba9e2337a143ed2c7ddc932ffb1c70587142ab755f7d36f8f27a94148de32c60fef440f15cc3e9cdec SHA512 1494c7e3905851dbb679b8c7a651f21b57fa58a6bfbf5bd83661829b69158cbd1c963db463fd6dbd60c1be1c739396b761376fc2978dd71dee968aaae3629e2b -DIST ldc-1.33.0-src.tar.gz 8139266 BLAKE2B 6c2efd0765307815563bc7bd775f1faef3f5e19c82e4aee038f668dd00a2521fa58bd32f6a45d2bc5a3854f31a2d7bd47b1be255aeafc0a4206f72d663b0021f SHA512 ef5a42934e24caf947b63ef29a62205b07b539a59292266877f2d5f5ecf06272e1fc3ca83772d02eda203e4b166fbcea788b804740b8780b07a4643e4b51bf70 -DIST ldc-1.34.0-src.tar.gz 8176200 BLAKE2B 048975a3142da860540ba5378be5214884eb44e2f4492e95aa124a669ccf53bbcf9ccce24f12946948265af5a0de1f5771d21f196052ab53275aa8bb7d0dfb2e SHA512 c4ceda1d448b91f706719cdea141cb705f9996ea3f86c107620f13e2f50f6a29724a69b5e3b01c51e13dd4e50ba29a280785ce0789188641c90738d774300a06 -DIST ldc-1.35.0-src.tar.gz 8241960 BLAKE2B fb531841e57225f82cddf5135d0b0da98624d33aba76a1d39d98b13deb319556eaad3599ba1461f9f509c6b7b535632b85805de2433bae4ccf50c691c116da3f SHA512 f85871832455a8e3208f7f905b04ac249a988f8ea2cfe81ed2a67b56404d11a08653b13b6019f45d9dbcf6fbd60086e6aabb13307908d1bbf6d86bd91462dfaa DIST ldc-1.36.0-src.tar.gz 8551871 BLAKE2B b0f09128ab37e332f2eebab3288cac687f91b696ba758d9ecd6fc4d98dc70d13e6fc4e02878028ac530cc9d9449d1148c8c3ed052fecfb18c95bd76437537467 SHA512 e8060ae30ddf659c51b2e57989b14f1d94c58537a3aa0c5afd3cf2906503d66421598014c33fdeb063a5aaea00034b4b11769a2c07cc2dabd7644840241183b4 DIST ldc-1.37.0-src.tar.gz 8555980 BLAKE2B ac93c903f9dbeec5b69e94c7cdf851ae3fa3168752dceccbd1262fbdae5cdda43e53b82bd7c8b24b0bb2dc06fb00f3b1c74a278a851ea68b948dc7e618460227 SHA512 488451dba58262cf533760f471f707f984d66edeb5c7dfff5a512efa0111742cead4ff23ed5ace39ea4d07e9bac290a846d0df3de49fd3fc276241a771aff0ed DIST ldc-1.38.0-src.tar.gz 8691096 BLAKE2B 7b25ba96c470a707d9ee7660ac030984c2cfecaf757a00015507dfb7c17075132ebcc546562ae700ab43eb19e117b4d1247cc1b2f62f455328a7cf9dc0ddf5d4 SHA512 1540a1a6f4bad3bc93da0f59bc28cd31dd4aeb58b8b4c744a204faa43692a1fe13d010ae56b3369e870a5e58724103b2aee58db8b40925698e7816f78f0f2de3 diff --git a/dev-lang/ldc2/files/ldc2-1.15.0-link-defaultlib-shared.patch b/dev-lang/ldc2/files/ldc2-1.15.0-link-defaultlib-shared.patch deleted file mode 100644 index 360634c..0000000 --- a/dev-lang/ldc2/files/ldc2-1.15.0-link-defaultlib-shared.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/runtime/CMakeLists.txt -+++ b/runtime/CMakeLists.txt -@@ -252,7 +252,7 @@ - - # Only have either shared or static libs? - # Then explicitly default to linking against them via default LDC switch. --if(${BUILD_SHARED_LIBS} STREQUAL "ON") -+if(NOT ${BUILD_SHARED_LIBS} STREQUAL "OFF") - set(ADDITIONAL_DEFAULT_LDC_SWITCHES "${ADDITIONAL_DEFAULT_LDC_SWITCHES}\n \"-link-defaultlib-shared\",") - elseif(${BUILD_SHARED_LIBS} STREQUAL "OFF") - set(ADDITIONAL_DEFAULT_LDC_SWITCHES "${ADDITIONAL_DEFAULT_LDC_SWITCHES}\n \"-link-defaultlib-shared=false\",") diff --git a/dev-lang/ldc2/ldc2-1.32.2-r1.ebuild b/dev-lang/ldc2/ldc2-1.32.2-r1.ebuild deleted file mode 100644 index 42a0214..0000000 --- a/dev-lang/ldc2/ldc2-1.32.2-r1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic multilib-build cmake llvm - -MY_PV="${PV//_/-}" -MY_P="ldc-${MY_PV}-src" -SRC_URI="https://github.com/ldc-developers/ldc/releases/download/v${MY_PV}/${MY_P}.tar.gz"; -S=${WORKDIR}/${MY_P} - -DESCRIPTION="LLVM D Compiler" -HOMEPAGE="https://github.com/ldc-developers/ldc"; -KEYWORDS="amd64 ~arm64 x86" -LICENSE="BSD" -SLOT="$(ver_cut 1-2)/$(ver_cut 3)" - -IUSE="static-libs" - -# Upstream supports LLVM 9.0 through 15.0. -RDEPEND=" - || ( - llvm-core/llvm:15 - ) - <llvm-core/llvm-16:= - >=app-eselect/eselect-dlang-20140709" -DEPEND="${RDEPEND}" -LLVM_MAX_SLOT=15 -PATCHES="${FILESDIR}/ldc2-1.15.0-link-defaultlib-shared.patch" - -# For now, we support amd64 multilib. Anyone is free to add more support here. -MULTILIB_COMPAT=( abi_x86_{32,64} ) - -# Upstream supports "2.079-" -DLANG_VERSION_RANGE="2.075-2.080 2.082-2.106" -DLANG_PACKAGE_TYPE="single" - -inherit dlang - -src_prepare() { - cmake_src_prepare -} - -d_src_configure() { - # Make sure libphobos2 is installed into ldc2's directory. - export LIBDIR_${ABI}="${LIBDIR_HOST}" - # https://bugs.gentoo.org/show_bug.cgi?id=922590 - append-flags -fno-strict-aliasing - local mycmakeargs=( - -DD_VERSION=2 - -DCMAKE_INSTALL_PREFIX=/usr/lib/ldc2/$(ver_cut 1-2) - -DD_COMPILER="${DMD} $(dlang_dmdw_dcflags)" - -DLDC_WITH_LLD=OFF - ) - use static-libs && mycmakeargs+=( -DBUILD_SHARED_LIBS=BOTH ) || mycmakeargs+=( -DBUILD_SHARED_LIBS=ON ) - use abi_x86_32 && use abi_x86_64 && mycmakeargs+=( -DMULTILIB=ON ) - cmake_src_configure -} - -d_src_compile() -{ - cmake_src_compile -} - -d_src_install() { - cmake_src_install - - rm -rf "${ED}"/usr/share/bash-completion -} - -pkg_postinst() { - # Update active ldc2 - "${ROOT}"/usr/bin/eselect dlang update ldc2 -} - -pkg_postrm() { - "${ROOT}"/usr/bin/eselect dlang update ldc2 -} diff --git a/dev-lang/ldc2/ldc2-1.33.0-r1.ebuild b/dev-lang/ldc2/ldc2-1.33.0-r1.ebuild deleted file mode 100644 index 42a0214..0000000 --- a/dev-lang/ldc2/ldc2-1.33.0-r1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic multilib-build cmake llvm - -MY_PV="${PV//_/-}" -MY_P="ldc-${MY_PV}-src" -SRC_URI="https://github.com/ldc-developers/ldc/releases/download/v${MY_PV}/${MY_P}.tar.gz"; -S=${WORKDIR}/${MY_P} - -DESCRIPTION="LLVM D Compiler" -HOMEPAGE="https://github.com/ldc-developers/ldc"; -KEYWORDS="amd64 ~arm64 x86" -LICENSE="BSD" -SLOT="$(ver_cut 1-2)/$(ver_cut 3)" - -IUSE="static-libs" - -# Upstream supports LLVM 9.0 through 15.0. -RDEPEND=" - || ( - llvm-core/llvm:15 - ) - <llvm-core/llvm-16:= - >=app-eselect/eselect-dlang-20140709" -DEPEND="${RDEPEND}" -LLVM_MAX_SLOT=15 -PATCHES="${FILESDIR}/ldc2-1.15.0-link-defaultlib-shared.patch" - -# For now, we support amd64 multilib. Anyone is free to add more support here. -MULTILIB_COMPAT=( abi_x86_{32,64} ) - -# Upstream supports "2.079-" -DLANG_VERSION_RANGE="2.075-2.080 2.082-2.106" -DLANG_PACKAGE_TYPE="single" - -inherit dlang - -src_prepare() { - cmake_src_prepare -} - -d_src_configure() { - # Make sure libphobos2 is installed into ldc2's directory. - export LIBDIR_${ABI}="${LIBDIR_HOST}" - # https://bugs.gentoo.org/show_bug.cgi?id=922590 - append-flags -fno-strict-aliasing - local mycmakeargs=( - -DD_VERSION=2 - -DCMAKE_INSTALL_PREFIX=/usr/lib/ldc2/$(ver_cut 1-2) - -DD_COMPILER="${DMD} $(dlang_dmdw_dcflags)" - -DLDC_WITH_LLD=OFF - ) - use static-libs && mycmakeargs+=( -DBUILD_SHARED_LIBS=BOTH ) || mycmakeargs+=( -DBUILD_SHARED_LIBS=ON ) - use abi_x86_32 && use abi_x86_64 && mycmakeargs+=( -DMULTILIB=ON ) - cmake_src_configure -} - -d_src_compile() -{ - cmake_src_compile -} - -d_src_install() { - cmake_src_install - - rm -rf "${ED}"/usr/share/bash-completion -} - -pkg_postinst() { - # Update active ldc2 - "${ROOT}"/usr/bin/eselect dlang update ldc2 -} - -pkg_postrm() { - "${ROOT}"/usr/bin/eselect dlang update ldc2 -} diff --git a/dev-lang/ldc2/ldc2-1.34.0-r1.ebuild b/dev-lang/ldc2/ldc2-1.34.0-r1.ebuild deleted file mode 100644 index 97a044f..0000000 --- a/dev-lang/ldc2/ldc2-1.34.0-r1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic multilib-build cmake llvm - -MY_PV="${PV//_/-}" -MY_P="ldc-${MY_PV}-src" -SRC_URI="https://github.com/ldc-developers/ldc/releases/download/v${MY_PV}/${MY_P}.tar.gz"; -S=${WORKDIR}/${MY_P} - -DESCRIPTION="LLVM D Compiler" -HOMEPAGE="https://github.com/ldc-developers/ldc"; -KEYWORDS="amd64 ~arm64 x86" -LICENSE="BSD" -SLOT="$(ver_cut 1-2)/$(ver_cut 3)" - -IUSE="static-libs" - -# Upstream supports LLVM 11.0 through 16. -RDEPEND=" - || ( - llvm-core/llvm:16 - llvm-core/llvm:15 - ) - <llvm-core/llvm-17:= - >=app-eselect/eselect-dlang-20140709" -DEPEND="${RDEPEND}" -LLVM_MAX_SLOT=16 -PATCHES="${FILESDIR}/ldc2-1.15.0-link-defaultlib-shared.patch" - -# For now, we support amd64 multilib. Anyone is free to add more support here. -MULTILIB_COMPAT=( abi_x86_{32,64} ) - -# Upstream supports "2.079-" -DLANG_VERSION_RANGE="2.075-2.080 2.082-2.106" -DLANG_PACKAGE_TYPE="single" - -inherit dlang - -src_prepare() { - cmake_src_prepare -} - -d_src_configure() { - # Make sure libphobos2 is installed into ldc2's directory. - export LIBDIR_${ABI}="${LIBDIR_HOST}" - # https://bugs.gentoo.org/show_bug.cgi?id=922590 - append-flags -fno-strict-aliasing - local mycmakeargs=( - -DD_VERSION=2 - -DCMAKE_INSTALL_PREFIX=/usr/lib/ldc2/$(ver_cut 1-2) - -DD_COMPILER="${DMD} $(dlang_dmdw_dcflags)" - -DLDC_WITH_LLD=OFF - ) - use static-libs && mycmakeargs+=( -DBUILD_SHARED_LIBS=BOTH ) || mycmakeargs+=( -DBUILD_SHARED_LIBS=ON ) - use abi_x86_32 && use abi_x86_64 && mycmakeargs+=( -DMULTILIB=ON ) - cmake_src_configure -} - -d_src_compile() -{ - cmake_src_compile -} - -d_src_install() { - cmake_src_install - - rm -rf "${ED}"/usr/share/bash-completion -} - -pkg_postinst() { - # Update active ldc2 - "${ROOT}"/usr/bin/eselect dlang update ldc2 -} - -pkg_postrm() { - "${ROOT}"/usr/bin/eselect dlang update ldc2 -} diff --git a/dev-lang/ldc2/ldc2-1.35.0-r2.ebuild b/dev-lang/ldc2/ldc2-1.35.0-r2.ebuild deleted file mode 100644 index e3dcb7f..0000000 --- a/dev-lang/ldc2/ldc2-1.35.0-r2.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic multilib-build cmake llvm - -MY_PV="${PV//_/-}" -MY_P="ldc-${MY_PV}-src" -SRC_URI="https://github.com/ldc-developers/ldc/releases/download/v${MY_PV}/${MY_P}.tar.gz"; -S=${WORKDIR}/${MY_P} - -DESCRIPTION="LLVM D Compiler" -HOMEPAGE="https://github.com/ldc-developers/ldc"; -KEYWORDS="amd64 ~arm64 x86" -LICENSE="BSD" -SLOT="$(ver_cut 1-2)/$(ver_cut 3)" - -IUSE="static-libs" - -# Upstream supports LLVM 11.0 through 16.0. -DEPEND=" - || ( - llvm-core/llvm:16 - llvm-core/llvm:15 - ) - <llvm-core/llvm-17:=" -IDEPEND=">=app-eselect/eselect-dlang-20140709" -RDEPEND=" - ${DEPEND} - ${IDEPEND}" - -LLVM_MAX_SLOT=16 -PATCHES="${FILESDIR}/ldc2-1.15.0-link-defaultlib-shared.patch" - -# For now, we support amd64 multilib. Anyone is free to add more support here. -MULTILIB_COMPAT=( abi_x86_{32,64} ) - -# Upstream supports "2.079-" -DLANG_VERSION_RANGE="2.100-2.106" -DLANG_PACKAGE_TYPE="single" - -inherit dlang - -src_prepare() { - cmake_src_prepare -} - -d_src_configure() { - # Make sure libphobos2 is installed into ldc2's directory. - export LIBDIR_${ABI}="${LIBDIR_HOST}" - # https://bugs.gentoo.org/show_bug.cgi?id=922590 - append-flags -fno-strict-aliasing - local mycmakeargs=( - -DD_VERSION=2 - -DCMAKE_INSTALL_PREFIX=/usr/lib/ldc2/$(ver_cut 1-2) - -DD_COMPILER="${DMD} $(dlang_dmdw_dcflags)" - -DLDC_WITH_LLD=OFF - -DCOMPILE_D_MODULES_SEPARATELY=ON - ) - use static-libs && mycmakeargs+=( -DBUILD_SHARED_LIBS=BOTH ) || mycmakeargs+=( -DBUILD_SHARED_LIBS=ON ) - use abi_x86_32 && use abi_x86_64 && mycmakeargs+=( -DMULTILIB=ON ) - cmake_src_configure -} - -d_src_compile() -{ - cmake_src_compile -} - -d_src_install() { - cmake_src_install - - rm -rf "${ED}"/usr/share/bash-completion -} - -pkg_postinst() { - # Update active ldc2 - "${ROOT}"/usr/bin/eselect dlang update ldc2 -} - -pkg_postrm() { - "${ROOT}"/usr/bin/eselect dlang update ldc2 -} diff --git a/eclass/dlang-compilers-r1.eclass b/eclass/dlang-compilers-r1.eclass index aeb2eb0..51a4423 100644 --- a/eclass/dlang-compilers-r1.eclass +++ b/eclass/dlang-compilers-r1.eclass @@ -92,10 +92,6 @@ readonly _DLANG_GDC_FRONTENDS=( # D language version the implementation supports and, lastly, there are # two keywords. readonly _DLANG_LDC2_FRONTENDS=( - "1.32 2.102 ~amd64 ~arm64 ~x86" - "1.33 2.103 ~amd64 ~arm64 ~x86" - "1.34 2.104 ~amd64 ~arm64 ~x86" - "1.35 2.105 ~amd64 ~arm64 ~x86" "1.36 2.106 ~amd64 ~arm64 ~x86" "1.37 2.107 ~amd64 ~arm64 ~x86" "1.38 2.108 ~amd64 ~arm64 ~x86" @@ -146,6 +142,10 @@ unset -f _dlang_accumulate_implementations # @DESCRIPTION: # All historical Dlang implementations that are no longer supported. readonly _DLANG_HISTORICAL_IMPLS=( + ldc2-1_35 + ldc2-1_34 + ldc2-1_33 + ldc2-1_32 gdc-11 ) diff --git a/eclass/dlang-compilers.eclass b/eclass/dlang-compilers.eclass index 6249824..301671e 100644 --- a/eclass/dlang-compilers.eclass +++ b/eclass/dlang-compilers.eclass @@ -42,10 +42,6 @@ dlang-compilers_declare_versions() { # LDC _dlang_ldc2_frontend=( - ["1.32"]="2.102 amd64 ~arm64 x86" - ["1.33"]="2.103 amd64 ~arm64 x86" - ["1.34"]="2.104 amd64 ~arm64 x86" - ["1.35"]="2.105 amd64 ~arm64 x86" ["1.36"]="2.106 ~amd64 ~arm64 ~x86" ) } diff --git a/eclass/tests/dlang-utils.sh b/eclass/tests/dlang-utils.sh index e992518..b307664 100755 --- a/eclass/tests/dlang-utils.sh +++ b/eclass/tests/dlang-utils.sh @@ -259,7 +259,7 @@ test_is "_dlang_impl_matches gdc-13 gdc*" 0 test_is "_dlang_impl_matches dmd-2.103 gdc*" 1 test_is "_dlang_impl_matches gdc-13 dmd-2_103" 1 test_is "_dlang_impl_matches dmd-2.107 dmd-2.0*" 1 -test_is "_dlang_impl_matches ldc2-1_34 ldc2*" 0 +test_is "_dlang_impl_matches ldc2-1_40 ldc2*" 0 set +f test_is "_dlang_impl_matches gdc-12 2.100" 0 test_is "_dlang_impl_matches gdc-12 2.086" 1 @@ -273,7 +273,7 @@ test_is "_dlang_impl_matches ldc2-1_36 2.103" 1 # Check for the oldest frontend version patterns test_is "_dlang_impl_matches gdc-12 2.100" 0 test_is "_dlang_impl_matches dmd-2.101 2.101" 0 -test_is "_dlang_impl_matches ldc2-1.32 2.102" 0 +test_is "_dlang_impl_matches ldc2-1.36 2.106" 0 eoutdent tbegin "simple dlang-filter-dflags" diff --git a/profiles/use.desc b/profiles/use.desc index 0cd1b6f..563206c 100644 --- a/profiles/use.desc +++ b/profiles/use.desc @@ -15,10 +15,6 @@ dlang_single_target_gdc-13 - Build for GCC 13 only dlang_single_target_gdc-14 - Build for GCC 14 only dlang_single_target_gdc-15 - Build for GCC 15 only -dlang_single_target_ldc2-1_32 - Build for ldc2 1.32 only -dlang_single_target_ldc2-1_33 - Build for ldc2 1.33 only -dlang_single_target_ldc2-1_34 - Build for ldc2 1.34 only -dlang_single_target_ldc2-1_35 - Build for ldc2 1.35 only dlang_single_target_ldc2-1_36 - Build for ldc2 1.36 only dlang_single_target_ldc2-1_37 - Build for ldc2 1.37 only dlang_single_target_ldc2-1_38 - Build for ldc2 1.38 only @@ -42,10 +38,6 @@ dlang_targets_gdc-13 - Build with GCC 13 dlang_targets_gdc-14 - Build with GCC 14 dlang_targets_gdc-15 - Build with GCC 15 -dlang_targets_ldc2-1_32 - Build with ldc2 1.32 -dlang_targets_ldc2-1_33 - Build with ldc2 1.33 -dlang_targets_ldc2-1_34 - Build with ldc2 1.34 -dlang_targets_ldc2-1_35 - Build with ldc2 1.35 dlang_targets_ldc2-1_36 - Build with ldc2 1.36 dlang_targets_ldc2-1_37 - Build with ldc2 1.37 dlang_targets_ldc2-1_38 - Build with ldc2 1.38 @@ -63,8 +55,4 @@ dmd-2_107 - Build for DMD 2.107 gdc-11 - Build for GCC 11 gdc-12 - Build for GCC 12 gdc-13 - Build for GCC 13 -ldc2-1_32 - Build for ldc2 1.32 -ldc2-1_33 - Build for ldc2 1.33 -ldc2-1_34 - Build for ldc2 1.34 -ldc2-1_35 - Build for ldc2 1.35 ldc2-1_36 - Build for ldc2 1.36
