commit:     7941b0c73b5279e9c3d74c2798475d807300b3c1
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Mon Jan 18 10:10:28 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Mon Jan 18 10:10:28 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=7941b0c7

sci-libs/fdlibm: fix fetch, add patch

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 sci-libs/fdlibm/fdlibm-5.3.1.ebuild          | 28 ++++++++++++++
 sci-libs/fdlibm/fdlibm-5.3.ebuild            | 57 ----------------------------
 sci-libs/fdlibm/files/fdlibm-no-Werror.patch | 25 ++++++++++++
 3 files changed, 53 insertions(+), 57 deletions(-)

diff --git a/sci-libs/fdlibm/fdlibm-5.3.1.ebuild 
b/sci-libs/fdlibm/fdlibm-5.3.1.ebuild
new file mode 100644
index 000000000..a2e6b7a09
--- /dev/null
+++ b/sci-libs/fdlibm/fdlibm-5.3.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake multilib
+
+DESCRIPTION="C math library supporting IEEE 754 floating-point arithmetic"
+HOMEPAGE="https://www.netlib.org/fdlibm";
+SRC_URI="https://github.com/batlogic/fdlibm/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+PATCHES=(
+       "${FILESDIR}/${PN}-no-Werror.patch"
+)
+
+src_prepare() {
+       mv CMakelists.txt CMakeLists.txt || die
+       cmake_src_prepare
+}
+
+src_install() {
+       cmake_src_install
+       mv "${ED}/usr/lib" "${ED}/usr/$(get_libdir)" || die
+}

diff --git a/sci-libs/fdlibm/fdlibm-5.3.ebuild 
b/sci-libs/fdlibm/fdlibm-5.3.ebuild
deleted file mode 100644
index d8324a0bc..000000000
--- a/sci-libs/fdlibm/fdlibm-5.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs flag-o-matic versionator multilib
-
-DESCRIPTION="C math library supporting IEEE 754 floating-point arithmetic"
-HOMEPAGE="https://www.netlib.org/fdlibm";
-SRC_URI="http://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2";
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-static_to_shared() {
-       local libstatic=${1}; shift
-       local libname=$(basename ${libstatic%.a})
-       local soname=${libname}$(get_libname $(get_version_component_range 1-2))
-       local libdir=$(dirname ${libstatic})
-
-       einfo "Making ${soname} from ${libstatic}"
-       if [[ ${CHOST} == *-darwin* ]] ; then
-               ${LINK:-$(tc-getCC)} ${LDFLAGS}  \
-                       -dynamiclib -install_name 
"${EPREFIX}"/usr/lib/"${soname}" \
-                       -Wl,-all_load -Wl,${libstatic} \
-                       "$@" -o ${libdir}/${soname} || die "${soname} failed"
-       else
-               ${LINK:-$(tc-getCC)} ${LDFLAGS}  \
-                       -shared -Wl,-soname=${soname} \
-                       -Wl,--whole-archive ${libstatic} -Wl,--no-whole-archive 
\
-                       "$@" -o ${libdir}/${soname} || die "${soname} failed"
-               [[ $(get_version_component_count) -gt 1 ]] && \
-                       ln -s ${soname} ${libdir}/${libname}$(get_libname 
$(get_major_version)) || die
-               ln -s ${soname} ${libdir}/${libname}$(get_libname) || die
-       fi
-}
-
-src_compile() {
-       append-cflags -D_IEEE_LIBM
-       emake CFLAGS="${CFLAGS} -fPIC" CC=$(tc-getCC)
-       mv libm.a lib${PN}.a || die
-       static_to_shared lib${PN}.a
-       if use static-libs; then
-               rm -f *.o || die
-               emake CFLAGS="${CFLAGS}" CC=$(tc-getCC)
-               mv libm.a lib${PN}.a || die
-       fi
-}
-
-src_install() {
-       dolib.so lib${PN}$(get_libname)*
-       use static-libs && dolib.a lib${PN}.a
-       doheader fdlibm.h
-       dodoc readme
-}

diff --git a/sci-libs/fdlibm/files/fdlibm-no-Werror.patch 
b/sci-libs/fdlibm/files/fdlibm-no-Werror.patch
new file mode 100644
index 000000000..30c935ce7
--- /dev/null
+++ b/sci-libs/fdlibm/files/fdlibm-no-Werror.patch
@@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 74bd751..e9d6912 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,20 +1,6 @@
+ cmake_minimum_required(VERSION 3.10)
+ project (fdlibm)
+ 
+-#need to change optimization level to O1 in visual studio
+-#so intrinsics aren't included
+-if(MSVC)
+-    add_compile_options("/W4" "$<$<CONFIG:RELEASE>:/O1>")
+-else()
+-    add_compile_options("-Wall" "-Wextra" "-Werror" 
"$<$<CONFIG:RELEASE>:-O3>")
+-    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+-        add_compile_options("-stdlib=libc++")
+-    else()
+-        # nothing special for gcc at the moment
+-    endif()
+-endif()
+-
+-
+ #
+ #extlib - javascript
+ #

Reply via email to