summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2010-05-31 19:47:30 +0000
committerMichał Górny <mgorny@gentoo.org>2010-05-31 19:47:30 +0000
commit9003c5b9d5d058ccca231848fdf32c03ff799dbe (patch)
treef0f24d9fd642428229264795b8112b62b100daa0 /app-arch/zpaq
parentsys-power/phc-intel: Re-added version 0.3.2.10 for kernels before 2.6.33, sup... (diff)
downloadsunrise-9003c5b9d5d058ccca231848fdf32c03ff799dbe.tar.gz
sunrise-9003c5b9d5d058ccca231848fdf32c03ff799dbe.tar.bz2
sunrise-9003c5b9d5d058ccca231848fdf32c03ff799dbe.zip
app-arch/zpaq: Declare CXX earlier and do not quote it.
svn path=/sunrise/; revision=10627
Diffstat (limited to 'app-arch/zpaq')
-rw-r--r--app-arch/zpaq/ChangeLog4
-rw-r--r--app-arch/zpaq/Manifest4
-rw-r--r--app-arch/zpaq/zpaq-1.10.ebuild13
3 files changed, 12 insertions, 9 deletions
diff --git a/app-arch/zpaq/ChangeLog b/app-arch/zpaq/ChangeLog
index ab6458cb8..e36a34a41 100644
--- a/app-arch/zpaq/ChangeLog
+++ b/app-arch/zpaq/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 31 May 2010; Michał Górny (sedzimir) <gentoo@mgorny.alt.pl>
+ zpaq-1.10.ebuild:
+ Declare CXX earlier and do not quote it.
+
08 Feb 2010; Michał Górny (sedzimir) <gentoo@mgorny.alt.pl>
zpaq-1.10.ebuild, files/zpaqmake.in:
Fix linker arguments order.
diff --git a/app-arch/zpaq/Manifest b/app-arch/zpaq/Manifest
index c9df4f7bb..4528d6e6d 100644
--- a/app-arch/zpaq/Manifest
+++ b/app-arch/zpaq/Manifest
@@ -1,5 +1,5 @@
AUX zpaqmake.in 198 RMD160 2817150428fbe004086d1d3cdae67729aacf4dda SHA1 37259c654b4ce99e1f42a563695b5cf54a06ff57 SHA256 9a34cdf67fcb1bda6ee6dcde7d094fc927a74f5a1afe9968b91c871037b5b0ed
DIST zpaq110.zip 94403 RMD160 bc9d5c549cfecdea62f30aaa31ea66a642913e7a SHA1 266a5146fc42ccd2c0631701be4529a2740cd23f SHA256 af2564b2ebc7ecb370cd0ed24e30a92bc8ca4ad256c63174b1a83fade88245e8
-EBUILD zpaq-1.10.ebuild 2594 RMD160 3fba312275b318f19ae8b6b30bc3b2e3b908523f SHA1 6f2e823c1d89fdae868b3b9417a7681cf6fd8503 SHA256 8311c694e4e14fe1f962abee1ad59f1cb76b49bc67e3e9d5654d551014db7767
-MISC ChangeLog 1145 RMD160 59b45cebbbe639b45383a45260e202e1e2677608 SHA1 96cf34b0fbd225f664abd58c283595a5605bd66d SHA256 3f1c8bdc7dd6c74c4169cdd9415bae504652abfb450211e4e7722e67fed4ca11
+EBUILD zpaq-1.10.ebuild 2579 RMD160 579a9aaac964f5eaf5589ad45d57a2c1e216e5e9 SHA1 2d25187eb741a38becb3a468e8045b24e3bd15fe SHA256 77d99f1b27091c523768f9ec45244c750ff54e2828c8a7e9a9b866d2e710c7d9
+MISC ChangeLog 1273 RMD160 52b4552621e5512f765d4ecee1db21f557449e5c SHA1 c8eac8269543c5bb605595361683d1ac2bb15701 SHA256 163824115761a9d7e00017fe6ba40e21bdc2a7e5bd264ceaeb80c53c0e0abb0b
MISC metadata.xml 364 RMD160 280bb6f86deca2f4946fc3eb976fca5fb091f689 SHA1 740be1b0424db11a2d9d98851c59e4f62c63074f SHA256 0c7290d39d35b8d886fb829488dee664f839823ea71e22d5d4bf1721049fe391
diff --git a/app-arch/zpaq/zpaq-1.10.ebuild b/app-arch/zpaq/zpaq-1.10.ebuild
index fe752facf..033d9fbaf 100644
--- a/app-arch/zpaq/zpaq-1.10.ebuild
+++ b/app-arch/zpaq/zpaq-1.10.ebuild
@@ -20,12 +20,13 @@ DEPEND="app-arch/unzip"
RDEPEND=""
src_prepare() {
+ tc-export CXX
# make it FHS-friendly
sed -e 's:^pcomp :&/usr/libexec/zpaq/:' -i *.cfg || die
if use optimization; then
sed \
- -e "s:%CXX%:$(tc-getCXX):" \
+ -e "s:%CXX%:${CXX}:" \
-e "s:%CXXFLAGS%:${CXXFLAGS}:" \
-e "s:%LIBDIR%:$(get_libdir):" \
"${FILESDIR}"/zpaqmake.in > zpaqmake || die
@@ -33,8 +34,6 @@ src_prepare() {
}
src_configure() {
- tc-export CXX
-
if use optimization; then
# NOTE: zpaqmake is used in runtime by zpaq to compile profiles
# please do not complain about stripping, it's not for build time
@@ -42,7 +41,7 @@ src_configure() {
local stripflag=' -Wl,--strip-all'
# check whether the default compiler supports -Wl,--strip-all
echo 'int main(void) {return 0;}' > striptest.c
- "${CXX}" ${CXXFLAGS} ${LDFLAGS} ${stripflag} \
+ ${CXX} ${CXXFLAGS} ${LDFLAGS} ${stripflag} \
striptest.c -o striptest || stripflag=
sed -i -e "s:%LDFLAGS%:${LDFLAGS}${stripflag}:" zpaqmake || die
@@ -50,12 +49,12 @@ src_configure() {
}
src_compile() {
- "${CXX}" ${CXXFLAGS} -DNDEBUG ${LDFLAGS} zpaq.cpp -o zpaq || die
- "${CXX}" ${CXXFLAGS} ${LDFLAGS} lzppre.cpp -o lzppre || die
+ ${CXX} ${CXXFLAGS} -DNDEBUG ${LDFLAGS} zpaq.cpp -o zpaq || die
+ ${CXX} ${CXXFLAGS} ${LDFLAGS} lzppre.cpp -o lzppre || die
if use optimization; then
# provide precompiled stub
- "${CXX}" -c ${CXXFLAGS} -DNDEBUG -DOPT zpaq.cpp -o zpaq.o || die
+ ${CXX} -c ${CXXFLAGS} -DNDEBUG -DOPT zpaq.cpp -o zpaq.o || die
fi
}