From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] mpfr: update to 3.1.4 (bugfix release, released on 6 March 2016) Date: Tue, 29 Mar 2016 15:01:23 +0100 Message-ID: <1459260083.30749.200.camel@ipfire.org> In-Reply-To: <9a4033cbcb861eea7f47c31436d60d86@mail01.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3335201831323927663==" List-Id: --===============3335201831323927663== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This patch won't apply after applying the other one. It is however an update = to the mpfr 3.1.3 release. [root(a)rice-oxley ipfire-2.x]# pwclient git-am -s 302 Applying patch #302 using 'git am -s' Description: mpfr: update to 3.1.4 (bugfix release, released on 6 March 2016) Applying: mpfr: update to 3.1.4 (bugfix release, released on 6 March 2016) error: patch failed: lfs/mpfr:70 error: lfs/mpfr: patch does not apply Patch failed at 0001 mpfr: update to 3.1.4 (bugfix release, released on 6 Mar= ch 2016) The copy of the patch that failed is found in: =C2=A0=C2=A0=C2=A0/build/ipfire-2.x/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". 'git am' failed with exit status 1 -Michael On Wed, 2016-03-23 at 20:41 +0100, Marcel Lorenz wrote: > Hi Michael, >=20 > yes, after submitting the 3.1.3 patch, i seen the mpfr 3.1.4 bugfix=C2=A0 > update > on the Linux from Scratch website. I made a fast build and test with=C2=A0 > 3.1.4 > and submit it to the list to using the newer version in patchwork. >=20 > I have this not written to ... sorry >=20 > Best, > Marcel >=20 >=20 > Am 2016-03-23 12:24, schrieb Michael Tremer: > >=20 > > Hi, > >=20 > > did you submit multiple versions of this patch? > >=20 > > Best, > > -Michael > >=20 > > On Wed, 2016-03-23 at 07:40 +0100, Marcel Lorenz wrote: > > >=20 > > > Hi Michael, > > >=20 > > > have you a error message for me? > > > This is a simple patch. There really can not go much wrong ... > > >=20 > > > Marcel Lorenz > > >=20 > > > Am 2016-03-22 23:07, schrieb Michael Tremer: > > > >=20 > > > >=20 > > > > Hi, > > > >=20 > > > > you should *always* try to build the packages before you commit and= =C2=A0 > > > > send the > > > > patch. > > > >=20 > > > > This one doesn't build because the patch does not apply. If it is=C2= =A0 > > > > removed, the > > > > build will run through. Please resend. > > > >=20 > > > > Best, > > > > -Michael > > > >=20 > > > > On Wed, 2016-03-09 at 13:16 +0100, Marcel Lorenz wrote: > > > > >=20 > > > > >=20 > > > > > My mpfr 3.1.3 patch of this morning is already outdated... > > > > > http://www.mpfr.org/mpfr-3.1.4/ > > > > >=20 > > > > > Signed-off-by: Marcel Lorenz > > > > >=20 > > > > > --- > > > > > =C2=A0config/rootfiles/common/mpfr | 4 ++-- > > > > > =C2=A0lfs/mpfr=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0| = 5 ++--- > > > > > =C2=A02 files changed, 4 insertions(+), 5 deletions(-) > > > > >=20 > > > > > diff --git a/config/rootfiles/common/mpfr=C2=A0 > > > > > b/config/rootfiles/common/mpfr > > > > > index 1e33e05..0153810 100644 > > > > > --- a/config/rootfiles/common/mpfr > > > > > +++ b/config/rootfiles/common/mpfr > > > > > @@ -4,7 +4,7 @@ > > > > > =C2=A0#usr/lib/libmpfr.la > > > > > =C2=A0#usr/lib/libmpfr.so > > > > > =C2=A0usr/lib/libmpfr.so.4 > > > > > -usr/lib/libmpfr.so.4.1.3 > > > > > +usr/lib/libmpfr.so.4.1.4 > > > > > =C2=A0#usr/share/doc/mpfr > > > > > =C2=A0#usr/share/doc/mpfr/AUTHORS > > > > > =C2=A0#usr/share/doc/mpfr/BUGS > > > > > @@ -19,4 +19,4 @@ usr/lib/libmpfr.so.4.1.3 > > > > > =C2=A0#usr/share/doc/mpfr/examples/rndo-add.c > > > > > =C2=A0#usr/share/doc/mpfr/examples/sample.c > > > > > =C2=A0#usr/share/doc/mpfr/examples/version.c > > > > > -#usr/share/info/mpfr.info > > > > > \ No newline at end of file > > > > > +#usr/share/info/mpfr.info > > > > > diff --git a/lfs/mpfr b/lfs/mpfr > > > > > index bdf083b..2ebec12 100644 > > > > > --- a/lfs/mpfr > > > > > +++ b/lfs/mpfr > > > > > @@ -24,7 +24,7 @@ > > > > > =C2=A0 > > > > > =C2=A0include Config > > > > > =C2=A0 > > > > > -VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D 3.1.3 > > > > > +VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D 3.1.4 > > > > > =C2=A0 > > > > > =C2=A0THISAPP=C2=A0=C2=A0=C2=A0=C2=A0=3D mpfr-$(VER) > > > > > =C2=A0DL_FILE=C2=A0=C2=A0=C2=A0=C2=A0=3D $(THISAPP).tar.xz > > > > > @@ -40,7 +40,7 @@ objects =3D $(DL_FILE) > > > > > =C2=A0 > > > > > =C2=A0$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) > > > > > =C2=A0 > > > > > -$(DL_FILE)_MD5 =3D 6969398cd2fbc56a6af570b5273c56a9 > > > > > +$(DL_FILE)_MD5 =3D 064b2c18185038e404a401b830d59be8 > > > > > =C2=A0 > > > > > =C2=A0install : $(TARGET) > > > > > =C2=A0 > > > > > @@ -70,7 +70,6 @@ $(subst %,%_MD5,$(objects)) : > > > > > =C2=A0$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) > > > > > =C2=A0 @$(PREBUILD) > > > > > =C2=A0 @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf > > > > > $(DIR_DL)/$(DL_FILE) > > > > > =C2=A0 cd $(DIR_APP) && $(CONFIGURE_ARGS) ./configure --prefix=3D/u= sr > > > > > \ > > > > > =C2=A0 --enable-thread-safe --disable-nls > > > > > =C2=A0 cd $(DIR_APP) && make $(MAKETUNING) --===============3335201831323927663== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC Q2dBR0JRSlcrb3F6QUFvSkVJQjU4UDl2a0FrSEI1RVFBS2lLNXFPZG9yc1VKZVozUlNMYmFNdUIK MmZ6L2NyRjdhemFYNzdTTUVDeXpPeVlqOEhUNzR1RHNZZHFyMUIrRWJGZm9JRmk2YjNtQUVaZlNx UERnenZ0ZQpPOWkwUUVDV1E5aDJhR0RMUXZURlZCWW41QlV6elJodk1LajFYS0ZIbFJ2c2dhWXdR ODhMRksxNkVNeVFXUHVsCmlhOEZFaVh1MXVYVS90T2gxeTRuR1Z5OHpweXpyTmhFOE5pVG1MTEw5 a2dBem5jaHNsM2lGY0N0VGNhN1BZSnkKOTJUZjZnV3lLUzgxNTY1dTUrVE5SSFFCQ3N6NFZYTVRN c2NzeXVBMWZtc0ZyeTBWZmpRMDFCc1cvK0FWbDlUKwpYVTBLbERDdzNpQmw3NjNaZUFLRmMwNkNY c09mOFlSNjgxWHZjdGcvb0VCQnRoWXhOMGRCMStKdnNLRjBQbnh4Cm9zZmlyUXRFc2tVL2piUnVE amlFOVZFUDlXMlpNLzFnQ016UitWT1BIYmh4ZWtOcHhXaHM4aWNUUkVnTjFjQm8KTkE1YTVlcmRy MnNOeG1wbXZZOVFpdHlYUFV0L2UyenFTYVpxaTZZZW84ZWVVRDVacy83VE9WRC9CelpObFltVwoz KzBhdEpJa3RIOEVuaFJjdVBFakdMc25XSUYxeEIxbEFNUlh6UnlOdi9FQjRDa3hHV0V0T2FXRUZJ YTQrMU53CmY0THg4OHlieTUxTXpMZE5JdW1XNEhLRG80MFJQbEF5L29pQ0U5dXBHOGlKKzdBR0VS NUlUdXgxb1BtMnN4Q00KdDAzaXFPMDgyTjZkcGQxQ2hTQkI2aXhIejdCKzc4YzhuclRvTzlJMDFO YS9qNXVndDE5M3dSdW1MMTBuRWRXTQpYSm00dXQwcUg0RlFjZjZ1SGZQQgo9SWwwVQotLS0tLUVO RCBQR1AgU0lHTkFUVVJFLS0tLS0K --===============3335201831323927663==--