[gentoo-commits] gentoo-x86 commit in sys-libs/libcxxrt: ChangeLog libcxxrt-9999.ebuild

[Alexis Ballier (aballier)]

aballier    12/05/31 20:48:43

  Modified:             ChangeLog libcxxrt-9999.ebuild
  Log:
  Use our own makefiles, its so simple that we do not need to rely on cmake for this. Build it on top of libunwind instead of using libgcc_s for unwinding. Remove their libunwind bundled headers and ship a reduced one with only the added macros libcxxrt needs. Build with -nodefaultlibs to ensure we do not link to gcc libs. Add static-libs useflag. Give it a src_test.
  
  (Portage version: 2.2.0_alpha108/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  sys-libs/libcxxrt/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxxrt/ChangeLog?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxxrt/ChangeLog?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxxrt/ChangeLog?r1=1.1&r2=1.2

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/libcxxrt/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ChangeLog	28 May 2012 13:58:04 -0000	1.1
+++ ChangeLog	31 May 2012 20:48:43 -0000	1.2
@@ -1,6 +1,14 @@
 # ChangeLog for sys-libs/libcxxrt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxxrt/ChangeLog,v 1.1 2012/05/28 13:58:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxxrt/ChangeLog,v 1.2 2012/05/31 20:48:43 aballier Exp $
+
+  31 May 2012; Alexis Ballier <aballier@g.o> libcxxrt-9999.ebuild,
+  +files/Makefile, +files/Makefile.test, +files/unwind.h:
+  Use our own makefiles, its so simple that we do not need to rely on cmake for
+  this. Build it on top of libunwind instead of using libgcc_s for unwinding.
+  Remove their libunwind bundled headers and ship a reduced one with only the
+  added macros libcxxrt needs. Build with -nodefaultlibs to ensure we do not
+  link to gcc libs. Add static-libs useflag. Give it a src_test.
 
 *libcxxrt-9999 (28 May 2012)
 *libcxxrt-0.0_p20120528 (28 May 2012)



1.2                  sys-libs/libcxxrt/libcxxrt-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxxrt/libcxxrt-9999.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxxrt/libcxxrt-9999.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/libcxxrt/libcxxrt-9999.ebuild?r1=1.1&r2=1.2

Index: libcxxrt-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/libcxxrt/libcxxrt-9999.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libcxxrt-9999.ebuild	28 May 2012 13:58:04 -0000	1.1
+++ libcxxrt-9999.ebuild	31 May 2012 20:48:43 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxxrt/libcxxrt-9999.ebuild,v 1.1 2012/05/28 13:58:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxxrt/libcxxrt-9999.ebuild,v 1.2 2012/05/31 20:48:43 aballier Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@
 
 [ "${PV%9999}" != "${PV}" ] && SCM="git-2" || SCM=""
 
-inherit cmake-utils ${SCM} base flag-o-matic
+inherit base flag-o-matic toolchain-funcs portability ${SCM}
 
 DESCRIPTION="C++ Runtime from PathScale, FreeBSD and NetBSD."
 HOMEPAGE="https://github.com/pathscale/libcxxrt http://www.pathscale.com/node/265"
@@ -26,29 +26,44 @@
 else
 	KEYWORDS=""
 fi
-IUSE=""
+IUSE="static-libs"
 
-RDEPEND=""
+RDEPEND=">=sys-libs/libunwind-1.0.1-r1"
 DEPEND="${RDEPEND}
 	${DEPEND}"
 
-PATCHES=( "${FILESDIR}/0001-Link-to-libdl-where-needed-for-dladdr-exception.cc.patch" )
-
 src_prepare() {
 	base_src_prepare
+	cp "${FILESDIR}/Makefile" src/ || die
+	cp "${FILESDIR}/Makefile.test" test/Makefile || die
+	rm -f src/unwind* || die
+	cp -f "${FILESDIR}/unwind.h" src/ || die
+}
+
+src_compile() {
+	# Notes: we build -nodefaultlibs to avoid linking to gcc libs.
+	# libcxxrt needs: dladdr (dlopen_lib), libunwind (or libgcc_s but we build
+	# over libunwind) and the libc.
+	tc-export CC CXX AR
+	append-ldflags "-Wl,-z,defs" # make sure we are not underlinked
+	cd "${S}/src"
+	LIBS="$(dlopen_lib) -lunwind -lc" emake shared
+	use static-libs && emake static
+}
+
+src_test() {
+	cd "${S}/test"
+	LD_LIBRARY_PATH="${S}/src:${LD_LIBRARY_PATH}" LIBS="-L${S}/src -lcxxrt -lc" emake check
 }
 
 src_install() {
 	# TODO: See README. Maybe hide it in a subdir and let only libcxx know about
 	# it. FreeBSD head installs it in /lib
-	cd "${CMAKE_BUILD_DIR}"
-	dolib.so lib/${PN}.so
-	dolib.a lib/${PN}.a
-
-	cd "${S}"
+	dolib.so src/${PN}.so*
+	use static-libs && dolib.a src/${PN}.a
 
 	insinto /usr/include/libcxxrt/
-	doins src/cxxabi.h src/unwind*.h
+	doins src/cxxabi.h
 
 	dodoc AUTHORS COPYRIGHT README
 }