Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting8.git;a=commitdiff;h=bbfa0eb1cde56ceb09ce11760e3cd48888b0fa3c

commit bbfa0eb1cde56ceb09ce11760e3cd48888b0fa3c
Merge: c1ac72c 451d181
Author: Miklos Vajna <[email protected]>
Date:   Mon Oct 1 07:27:57 2012 +0200

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

Conflicts:
source/devel/gcc/FrugalBuild

diff --cc source/devel/gcc/FrugalBuild
index 6057789,19e0634..29cf82c
--- a/source/devel/gcc/FrugalBuild
+++ b/source/devel/gcc/FrugalBuild
@@@ -172,10 -144,8 +172,11 @@@ build(
fi

if [ "$CARCH" == "arm" ]; then
-               Fconfopts="$Fconfopts --enable-softfloat \
+               Fconfopts+=" --enable-softfloat \
+                       --with-float=soft --disable-bootstrap"
+       else
-               Fconfopts="$Fconfopts --enable-bootstrap"
++              Fconfopts+=" --enable-softfloat \
+                       --with-float=soft"
fi

#http://gcc.gnu.org/bugzilla/show_bug.cgi?id=45053
diff --cc source/lib/mpfr/FrugalBuild
index 0541fe3,d5c70c1..6c0346b
--- a/source/lib/mpfr/FrugalBuild
+++ b/source/lib/mpfr/FrugalBuild
@@@ -24,11 -24,19 +24,11 @@@ if [ -n "$patchver" ]; the
source=(${source[@]} $url/patch$i)
done
fi
-sha1sums=('9ba6dfe62dad298f0570daf182db31660f7f016c' \
-          'c9c05e00aee2ff787ca948265aa310fc23dca72d' \
-          '70b4669d2e05b1ca72c24ada0334627616b4e82a' \
-          '1da101f115cff587422b746a3fdcf6943b841d41' \
-          'daed39c3253defef0f8381b1c4a865016c5ae1be' \
-          '02be8f019d66bebf27c8610b66bc40a98780cb7d' \
-          '48f9b2459e3d8aaa15619597dd6c49830a68816d' \
-          '593c9e51265cd3117fd5c5652a43c821f5ec992f' \
-          '00ac40de80c7386b7a4a3089951d7cb0731d9145' \
-          'b3eae36b2191b5a2c3287030d9a5c65cd5af4230' \
-          '3a330a06728e6364034dcefb7e5b7fc3215e6d36')
+sha1sums=('f632d43943ff9f13c184fa13b9a6e8c7f420f4dd' \
+          '36839d1ce4952d96cf403528d5eba72df66c745b' \
+          '83f65bf904d187449879b0ccf04a5dbea8422b3b')
options=('noversrc')
_F_cd_path=$pkgname-$basever
- Fconfopts="$Fconfopts --enable-shared --enable-static"
+ Fconfopts+=" --enable-shared --enable-static"

# optimization OK
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to