Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=9212e2f9905cbc4f471f9c0622f517e4ec44758e
commit 9212e2f9905cbc4f471f9c0622f517e4ec44758e Merge: 4f9ceb8 62be12e Author: Elentir <[email protected]> Date: Sat Feb 19 23:41:02 2011 +0100 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/base/glibc/FrugalBuild diff --cc source/base/glibc/FrugalBuild index cc5dbbc,653246c..56aafc9 --- a/source/base/glibc/FrugalBuild +++ b/source/base/glibc/FrugalBuild @@@ -13,20 -13,16 +13,17 @@@ makedepends=('binutils>=2.19.1' 'gcc>=4 makedepends=("${makedepends[@]}" 'gd>=2.0.35-2') rodepends=('tzdata') groups=('base' 'chroot-core') -archs=('i686' 'x86_64' 'ppc') +archs=('i686' 'x86_64' 'ppc' 'arm') options=('force') Fup2gnubz2 -source=(http://ftp.gnu.org/pub/gnu/glibc/glibc-$pkgver.tar.bz2 \ +source=(http://ftp.gnu.org/pub/gnu/glibc/glibc-$pkgver.tar.gz \ + http://ftp.gnu.org/pub/gnu/glibc/glibc-ports-$pkgver.tar.gz \ fix-missing-etc-hosts.patch \ gcc45.patch \ - make-3.82-fix.patch \ revert-8f4a5048eea6536ee85c0f2670adbb97d71e427d.patch) - sha1sums=('9e252bad90b7a19256e578acf0f4ab1ff40b9fb9' \ - '626cdf5dffc2f720c1d9facc27ef53faff724265' \ + sha1sums=('14d83dced873a21a3da6a0bfa0926f40d82ef980' \ 'be4a7bea8af743331e2c6704faa24b6cb4e155d5' \ '2283966c4f48bbc9b6ad0ae3bbd64601c057c721' \ - '0a61cf6c88c3ddb53b26310ebafeeebb4ce177e9' \ 'c8d14d0f2e239ba0def978010163e919a45700f7') build() _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
