commit: 7720bff56f66425783d5a4e9b0ddad16dcc42e50 Author: Marco Leise <marco.leise <AT> gmx <DOT> de> AuthorDate: Mon Mar 9 19:01:57 2020 +0000 Commit: Marco Leise <marco.leise <AT> gmx <DOT> de> CommitDate: Mon Mar 9 19:01:57 2020 +0000 URL: https://gitweb.gentoo.org/repo/user/dlang.git/commit/?id=7720bff5
removed dlang_has_shared_lib_support() function as all offered compilers support shared libs now Signed-off-by: Marco Leise <marco.leise <AT> gmx.de> dev-libs/gtkd/gtkd-2.4.2-r1.ebuild | 21 +++++++-------------- dev-libs/gtkd/gtkd-3.8.5-r1.ebuild | 12 +++++------- eclass/dlang.eclass | 17 +---------------- 3 files changed, 13 insertions(+), 37 deletions(-) diff --git a/dev-libs/gtkd/gtkd-2.4.2-r1.ebuild b/dev-libs/gtkd/gtkd-2.4.2-r1.ebuild index c98a3aa..ad07352 100644 --- a/dev-libs/gtkd/gtkd-2.4.2-r1.ebuild +++ b/dev-libs/gtkd/gtkd-2.4.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -41,13 +41,8 @@ d_src_compile() { compile_libs() { # Build the shared library version of the component # The test phase expects no version extension on the .so - if dlang_has_shared_lib_support; then - dlang_compile_lib_so lib${LIB_NAME}-${MAJOR}.so \ - lib${LIB_NAME}-${MAJOR}.so.0 -Isrc ${GTKD_SRC_DIRS[$i]}/*/*.d - else - ewarn "${DC} does not have shared library support." - ewarn "Only static ${LIB_NAME} will be compiled if selected through the static-libs USE flag." - fi + dlang_compile_lib_so lib${LIB_NAME}-${MAJOR}.so \ + lib${LIB_NAME}-${MAJOR}.so.0 -Isrc ${GTKD_SRC_DIRS[$i]}/*/*.d # Build the static library version if use static-libs; then @@ -76,12 +71,10 @@ d_src_test() { d_src_install() { install_libs() { # Install the shared library version of the component - if dlang_has_shared_lib_support; then - local libfile="lib${LIB_NAME}-${MAJOR}.so" - ln -s "${libfile}" "${libfile}.0" - ln -s "${libfile}" "${libfile}.0.${MINOR}" - dolib.so "${libfile}.0.${MINOR}" "${libfile}.0" "${libfile}" - fi + local libfile="lib${LIB_NAME}-${MAJOR}.so" + ln -s "${libfile}" "${libfile}.0" + ln -s "${libfile}" "${libfile}.0.${MINOR}" + dolib.so "${libfile}.0.${MINOR}" "${libfile}.0" "${libfile}" # Install the static library version if use static-libs; then diff --git a/dev-libs/gtkd/gtkd-3.8.5-r1.ebuild b/dev-libs/gtkd/gtkd-3.8.5-r1.ebuild index acfe068..841f0a9 100644 --- a/dev-libs/gtkd/gtkd-3.8.5-r1.ebuild +++ b/dev-libs/gtkd/gtkd-3.8.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -81,12 +81,10 @@ d_src_test() { d_src_install() { install_libs() { # Install the shared library version of the component - if dlang_has_shared_lib_support; then - local libfile="lib${LIB_NAME}-${MAJOR}.so" - ln -sf "${libfile}" "${libfile}.0" - ln -sf "${libfile}" "${libfile}.0.${MINOR}" - dolib.so "${libfile}.0.${MINOR}" "${libfile}.0" "${libfile}" - fi + local libfile="lib${LIB_NAME}-${MAJOR}.so" + ln -sf "${libfile}" "${libfile}.0" + ln -sf "${libfile}" "${libfile}.0.${MINOR}" + dolib.so "${libfile}.0.${MINOR}" "${libfile}.0" "${libfile}" # Install the static library version if use static-libs; then diff --git a/eclass/dlang.eclass b/eclass/dlang.eclass index 5373cc8..a8a4ace 100644 --- a/eclass/dlang.eclass +++ b/eclass/dlang.eclass @@ -105,18 +105,6 @@ dlang_single_config() { __dlang_use_build_vars "${@}" } -dlang_has_shared_lib_support() { - if [[ "${DLANG_VENDOR}" == "DigitalMars" ]]; then - [[ $(ver_cut 1 ${DLANG_VERSION}) -eq 2 ]] && [[ $((10#$(ver_cut 2 ${DLANG_VERSION}))) -ge 63 ]] - elif [[ "${DLANG_VENDOR}" == "GNU" ]]; then - true - elif [[ "${DLANG_VENDOR}" == "LDC" ]]; then - [[ $(ver_cut 1 ${DLANG_VERSION}) -eq 2 ]] && [[ $((10#$(ver_cut 2 ${DLANG_VERSION}))) -ge 73 ]] - else - die "Could not detect D compiler vendor!" - fi -} - # @FUNCTION: dlang_src_prepare # @DESCRIPTION: @@ -602,10 +590,7 @@ __dlang_use_build_vars() { else export LIBDIR_${ABI}="lib/gcc/${CHOST_default}/${DC_VERSION}/${MODEL}" fi - export DCFLAGS="${GDCFLAGS}" - if dlang_has_shared_lib_support; then - export DCFLAGS="${DCFLAGS} -shared-libphobos" - fi + export DCFLAGS="${GDCFLAGS} -shared-libphobos" export DLANG_LINKER_FLAG="-Xlinker " export DLANG_SO_FLAGS="-shared -fpic" export DLANG_OUTPUT_FLAG="-o "