From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QlGch-000299-1c for garchives@archives.gentoo.org; Mon, 25 Jul 2011 08:34:47 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3333721C13F; Mon, 25 Jul 2011 08:34:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E358521C13F for ; Mon, 25 Jul 2011 08:34:39 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5CE082AC005 for ; Mon, 25 Jul 2011 08:34:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id B8ACE8003D for ; Mon, 25 Jul 2011 08:34:38 +0000 (UTC) From: "Kacper Kowalik" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Kacper Kowalik" Message-ID: <0881f8162597c5010b6c2b6cc272e5d191c189d9.xarthisius@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: dev-lang/path64/ X-VCS-Repository: proj/sci X-VCS-Files: dev-lang/path64/ChangeLog dev-lang/path64/path64-9999.ebuild X-VCS-Directories: dev-lang/path64/ X-VCS-Committer: xarthisius X-VCS-Committer-Name: Kacper Kowalik X-VCS-Revision: 0881f8162597c5010b6c2b6cc272e5d191c189d9 Date: Mon, 25 Jul 2011 08:34:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 7412e2d3479ca2bcf99e765cadcf85ec commit: 0881f8162597c5010b6c2b6cc272e5d191c189d9 Author: Kacper Kowalik (Xarthisius) gmail c= om> AuthorDate: Mon Jul 25 08:34:32 2011 +0000 Commit: Kacper Kowalik gentoo org> CommitDate: Mon Jul 25 08:34:32 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D0881f816 [dev-lang/path64] Unset all env vars that may cause trouble, prevent stri= pping 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: $ =20 + 25 Jul 2011; Kacper Kowalik path64-9999.ebuild= : + Unset all env vars that may cause trouble, prevent stripping source wh= en + build with Release, clean up + 23 Jul 2011; Kacper Kowalik path64-9999.ebuild= : Change lib -> get_libdir =20 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=3D1 if [ "${PV%9999}" !=3D "${PV}" ] ; then SCM=3Dgit-2 EGIT_REPO_URI=3D"git://github.com/pathscale/${PN}-suite.git" - EGIT_HAS_SUBMODULES=3Dyes PATH64_URI=3D"compiler assembler" PATHSCALE_URI=3D"compiler-rt libcxxrt libdwarf-bsd libunwind stdcxx" DBG_URI=3D"git://github.com/path64/debugger.git" @@ -32,6 +31,16 @@ DEPEND=3D"!native? ( sys-devel/gcc[vanilla] ) native? ( || ( dev-lang/ekopath-bin dev-lang/path64 ) )" RDEPEND=3D"${DEPEND}" =20 +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=3D/usr/$(get_libdir)/${PN}/bin LDPATH=3D/usr/$(get_libdir)/${PN}/lib EOF + sed -i -e "s/-Wl,-s //" CMakeLists.txt || die #strip } =20 src_configure() { local linker=3D$($(tc-getCC) --help -v 2>&1 >/dev/null | grep '\-dynami= c\-linker' | cut -f7 -d' ') local libgcc=3D$($(tc-getCC) -print-libgcc-file-name) local crt=3D$($(tc-getCC) -print-file-name=3Dcrt1.o) - if use custom-cflags; then - MY_CFLAGS=3D${CFLAGS} - MY_CXXFLAGS=3D${CXXFLAGS} - MY_FCFLAGS=3D${FCFLAGS} - fi + use custom-cflags && flags=3D( + -DCMAKE_C_FLAGS=3D"${CFLAGS}" + -DCMAKE_CXX_FLAGS=3D"${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 =20 if use native ; then export CMAKE_BUILD_TYPE=3DRelease export CC=3Dpathcc export CXX=3DpathCC - unset FC F90 F77 FCFLAGS F90FLAGS FFLAGS export MYCMAKEARGS=3D"-UCMAKE_USER_MAKE_RULES_OVERRIDE" - if use amd64 ; then - MY_CFLAGS=3D"${MY_CFLAGS} -fPIC" - MY_CXXFLAGS=3D"${MY_CXXFLAGS} -fPIC" - fi else export CMAKE_BUILD_TYPE=3DDebug fi @@ -96,9 +103,8 @@ src_configure() { -DPSC_CRTBEGIN_PATH=3D$(dirname ${libgcc}) -DPSC_DYNAMIC_LINKER_x86_64=3D${linker} -DCMAKE_C_COMPILER=3D"$(tc-getCC)" - -DCMAKE_C_FLAGS=3D"${MY_CFLAGS}" -DCMAKE_CXX_COMPILER=3D"$(tc-getCXX)" - -DCMAKE_CXX_FLAGS=3D"${MY_CFLAGS}" + "${flags[@]}" ) cmake-utils_src_configure }