commit: 585480e834a5740f4d3086b867b7232cb1c1bf63 Author: Horodniceanu Andrei <a.horodniceanu <AT> proton <DOT> me> AuthorDate: Wed Jan 24 18:37:44 2024 +0000 Commit: Horodniceanu Andrei <a.horodniceanu <AT> proton <DOT> me> CommitDate: Wed Jan 24 18:38:50 2024 +0000 URL: https://gitweb.gentoo.org/repo/user/dlang.git/commit/?id=585480e8
dev-lang/ldc2: backport strict-aliasing fixes Bug: https://bugs.gentoo.org/922590 Signed-off-by: Horodniceanu Andrei <a.horodniceanu <AT> proton.me> ...ldc2-1.35.0-r1.ebuild => ldc2-1.32.2-r1.ebuild} | 25 ++++++++++------------ ...ldc2-1.35.0-r1.ebuild => ldc2-1.33.0-r1.ebuild} | 25 ++++++++++------------ ...ldc2-1.35.0-r1.ebuild => ldc2-1.34.0-r1.ebuild} | 22 +++++++++---------- ...ldc2-1.35.0-r1.ebuild => ldc2-1.35.0-r2.ebuild} | 4 +++- 4 files changed, 35 insertions(+), 41 deletions(-) diff --git a/dev-lang/ldc2/ldc2-1.35.0-r1.ebuild b/dev-lang/ldc2/ldc2-1.32.2-r1.ebuild similarity index 82% copy from dev-lang/ldc2/ldc2-1.35.0-r1.ebuild copy to dev-lang/ldc2/ldc2-1.32.2-r1.ebuild index 58638e2..f1d5ad7 100644 --- a/dev-lang/ldc2/ldc2-1.35.0-r1.ebuild +++ b/dev-lang/ldc2/ldc2-1.32.2-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=8 +EAPI=7 -inherit multilib-build cmake llvm +inherit flag-o-matic multilib-build cmake llvm MY_PV="${PV//_/-}" MY_P="ldc-${MY_PV}-src" @@ -18,26 +18,22 @@ SLOT="$(ver_cut 1-2)/$(ver_cut 3)" IUSE="static-libs" -# Upstream supports LLVM 11.0 through 16.0. -DEPEND=" +# Upstream supports LLVM 9.0 through 15.0. +RDEPEND=" || ( - sys-devel/llvm:16 sys-devel/llvm:15 ) - <sys-devel/llvm-17:=" -IDEPEND=">=app-eselect/eselect-dlang-20140709" -RDEPEND=" - ${DEPEND} - ${IDEPEND}" - -LLVM_MAX_SLOT=16 + <sys-devel/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.100-2.106" +DLANG_VERSION_RANGE="2.075-2.080 2.082-" DLANG_PACKAGE_TYPE="single" inherit dlang @@ -49,12 +45,13 @@ 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 ) diff --git a/dev-lang/ldc2/ldc2-1.35.0-r1.ebuild b/dev-lang/ldc2/ldc2-1.33.0-r1.ebuild similarity index 82% copy from dev-lang/ldc2/ldc2-1.35.0-r1.ebuild copy to dev-lang/ldc2/ldc2-1.33.0-r1.ebuild index 58638e2..f1d5ad7 100644 --- a/dev-lang/ldc2/ldc2-1.35.0-r1.ebuild +++ b/dev-lang/ldc2/ldc2-1.33.0-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=8 +EAPI=7 -inherit multilib-build cmake llvm +inherit flag-o-matic multilib-build cmake llvm MY_PV="${PV//_/-}" MY_P="ldc-${MY_PV}-src" @@ -18,26 +18,22 @@ SLOT="$(ver_cut 1-2)/$(ver_cut 3)" IUSE="static-libs" -# Upstream supports LLVM 11.0 through 16.0. -DEPEND=" +# Upstream supports LLVM 9.0 through 15.0. +RDEPEND=" || ( - sys-devel/llvm:16 sys-devel/llvm:15 ) - <sys-devel/llvm-17:=" -IDEPEND=">=app-eselect/eselect-dlang-20140709" -RDEPEND=" - ${DEPEND} - ${IDEPEND}" - -LLVM_MAX_SLOT=16 + <sys-devel/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.100-2.106" +DLANG_VERSION_RANGE="2.075-2.080 2.082-" DLANG_PACKAGE_TYPE="single" inherit dlang @@ -49,12 +45,13 @@ 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 ) diff --git a/dev-lang/ldc2/ldc2-1.35.0-r1.ebuild b/dev-lang/ldc2/ldc2-1.34.0-r1.ebuild similarity index 83% copy from dev-lang/ldc2/ldc2-1.35.0-r1.ebuild copy to dev-lang/ldc2/ldc2-1.34.0-r1.ebuild index 58638e2..9cf71ba 100644 --- a/dev-lang/ldc2/ldc2-1.35.0-r1.ebuild +++ b/dev-lang/ldc2/ldc2-1.34.0-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=8 +EAPI=7 -inherit multilib-build cmake llvm +inherit flag-o-matic multilib-build cmake llvm MY_PV="${PV//_/-}" MY_P="ldc-${MY_PV}-src" @@ -18,18 +18,15 @@ SLOT="$(ver_cut 1-2)/$(ver_cut 3)" IUSE="static-libs" -# Upstream supports LLVM 11.0 through 16.0. -DEPEND=" +# Upstream supports LLVM 11.0 through 16. +RDEPEND=" || ( sys-devel/llvm:16 sys-devel/llvm:15 ) - <sys-devel/llvm-17:=" -IDEPEND=">=app-eselect/eselect-dlang-20140709" -RDEPEND=" - ${DEPEND} - ${IDEPEND}" - + <sys-devel/llvm-17:= + >=app-eselect/eselect-dlang-20140709" +DEPEND="${RDEPEND}" LLVM_MAX_SLOT=16 PATCHES="${FILESDIR}/ldc2-1.15.0-link-defaultlib-shared.patch" @@ -37,7 +34,7 @@ PATCHES="${FILESDIR}/ldc2-1.15.0-link-defaultlib-shared.patch" MULTILIB_COMPAT=( abi_x86_{32,64} ) # Upstream supports "2.079-" -DLANG_VERSION_RANGE="2.100-2.106" +DLANG_VERSION_RANGE="2.075-2.080 2.082-" DLANG_PACKAGE_TYPE="single" inherit dlang @@ -49,12 +46,13 @@ 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 ) diff --git a/dev-lang/ldc2/ldc2-1.35.0-r1.ebuild b/dev-lang/ldc2/ldc2-1.35.0-r2.ebuild similarity index 93% rename from dev-lang/ldc2/ldc2-1.35.0-r1.ebuild rename to dev-lang/ldc2/ldc2-1.35.0-r2.ebuild index 58638e2..ae28b6e 100644 --- a/dev-lang/ldc2/ldc2-1.35.0-r1.ebuild +++ b/dev-lang/ldc2/ldc2-1.35.0-r2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit multilib-build cmake llvm +inherit flag-o-matic multilib-build cmake llvm MY_PV="${PV//_/-}" MY_P="ldc-${MY_PV}-src" @@ -49,6 +49,8 @@ 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)
