diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2010-06-04 07:42:52 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2010-06-04 07:42:52 +0000 |
| commit | c419596198654a5fa7f577e57628f9f8361cdab4 (patch) | |
| tree | 9f64d71742947a785b020090709e3a877cafc7ba /app-arch | |
| parent | dev-python/python-gudev: New Ebuild for bug 322557 thanks to hwoarang (diff) | |
| download | sunrise-c419596198654a5fa7f577e57628f9f8361cdab4.tar.gz sunrise-c419596198654a5fa7f577e57628f9f8361cdab4.tar.bz2 sunrise-c419596198654a5fa7f577e57628f9f8361cdab4.zip | |
app-arch/zpaq: Use single sed for zpaqmake, use emake to compile executables. Due to the limitations of implicit make rules, zpaq.o needed to be renamed to zpaqstub.o.
svn path=/sunrise/; revision=10641
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/zpaq/ChangeLog | 6 | ||||
| -rw-r--r-- | app-arch/zpaq/Manifest | 6 | ||||
| -rw-r--r-- | app-arch/zpaq/files/zpaqmake.in | 2 | ||||
| -rw-r--r-- | app-arch/zpaq/zpaq-1.10.ebuild | 32 |
4 files changed, 24 insertions, 22 deletions
diff --git a/app-arch/zpaq/ChangeLog b/app-arch/zpaq/ChangeLog index e36a34a41..71036fcd0 100644 --- a/app-arch/zpaq/ChangeLog +++ b/app-arch/zpaq/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 04 Jun 2010; Michał Górny (sedzimir) <gentoo@mgorny.alt.pl> + zpaq-1.10.ebuild, files/zpaqmake.in: + Use single sed for zpaqmake, use emake to compile executables. Due to the + limitations of implicit make rules, zpaq.o needed to be renamed to + zpaqstub.o. + 31 May 2010; Michał Górny (sedzimir) <gentoo@mgorny.alt.pl> zpaq-1.10.ebuild: Declare CXX earlier and do not quote it. diff --git a/app-arch/zpaq/Manifest b/app-arch/zpaq/Manifest index 4528d6e6d..7957dfae4 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 +AUX zpaqmake.in 202 RMD160 5fb95820348933e7357453fa0abf62d083cce790 SHA1 dcc48002af99c71a3583b0b12b3d2d660cc89aa6 SHA256 5f921959f70aa5b6cf9323e2f48db8dd60ef58a4a9a3c7ae562c44e12db906ed DIST zpaq110.zip 94403 RMD160 bc9d5c549cfecdea62f30aaa31ea66a642913e7a SHA1 266a5146fc42ccd2c0631701be4529a2740cd23f SHA256 af2564b2ebc7ecb370cd0ed24e30a92bc8ca4ad256c63174b1a83fade88245e8 -EBUILD zpaq-1.10.ebuild 2579 RMD160 579a9aaac964f5eaf5589ad45d57a2c1e216e5e9 SHA1 2d25187eb741a38becb3a468e8045b24e3bd15fe SHA256 77d99f1b27091c523768f9ec45244c750ff54e2828c8a7e9a9b866d2e710c7d9 -MISC ChangeLog 1273 RMD160 52b4552621e5512f765d4ecee1db21f557449e5c SHA1 c8eac8269543c5bb605595361683d1ac2bb15701 SHA256 163824115761a9d7e00017fe6ba40e21bdc2a7e5bd264ceaeb80c53c0e0abb0b +EBUILD zpaq-1.10.ebuild 2448 RMD160 795fb1c44094258199669813d1fe4a42b40be8aa SHA1 b00dd761c9ae29dcb96b93472d501fde50bbb344 SHA256 1c7146caa6b85c60dcbce915b3e4384134a3a9fe6c4897e5c67a95b69fdbea25 +MISC ChangeLog 1536 RMD160 13f7b1cbf24c193fd7aa5ffb632770e1d7cb7034 SHA1 ba126b078ec6a55e65d32f869346ee12552cf876 SHA256 59eb7a54b8c097a2c71d3538f96bdf0ee7cc3f151e69a73c3e8aec4ba598d362 MISC metadata.xml 364 RMD160 280bb6f86deca2f4946fc3eb976fca5fb091f689 SHA1 740be1b0424db11a2d9d98851c59e4f62c63074f SHA256 0c7290d39d35b8d886fb829488dee664f839823ea71e22d5d4bf1721049fe391 diff --git a/app-arch/zpaq/files/zpaqmake.in b/app-arch/zpaq/files/zpaqmake.in index eb870a297..963405175 100644 --- a/app-arch/zpaq/files/zpaqmake.in +++ b/app-arch/zpaq/files/zpaqmake.in @@ -3,4 +3,4 @@ exec "${CXX:-%CXX%}" ${CXXFLAGS-%CXXFLAGS%} -DNDEBUG -DOPT \ -I/usr/include/zpaq ${LDFLAGS-%LDFLAGS%} "$1".cpp \ - /usr/%LIBDIR%/zpaq/zpaq.o -o "$1".exe + /usr/%LIBDIR%/zpaq/zpaqstub.o -o "$1".exe diff --git a/app-arch/zpaq/zpaq-1.10.ebuild b/app-arch/zpaq/zpaq-1.10.ebuild index 033d9fbaf..d4c0ffce4 100644 --- a/app-arch/zpaq/zpaq-1.10.ebuild +++ b/app-arch/zpaq/zpaq-1.10.ebuild @@ -24,13 +24,7 @@ src_prepare() { # make it FHS-friendly sed -e 's:^pcomp :&/usr/libexec/zpaq/:' -i *.cfg || die - if use optimization; then - sed \ - -e "s:%CXX%:${CXX}:" \ - -e "s:%CXXFLAGS%:${CXXFLAGS}:" \ - -e "s:%LIBDIR%:$(get_libdir):" \ - "${FILESDIR}"/zpaqmake.in > zpaqmake || die - fi + use optimization && printf '#define OPT\n#include "zpaq.cpp"' > zpaqstub.cpp } src_configure() { @@ -40,22 +34,24 @@ 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} \ - striptest.c -o striptest || stripflag= + echo 'int main(void) {return 0;}' > striptest.cpp + emake LDFLAGS+="${stripflag}" striptest \ + || stripflag= - sed -i -e "s:%LDFLAGS%:${LDFLAGS}${stripflag}:" zpaqmake || die + sed \ + -e "s:%CXX%:${CXX}:" \ + -e "s:%CXXFLAGS%:${CXXFLAGS}:" \ + -e "s:%LIBDIR%:$(get_libdir):" \ + -e "s:%LDFLAGS%:${LDFLAGS}${stripflag}:" \ + "${FILESDIR}"/zpaqmake.in > zpaqmake || die fi } src_compile() { - ${CXX} ${CXXFLAGS} -DNDEBUG ${LDFLAGS} zpaq.cpp -o zpaq || die - ${CXX} ${CXXFLAGS} ${LDFLAGS} lzppre.cpp -o lzppre || die + local optstub= + use optimization && optstub=zpaqstub.o - if use optimization; then - # provide precompiled stub - ${CXX} -c ${CXXFLAGS} -DNDEBUG -DOPT zpaq.cpp -o zpaq.o || die - fi + emake CPPFLAGS+=-DNDEBUG zpaq lzppre ${optstub} || die } src_install() { @@ -67,7 +63,7 @@ src_install() { insinto /usr/include/zpaq doins zpaq.h || die insinto /usr/$(get_libdir)/zpaq - doins zpaq.o || die + doins zpaqstub.o || die fi # Preprocessors |