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

["Alexis Ballier (aballier)" <aballier@gentoo.org>]

aballier    13/05/30 23:21:43

  Modified:             ChangeLog libcxx-9999.ebuild
  Log:
  add a static-libs useflag and link tests with -lm
  
  (Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

Revision  Changes    Path
1.14                 sys-libs/libcxx/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ChangeLog	30 May 2013 21:51:41 -0000	1.13
+++ ChangeLog	30 May 2013 23:21:43 -0000	1.14
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/libcxx
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.13 2013/05/30 21:51:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/ChangeLog,v 1.14 2013/05/30 23:21:43 aballier Exp $
+
+  30 May 2013; Alexis Ballier <aballier@gentoo.org> libcxx-9999.ebuild:
+  add a static-libs useflag and link tests with -lm
 
   30 May 2013; Alexis Ballier <aballier@gentoo.org>
   -libcxx-0.0_p20121105.ebuild:



1.7                  sys-libs/libcxx/libcxx-9999.ebuild

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

Index: libcxx-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libcxx-9999.ebuild	30 May 2013 21:48:05 -0000	1.6
+++ libcxx-9999.ebuild	30 May 2013 23:21:43 -0000	1.7
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.6 2013/05/30 21:48:05 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcxx/libcxx-9999.ebuild,v 1.7 2013/05/30 23:21:43 aballier Exp $
 
 EAPI=5
 
@@ -25,9 +25,9 @@
 else
 	KEYWORDS=""
 fi
-IUSE=""
+IUSE="static-libs"
 
-RDEPEND="sys-libs/libcxxrt"
+RDEPEND="sys-libs/libcxxrt[static-libs?]"
 DEPEND="${RDEPEND}
 	sys-devel/clang
 	app-arch/xz-utils"
@@ -46,19 +46,31 @@
 	# TODO: cross-compile ?
 	export CC=clang
 	export CXX=clang++
-	cmake-utils_src_configure
+	use static-libs && BUILD_DIR="${S}_static" mycmakeargs="-DLIBCXX_ENABLE_SHARED=OFF" cmake-utils_src_configure
+	BUILD_DIR="${S}_shared" cmake-utils_src_configure
+}
+
+src_compile() {
+	use static-libs && BUILD_DIR="${S}_static" cmake-utils_src_compile
+	BUILD_DIR="${S}_shared" cmake-utils_src_compile
 }
 
 # Tests fail for now, if anybody is able to fix them, help is very welcome.
 src_test() {
 	cd "${S}/test"
-	LD_LIBRARY_PATH="${CMAKE_BUILD_DIR}/lib:${LD_LIBRARY_PATH}" \
+	LD_LIBRARY_PATH="${S}_shared/lib:${LD_LIBRARY_PATH}" \
 		CC="clang++" \
 		HEADER_INCLUDE="-I${S}/include" \
-		SOURCE_LIB="-L${CMAKE_BUILD_DIR}/lib" \
+		SOURCE_LIB="-L${S}_shared/lib" \
+		LIBS="-lm" \
 		./testit || die
 }
 
+src_install() {
+	use static-libs && BUILD_DIR="${S}_static" cmake-utils_src_install
+	BUILD_DIR="${S}_shared" cmake-utils_src_install
+}
+
 pkg_postinst() {
 	elog "This package (${PN}) is mainly intended as a replacement for the C++"
 	elog "standard library when using clang."