From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 867371381F3 for ; Wed, 3 Jul 2013 03:19:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 10442E095D; Wed, 3 Jul 2013 03:19:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2EE8EE095D for ; Wed, 3 Jul 2013 03:19:15 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AF5B233E794 for ; Wed, 3 Jul 2013 03:19:14 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 546F6E468F for ; Wed, 3 Jul 2013 03:19:13 +0000 (UTC) From: "Guillaume Horel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Guillaume Horel" Message-ID: <1372821259.044c1843cb2cb90c51d44d9dfa9aad0dc570b78a.guillaume_horel@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/openlibm/, sci-libs/openlibm/files/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/openlibm/files/openlibm-respect-toolchain.patch sci-libs/openlibm/files/openlibmextras-soname.patch sci-libs/openlibm/openlibm-9999.ebuild X-VCS-Directories: sci-libs/openlibm/ sci-libs/openlibm/files/ X-VCS-Committer: guillaume_horel X-VCS-Committer-Name: Guillaume Horel X-VCS-Revision: 044c1843cb2cb90c51d44d9dfa9aad0dc570b78a X-VCS-Branch: master Date: Wed, 3 Jul 2013 03:19:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8a89669f-506b-4c52-a1f2-1df63352873c X-Archives-Hash: b83b4ce64c64c973c8eaee71670fa888 commit: 044c1843cb2cb90c51d44d9dfa9aad0dc570b78a Author: Guillaume Horel gmail com> AuthorDate: Wed Jul 3 03:14:19 2013 +0000 Commit: Guillaume Horel gmail com> CommitDate: Wed Jul 3 03:14:19 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=044c1843 sci-libs/openlibm update patches --- .../openlibm/files/openlibm-respect-toolchain.patch | 18 ++++++++---------- sci-libs/openlibm/files/openlibmextras-soname.patch | 11 +++++++++++ sci-libs/openlibm/openlibm-9999.ebuild | 9 +++++++-- 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/sci-libs/openlibm/files/openlibm-respect-toolchain.patch b/sci-libs/openlibm/files/openlibm-respect-toolchain.patch index 65bfe21..687c8b7 100644 --- a/sci-libs/openlibm/files/openlibm-respect-toolchain.patch +++ b/sci-libs/openlibm/files/openlibm-respect-toolchain.patch @@ -1,17 +1,15 @@ ---- Make.inc.orig 2013-03-03 09:36:52.508027474 -0800 -+++ Make.inc 2013-03-03 09:51:50.846633962 -0800 -@@ -3,25 +3,16 @@ - OS = $(shell uname) - ARCH = $(shell uname -m) +--- Make.inc.orig 2013-07-02 22:11:50.789319117 -0400 ++++ Make.inc 2013-07-02 22:15:03.526313473 -0400 +@@ -2,24 +2,15 @@ + + OS := $(shell uname) -FC = gfortran -FFLAGS += -O3 -+CFLAGS_add += -std=c99 -Wall -I$(OPENLIBM_HOME) -I$(OPENLIBM_HOME)/include -I$(OPENLIBM_HOME)/ld80 -I$(OPENLIBM_HOME)/$(ARCH) -I$(OPENLIBM_HOME)/src -DASSEMBLER -D__BSD_VISIBLE -Wno-implicit-function-declaration -USEGCC = 1 -USECLANG = 0 - --CFLAGS_add += -std=c99 -Wall -O3 -I$(OPENLIBM_HOME) -I$(OPENLIBM_HOME)/include -I$(OPENLIBM_HOME)/ld80 -I$(OPENLIBM_HOME)/$(ARCH) -I$(OPENLIBM_HOME)/src -DASSEMBLER -D__BSD_VISIBLE -Wno-implicit-function-declaration - -ifeq ($(USECLANG),1) -USEGCC = 0 @@ -26,7 +24,7 @@ CFLAGS_add += -fno-gnu89-inline endif -AR = ar -+AR := ar - - default: all ++AR = :ar + ARCH := $(shell $(CC) -dumpmachine | sed "s/\([^-]*\).*$$/\1/") + ifeq ($(ARCH),mingw32) diff --git a/sci-libs/openlibm/files/openlibmextras-soname.patch b/sci-libs/openlibm/files/openlibmextras-soname.patch new file mode 100644 index 0000000..7ee69a2 --- /dev/null +++ b/sci-libs/openlibm/files/openlibmextras-soname.patch @@ -0,0 +1,11 @@ +--- 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/openlibm-9999.ebuild b/sci-libs/openlibm/openlibm-9999.ebuild index 59cfe22..434c252 100644 --- a/sci-libs/openlibm/openlibm-9999.ebuild +++ b/sci-libs/openlibm/openlibm-9999.ebuild @@ -22,13 +22,16 @@ DEPEND="${RDEPEND}" src_prepare() { epatch \ - "${FILESDIR}"/${PN}-respect-toolchain.patch \ - "${FILESDIR}"/${PN}-soname.patch + "${FILESDIR}/${PN}-respect-toolchain.patch" \ + "${FILESDIR}/${PN}-soname.patch" \ + "${FILESDIR}/${PN}extras-soname.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() { @@ -37,7 +40,9 @@ src_test() { src_install() { dolib.so libopenlibm.so + dolib.so libopenlibm-extras.so use static-libs && dolib.a libopenlibm.a + use static-libs && dolib.so liboenlibm-extras.a doheader include/{cdefs,types}-compat.h src/openlibm.h dodoc README.md }