[gentoo-commits] proj/sci:master commit in: dev-lang/path64/

["Kacper Kowalik" <xarthisius@gentoo.org>]

commit:     0881f8162597c5010b6c2b6cc272e5d191c189d9
Author:     Kacper Kowalik (Xarthisius) <xarthisius.kk <AT> gmail <DOT> com>
AuthorDate: Mon Jul 25 08:34:32 2011 +0000
Commit:     Kacper Kowalik <xarthisius <AT> gentoo <DOT> org>
CommitDate: Mon Jul 25 08:34:32 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0881f816

[dev-lang/path64] Unset all env vars that may cause trouble, prevent stripping source when build with Release, clean up

---
 dev-lang/path64/ChangeLog          |    4 ++++
 dev-lang/path64/path64-9999.ebuild |   32 +++++++++++++++++++-------------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/dev-lang/path64/ChangeLog b/dev-lang/path64/ChangeLog
index ef8bc3a..515e26f 100644
--- a/dev-lang/path64/ChangeLog
+++ b/dev-lang/path64/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> path64-9999.ebuild:
+  Unset all env vars that may cause trouble, prevent stripping source when
+  build with Release, clean up
+
   23 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> path64-9999.ebuild:
   Change lib -> get_libdir
 

diff --git a/dev-lang/path64/path64-9999.ebuild b/dev-lang/path64/path64-9999.ebuild
index 609f7b3..abc7df6 100644
--- a/dev-lang/path64/path64-9999.ebuild
+++ b/dev-lang/path64/path64-9999.ebuild
@@ -7,7 +7,6 @@ CMAKE_VERBOSE=1
 if [ "${PV%9999}" != "${PV}" ] ; then
 	SCM=git-2
 	EGIT_REPO_URI="git://github.com/pathscale/${PN}-suite.git"
-	EGIT_HAS_SUBMODULES=yes
 	PATH64_URI="compiler assembler"
 	PATHSCALE_URI="compiler-rt libcxxrt libdwarf-bsd libunwind stdcxx"
 	DBG_URI="git://github.com/path64/debugger.git"
@@ -32,6 +31,16 @@ DEPEND="!native? ( sys-devel/gcc[vanilla] )
 	native? ( || ( dev-lang/ekopath-bin dev-lang/path64 ) )"
 RDEPEND="${DEPEND}"
 
+pkg_setup() {
+	if use custom-cflags ; then
+		ewarn "You are trying to build ${PN} with custom-cflags"
+		ewarn "There is a high chance that you will utterly fail!"
+		ewarn "Unless you know what you are doing you'd better stop now"
+		ewarn "Should you decide to proceed, you are on your own..."
+		epause
+	fi
+}
+
 src_unpack() {
 	git-2_src_unpack
 	cd "${S}"
@@ -56,28 +65,26 @@ src_prepare() {
 		ROOTPATH=/usr/$(get_libdir)/${PN}/bin
 		LDPATH=/usr/$(get_libdir)/${PN}/lib
 	EOF
+	sed -i -e "s/-Wl,-s //" CMakeLists.txt || die #strip
 }
 
 src_configure() {
 	local linker=$($(tc-getCC) --help -v 2>&1 >/dev/null | grep	'\-dynamic\-linker' | cut -f7 -d' ')
 	local libgcc=$($(tc-getCC) -print-libgcc-file-name)
 	local crt=$($(tc-getCC) -print-file-name=crt1.o)
-	if use custom-cflags; then
-		MY_CFLAGS=${CFLAGS}
-		MY_CXXFLAGS=${CXXFLAGS}
-		MY_FCFLAGS=${FCFLAGS}
-	fi
+	use custom-cflags && flags=(
+			-DCMAKE_C_FLAGS="${CFLAGS}"
+			-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
+		)
+
+	# Yup, I know how bad it is, but I'd rather have a working compiler
+	unset FC F90 F77 FCFLAGS F90FLAGS FFLAGS CFLAGS CXXFLAGS
 
 	if use native ; then
 		export CMAKE_BUILD_TYPE=Release
 		export CC=pathcc
 		export CXX=pathCC
-		unset FC F90 F77 FCFLAGS F90FLAGS FFLAGS
 		export MYCMAKEARGS="-UCMAKE_USER_MAKE_RULES_OVERRIDE"
-		if use amd64 ; then
-			MY_CFLAGS="${MY_CFLAGS} -fPIC"
-			MY_CXXFLAGS="${MY_CXXFLAGS} -fPIC"
-		fi
 	else
 		export CMAKE_BUILD_TYPE=Debug
 	fi
@@ -96,9 +103,8 @@ src_configure() {
 		-DPSC_CRTBEGIN_PATH=$(dirname ${libgcc})
 		-DPSC_DYNAMIC_LINKER_x86_64=${linker}
 		-DCMAKE_C_COMPILER="$(tc-getCC)"
-		-DCMAKE_C_FLAGS="${MY_CFLAGS}"
 		-DCMAKE_CXX_COMPILER="$(tc-getCXX)"
-		-DCMAKE_CXX_FLAGS="${MY_CFLAGS}"
+		"${flags[@]}"
 	)
 	cmake-utils_src_configure
 }