This patch won't apply after applying the other one. It is however an update to the mpfr 3.1.3 release.
[root@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 March 2016) The copy of the patch that failed is found in: /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,
yes, after submitting the 3.1.3 patch, i seen the mpfr 3.1.4 bugfix update on the Linux from Scratch website. I made a fast build and test with 3.1.4 and submit it to the list to using the newer version in patchwork.
I have this not written to ... sorry
Best, Marcel
Am 2016-03-23 12:24, schrieb Michael Tremer:
Hi,
did you submit multiple versions of this patch?
Best, -Michael
On Wed, 2016-03-23 at 07:40 +0100, Marcel Lorenz wrote:
Hi Michael,
have you a error message for me? This is a simple patch. There really can not go much wrong ...
Marcel Lorenz
Am 2016-03-22 23:07, schrieb Michael Tremer:
Hi,
you should *always* try to build the packages before you commit and send the patch.
This one doesn't build because the patch does not apply. If it is removed, the build will run through. Please resend.
Best, -Michael
On Wed, 2016-03-09 at 13:16 +0100, Marcel Lorenz wrote:
My mpfr 3.1.3 patch of this morning is already outdated... http://www.mpfr.org/mpfr-3.1.4/
Signed-off-by: Marcel Lorenz marcel.lorenz@ipfire.org
config/rootfiles/common/mpfr | 4 ++-- lfs/mpfr | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/config/rootfiles/common/mpfr b/config/rootfiles/common/mpfr index 1e33e05..0153810 100644 --- a/config/rootfiles/common/mpfr +++ b/config/rootfiles/common/mpfr @@ -4,7 +4,7 @@ #usr/lib/libmpfr.la #usr/lib/libmpfr.so usr/lib/libmpfr.so.4 -usr/lib/libmpfr.so.4.1.3 +usr/lib/libmpfr.so.4.1.4 #usr/share/doc/mpfr #usr/share/doc/mpfr/AUTHORS #usr/share/doc/mpfr/BUGS @@ -19,4 +19,4 @@ usr/lib/libmpfr.so.4.1.3 #usr/share/doc/mpfr/examples/rndo-add.c #usr/share/doc/mpfr/examples/sample.c #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 @@ include Config -VER = 3.1.3 +VER = 3.1.4 THISAPP = mpfr-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 6969398cd2fbc56a6af570b5273c56a9 +$(DL_FILE)_MD5 = 064b2c18185038e404a401b830d59be8 install : $(TARGET) @@ -70,7 +70,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && $(CONFIGURE_ARGS) ./configure --prefix=/usr \ --enable-thread-safe --disable-nls cd $(DIR_APP) && make $(MAKETUNING)