diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2010-02-08 22:15:32 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2010-02-08 22:15:32 +0000 |
| commit | 4fbb879f4b3252be55f9397e22247c7f49a88135 (patch) | |
| tree | b5d60915d2ac5127540d2fc9d0f98c7c0cfe97fa /app-arch | |
| parent | dev-util/tla: Fixed Thirdpartymirror (diff) | |
| download | sunrise-4fbb879f4b3252be55f9397e22247c7f49a88135.tar.gz sunrise-4fbb879f4b3252be55f9397e22247c7f49a88135.tar.bz2 sunrise-4fbb879f4b3252be55f9397e22247c7f49a88135.zip | |
app-arch/zpaq: Fix linker arguments order.
svn path=/sunrise/; revision=10009
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/zpaq/ChangeLog | 4 | ||||
| -rw-r--r-- | app-arch/zpaq/Manifest | 6 | ||||
| -rw-r--r-- | app-arch/zpaq/files/zpaqmake.in | 4 | ||||
| -rw-r--r-- | app-arch/zpaq/zpaq-1.10.ebuild | 8 |
4 files changed, 13 insertions, 9 deletions
diff --git a/app-arch/zpaq/ChangeLog b/app-arch/zpaq/ChangeLog index e1d4a226d..ab6458cb8 100644 --- a/app-arch/zpaq/ChangeLog +++ b/app-arch/zpaq/ChangeLog @@ -3,6 +3,10 @@ # $Header: $ 08 Feb 2010; Michał Górny (sedzimir) <gentoo@mgorny.alt.pl> + zpaq-1.10.ebuild, files/zpaqmake.in: + Fix linker arguments order. + + 08 Feb 2010; Michał Górny (sedzimir) <gentoo@mgorny.alt.pl> -zpaq-1.09.ebuild, +zpaq-1.10.ebuild, +files/zpaqmake.in, metadata.xml: Version bump. Support for ZPAQ's self-optimization. diff --git a/app-arch/zpaq/Manifest b/app-arch/zpaq/Manifest index 256e13d59..ff6c06876 100644 --- a/app-arch/zpaq/Manifest +++ b/app-arch/zpaq/Manifest @@ -1,5 +1,5 @@ -AUX zpaqmake.in 198 RMD160 cbc092ba9badb34ab5f37d9492126bfafecc9174 SHA1 59b1208001bea49b2ce578b4767855e02aee78ad SHA256 d548855b7d357a0659f6272e759d291d0afca7816495ac31e2be53836b9826a3 +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 4b682d56400dd72e41e7c50435a2e29d57d4a856 SHA1 3e16fbea968f1492bdfb659b6a301685e58a0131 SHA256 d7ba4336bfcb3fb56d3778923f1fcb2e7d9c2f7758c17c523133a1b34da502fa -MISC ChangeLog 1011 RMD160 049f08047d75d6ae86a7841646d3f0aae9c68bf7 SHA1 6bf54f9ca6d37ae4fde84bcefc1ecb3cb88def2b SHA256 2bb699d3b942321d11de5e81b743f730269a6d51586eb3d72eead5549d7460e5 +EBUILD zpaq-1.10.ebuild 2594 RMD160 3fba312275b318f19ae8b6b30bc3b2e3b908523f SHA1 6f2e823c1d89fdae868b3b9417a7681cf6fd8503 SHA256 8311c694e4e14fe1f962abee1ad59f1cb76b49bc67e3e9d5654d551014db7767 +MISC ChangeLog 1145 RMD160 59b45cebbbe639b45383a45260e202e1e2677608 SHA1 96cf34b0fbd225f664abd58c283595a5605bd66d SHA256 3f1c8bdc7dd6c74c4169cdd9415bae504652abfb450211e4e7722e67fed4ca11 MISC metadata.xml 304 RMD160 739c9d04e648fdd762da968fce83dba7da1b8a71 SHA1 6f1bc945c848487545a5c0b3ce46a3b69ca877ef SHA256 7aef31d94c7145199f824eefcaf2e5c2d5a437d7fffe63f49c38a1dda5b7b2ec diff --git a/app-arch/zpaq/files/zpaqmake.in b/app-arch/zpaq/files/zpaqmake.in index 9740bcc30..eb870a297 100644 --- a/app-arch/zpaq/files/zpaqmake.in +++ b/app-arch/zpaq/files/zpaqmake.in @@ -2,5 +2,5 @@ # based on zpaqmake.bat from zpaq exec "${CXX:-%CXX%}" ${CXXFLAGS-%CXXFLAGS%} -DNDEBUG -DOPT \ - "$1".cpp -I/usr/include/zpaq /usr/%LIBDIR%/zpaq/zpaq.o \ - -o "$1".exe ${LDFLAGS-%LDFLAGS%} + -I/usr/include/zpaq ${LDFLAGS-%LDFLAGS%} "$1".cpp \ + /usr/%LIBDIR%/zpaq/zpaq.o -o "$1".exe diff --git a/app-arch/zpaq/zpaq-1.10.ebuild b/app-arch/zpaq/zpaq-1.10.ebuild index 90d501b2f..fe752facf 100644 --- a/app-arch/zpaq/zpaq-1.10.ebuild +++ b/app-arch/zpaq/zpaq-1.10.ebuild @@ -42,16 +42,16 @@ 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} striptest.c -o striptest \ - ${LDFLAGS} ${stripflag} || stripflag= + "${CXX}" ${CXXFLAGS} ${LDFLAGS} ${stripflag} \ + striptest.c -o striptest || stripflag= sed -i -e "s:%LDFLAGS%:${LDFLAGS}${stripflag}:" zpaqmake || die fi } src_compile() { - "${CXX}" ${CXXFLAGS} -DNDEBUG zpaq.cpp -o zpaq ${LDFLAGS} || die - "${CXX}" ${CXXFLAGS} lzppre.cpp -o lzppre ${LDFLAGS} || 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 |