diff options
| -rw-r--r-- | sci-libs/openlibm/ChangeLog | 4 | ||||
| -rw-r--r-- | sci-libs/openlibm/files/openlibm-extras-soname.patch | 11 | ||||
| -rw-r--r-- | sci-libs/openlibm/files/openlibm-soname.patch | 11 | ||||
| -rw-r--r-- | sci-libs/openlibm/openlibm-9999.ebuild | 10 |
4 files changed, 7 insertions, 29 deletions
diff --git a/sci-libs/openlibm/ChangeLog b/sci-libs/openlibm/ChangeLog index 72d966302..6807d384e 100644 --- a/sci-libs/openlibm/ChangeLog +++ b/sci-libs/openlibm/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 14 Jan 2014; <xhochy@gentoo.org> -files/openlibm-extras-soname.patch, + -files/openlibm-soname.patch, openlibm-9999.ebuild: + [sci-libs/openlibm] Remove extras and soname patch + 06 Jan 2014; Justin Lecher <jlec@gentoo.org> openlibm-9999.ebuild, metadata.xml: Switch from git-2 to git-r3 diff --git a/sci-libs/openlibm/files/openlibm-extras-soname.patch b/sci-libs/openlibm/files/openlibm-extras-soname.patch deleted file mode 100644 index 7ee69a2ba..000000000 --- a/sci-libs/openlibm/files/openlibm-extras-soname.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.extras.orig 2013-07-02 22:35:31.150277524 -0400 -+++ Makefile.extras 2013-07-02 22:35:56.993276767 -0400 -@@ -25,7 +25,7 @@ - libopenlibm-extras.a: $(OBJS) - $(AR) -rcs libopenlibm-extras.a $(OBJS) - libopenlibm-extras.$(SHLIB_EXT): $(OBJS) -- $(FC) -shared $(OBJS) $(LDFLAGS) -o libopenlibm-extras.$(SHLIB_EXT) -+ $(FC) -shared $(OBJS) $(LDFLAGS) -Wl,--soname=libopenlibm-extras.$(SHLIB_EXT) -o libopenlibm-extras.$(SHLIB_EXT) - - distclean: - rm -f $(OBJS) *.a *.$(SHLIB_EXT) diff --git a/sci-libs/openlibm/files/openlibm-soname.patch b/sci-libs/openlibm/files/openlibm-soname.patch deleted file mode 100644 index 8852e0aef..000000000 --- a/sci-libs/openlibm/files/openlibm-soname.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.orig 2013-07-16 15:55:33.481244590 -0700 -+++ Makefile 2013-07-16 15:56:15.535491859 -0700 -@@ -26,7 +26,7 @@ - libopenlibm.a: $(OBJS) - $(AR) -rcs libopenlibm.a $(OBJS) - libopenlibm.$(SHLIB_EXT): $(OBJS) -- $(FC) -shared $(OBJS) $(LDFLAGS) -o libopenlibm.$(SHLIB_EXT) -+ $(FC) -shared $(OBJS) $(LDFLAGS) -Wl,--soname=libopenlibm.$(SHLIB_EXT) -o libopenlibm.$(SHLIB_EXT) - - distclean: - rm -f $(OBJS) *.a *.$(SHLIB_EXT) diff --git a/sci-libs/openlibm/openlibm-9999.ebuild b/sci-libs/openlibm/openlibm-9999.ebuild index 3d58a7205..a2b5442b2 100644 --- a/sci-libs/openlibm/openlibm-9999.ebuild +++ b/sci-libs/openlibm/openlibm-9999.ebuild @@ -18,16 +18,12 @@ IUSE="static-libs" src_prepare() { epatch \ - "${FILESDIR}"/${PN}-respect-toolchain.patch \ - "${FILESDIR}"/${PN}-soname.patch \ - "${FILESDIR}"/${PN}-extras-soname.patch + "${FILESDIR}"/${PN}-respect-toolchain.patch } src_compile() { emake libopenlibm.so use static-libs && emake libopenlibm.a - emake -f Makefile.extras libopenlibm-extras.so - use static-libs && emake -f Makefile.extras libopenlibm-extras.a } src_test() { @@ -35,8 +31,8 @@ src_test() { } src_install() { - dolib.so libopenlibm.so libopenlibm-extras.so - use static-libs && dolib.a libopenlibm.a liboenlibm-extras.a + dolib.so libopenlibm.so* + use static-libs && dolib.a libopenlibm.a doheader include/{cdefs,types}-compat.h src/openlibm.h dodoc README.md } |