diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2009-12-07 23:01:46 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-12-07 23:01:46 +0000 |
| commit | 8fac0bbbb2036d3b999f6222240e9e764921f52b (patch) | |
| tree | 02f52edce20710e16c09b9d28f3e3f76ef51319e /sys-fs/squashfs-tools | |
| parent | use simpler S= (diff) | |
| download | historical-8fac0bbbb2036d3b999f6222240e9e764921f52b.tar.gz historical-8fac0bbbb2036d3b999f6222240e9e764921f52b.tar.bz2 historical-8fac0bbbb2036d3b999f6222240e9e764921f52b.zip | |
Fix building on non-glibc systems #276951 by Ed Wildgoose.
Package-Manager: portage-2.2_rc55/cvs/Linux x86_64
Diffstat (limited to 'sys-fs/squashfs-tools')
| -rw-r--r-- | sys-fs/squashfs-tools/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-fs/squashfs-tools/Manifest | 14 | ||||
| -rw-r--r-- | sys-fs/squashfs-tools/squashfs-tools-4.0.ebuild | 7 |
3 files changed, 15 insertions, 11 deletions
diff --git a/sys-fs/squashfs-tools/ChangeLog b/sys-fs/squashfs-tools/ChangeLog index 37c72b1c5494..c1e1f4130789 100644 --- a/sys-fs/squashfs-tools/ChangeLog +++ b/sys-fs/squashfs-tools/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-fs/squashfs-tools # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.67 2009/12/07 22:57:21 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.68 2009/12/07 23:01:46 vapier Exp $ + + 07 Dec 2009; Mike Frysinger <vapier@gentoo.org> squashfs-tools-4.0.ebuild: + Fix building on non-glibc systems #276951 by Ed Wildgoose. 07 Dec 2009; Mike Frysinger <vapier@gentoo.org> -squashfs-tools-3.1_p2.ebuild, squashfs-tools-3.2_p2.ebuild, diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest index 4927f1b27d88..8ad1b12f8e16 100644 --- a/sys-fs/squashfs-tools/Manifest +++ b/sys-fs/squashfs-tools/Manifest @@ -5,15 +5,15 @@ AUX squashfs-tools-3.3-posix.patch 1596 RMD160 46ea11e6aa28e8c2bc1e2c1835a8af954 DIST squashfs3.2-r2.tar.gz 314764 RMD160 6f21ad0ee90e4b5c6ad2b0b92c96d24af8e19531 SHA1 e38c16c09435291b2c97aa0a321c29da442ff686 SHA256 8482465d58d78099c608b32fc034921f7c8c3cf7934b5edc68c463cd450b40a7 DIST squashfs3.4.tar.gz 352660 RMD160 e75c9a9e5220e80a8e321536f8fe8372bfe5d830 SHA1 6933a8f3098d94f93ec4002a54026b15a6e11640 SHA256 9ea1a9b3bd4f387ca11b5e96f00f8ae996fb81c4c7ad41f7c7f359917628a339 DIST squashfs4.0.tar.gz 103979 RMD160 b67dd14ff7255d245617466566ac29d9a08aff68 SHA1 3efe764ac27c507ee4a549fc6507bc86ea0660dd SHA256 18948edbe06bac2c4307eea99bfb962643e4b82e5b7edd541b4d743748e12e21 -EBUILD squashfs-tools-3.2_p2.ebuild 1098 RMD160 e661130575da33823c6d341adfac867c30644992 SHA1 044aca507fad4a041dbe63feef3250a4dc1e2073 SHA256 f00c94ead35a2b2f110c80b8abc346ed18a61d25de50365679b5eeb43a61c76b -EBUILD squashfs-tools-3.4.ebuild 1098 RMD160 29b1a8808edfee84ca076752db6af13fb3f7410d SHA1 660d4427c3a769e45c04e00b3b8df7a21418c747 SHA256 9c36f938b9308ff42f42b347f823620cdfa248c7315885cfadf2ee81e31c93cc -EBUILD squashfs-tools-4.0.ebuild 1051 RMD160 ddb5cde2c25a5c401f0f8a7b42da9cb86ce0192e SHA1 9b90b145bfe6fb00e3d8d6b4b7dcef81ceb3ef9e SHA256 7ebd1f512fb912d5bb2370e5df5aceb803a47a4a4e052fc63eb26ac8798e2dbb -MISC ChangeLog 10951 RMD160 dc1f37a1abff41dbb040c69f11c6ef1825cc01e4 SHA1 f9da79c065e33b780f1caee96075036a176c6e49 SHA256 b66c8c5ebafa487d62f7c5684a3603b34f53294d7397c2642643042df9c8e07c +EBUILD squashfs-tools-3.2_p2.ebuild 1095 RMD160 183da75ffb969db6643876ac210b3da24fcd5862 SHA1 c7b8541bc6ee289483e15a0e2c3c19124286311f SHA256 d15c128da2c5cdc64a4376e468cf5f04289c7d9408b4c04fbb9a434d2e865bcb +EBUILD squashfs-tools-3.4.ebuild 1095 RMD160 e08fe76143ca1af554806eb8eb3cd3f55021b651 SHA1 34b3e4eebf02b912f4dc7fa894239093037e2603 SHA256 5b66ce00377cd0d4e0cd1628de4cc9e1340e80685d41d6f36166e1f258cb3237 +EBUILD squashfs-tools-4.0.ebuild 1089 RMD160 a80aba63e0cd09dc748ddcfa5211e3051f643397 SHA1 a3fa0234c2d8cc463ff6b49bcdf3607ffab0339b SHA256 8dbc239955176e66eac70075d0e581c0407bfea5b6ed2b4fe0c7e6a81ec78faf +MISC ChangeLog 11090 RMD160 09da6c72b9c310e3a9da72ea91b16043a80da09b SHA1 957c44b767524c9f0397cb065373013d1dbdad4a SHA256 251fbf643cc0c2a53ffbbca8ac8fc3676dd161fd89d6ba1dcdb8737b84082868 MISC metadata.xml 159 RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 SHA1 1e72098aafb1fa729eba6fc8357c7e732eb79dee SHA256 b6e17484225400d76c65d178bf5a10dc0a8da7f345993c2acc63d1093a77c90d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.13 (GNU/Linux) -iEYEARECAAYFAksdiF0ACgkQlPl3HsVfCDqCxQCeJCl9qJ3itgwvC5yyCooyMwvX -WoIAnjOaSCRP2E+r30fIonzsUO0uaqiv -=YAgF +iEYEARECAAYFAksdiWYACgkQlPl3HsVfCDoNlQCfUZ71yzRVJEcKAwqjjFuxMO1h +9RIAn2DaxGMkTBfOqNRSxgx/EEAyHOzY +=NG+O -----END PGP SIGNATURE----- diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.0.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.0.ebuild index 2507c3501880..910fea85d702 100644 --- a/sys-fs/squashfs-tools/squashfs-tools-4.0.ebuild +++ b/sys-fs/squashfs-tools/squashfs-tools-4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-4.0.ebuild,v 1.7 2009/07/18 20:18:30 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-4.0.ebuild,v 1.8 2009/12/07 23:01:46 vapier Exp $ inherit toolchain-funcs @@ -23,12 +23,13 @@ src_unpack() { cd "${S}" sed -i \ -e 's:-O2:$(CFLAGS):' \ - -e 's:$(CC):$(CC) $(LDFLAGS):' \ + -e '/-lz/s:$: $(LDFLAGS):' \ Makefile || die "sed failed" + sed -i -e 's:get_nprocs():sysconf(_SC_NPROCESSORS_ONLN):' *.c } src_compile() { - emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" || die + emake CC="$(tc-getCC)" || die } src_install() { |