diff options
| author |   Kacper Kowalik (Xarthisius) <xarthisius.kk@gmail.com> | 2011-07-25 10:34:32 +0200 |
|---|---|---|
| committer | Kacper Kowalik (Xarthisius) <xarthisius.kk@gmail.com> | 2011-07-25 10:34:32 +0200 |
| commit | 0881f8162597c5010b6c2b6cc272e5d191c189d9 (patch) | |
| tree | ac90dfebe3121d6f6ad130675c25e763401160a1 /dev-lang | |
| parent | Migrating gap-guava from s-o-g to sci: an example of gap package. (diff) | |
| download | sci-0881f8162597c5010b6c2b6cc272e5d191c189d9.tar.gz sci-0881f8162597c5010b6c2b6cc272e5d191c189d9.tar.bz2 sci-0881f8162597c5010b6c2b6cc272e5d191c189d9.zip | |
[dev-lang/path64] Unset all env vars that may cause trouble, prevent stripping source when build with Release, clean up
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/path64/ChangeLog | 4 | ||||
| -rw-r--r-- | dev-lang/path64/Manifest | 4 | ||||
| -rw-r--r-- | dev-lang/path64/path64-9999.ebuild | 32 |
3 files changed, 25 insertions, 15 deletions
diff --git a/dev-lang/path64/ChangeLog b/dev-lang/path64/ChangeLog index ef8bc3a99..515e26f65 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/Manifest b/dev-lang/path64/Manifest index 4736d45d1..ee24f54f9 100644 --- a/dev-lang/path64/Manifest +++ b/dev-lang/path64/Manifest @@ -1,3 +1,3 @@ -EBUILD path64-9999.ebuild 3160 RMD160 1c2272709367daadfe25b4ec6a21529559785d44 SHA1 52681feeb109da0caf17b6a8679cb4b352952b9a SHA256 1e6634d61336658cf67514e4ea69382c0d48ddbc76d36555e16e88c0b9c11c08 -MISC ChangeLog 1261 RMD160 559f1f3f384224f7ec07287f2bc1fddc09d7c8ee SHA1 e702939a4c5afcd48ac33be0fd222842d64afb29 SHA256 93bd4b7e911152f17afec985d6cd07b357940ad1c9c1298d7f71f0bbbd072d5d +EBUILD path64-9999.ebuild 3428 RMD160 fa44262e4e5a55b41f83fdf2ddf9a1f1308befc5 SHA1 fe230a1359b696cff752cf2acf5649ec9f762004 SHA256 c862c2559e260c09def23ea2c08ca10597363005ef234e7b3a8759b3d84e2de3 +MISC ChangeLog 1442 RMD160 8f114806310239049d40cb3578dea2a0b0c56ad5 SHA1 fb3cf250e6dda6fe74f839843312b41ec8256fe6 SHA256 0bd715721224368c4a363d402b8c4e9b808b6a5b879aebb0f328cbb489fa1485 MISC metadata.xml 723 RMD160 db0d2917268fd37e631f878b1f03b3d388a4b3f3 SHA1 fe4aaa16e9cb916611384197b4da25309cea3271 SHA256 91d773a1787cd749f0c98ce6bf088bf28e4dab3143d704afb5a7f3114f609c96 diff --git a/dev-lang/path64/path64-9999.ebuild b/dev-lang/path64/path64-9999.ebuild index 609f7b375..abc7df66a 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 } |