Signed-off-by: Marcel Lorenz marcel.lorenz@ipfire.org --- lfs/readline | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/lfs/readline b/lfs/readline index 5f88228..dcacb6d 100644 --- a/lfs/readline +++ b/lfs/readline @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2016 IPFire Team info@ipfire.org # +# Copyright (C) 2017 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -31,8 +31,6 @@ DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = readline -PAK_VER = 1
############################################################################### # Top-level Rules @@ -76,9 +74,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- #for i in $$(seq 1 6); do \ - # cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/readline/readline63-$$(printf "%03d" "$${i}") || exit 1; \ - #done + for i in $$(seq 1 3); do \ + cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/readline/readline70-$$(printf "%03d" "$${i}") || exit 1; \ + done
# prevent in some cases to trigger a linking bug in ldconfig cd $(DIR_APP) &&sed -i '/MV.*old/d' Makefile.in
If things like this happen, please re-send the entire patch and not a fix to the patch.
Again, this makes it hard to track changes.
-Michael
On Tue, 2017-06-06 at 10:41 +0200, Marcel Lorenz wrote:
Signed-off-by: Marcel Lorenz marcel.lorenz@ipfire.org
lfs/readline | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/lfs/readline b/lfs/readline index 5f88228..dcacb6d 100644 --- a/lfs/readline +++ b/lfs/readline @@ -1,7 +1,7 @@ ############################################################################# ## # # # IPFire.org - A linux based firewall # -# Copyright (C) 2016 IPFire Team info@ipfire.org # +# Copyright (C) 2017 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -31,8 +31,6 @@ DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = readline -PAK_VER = 1 ############################################################################# ## # Top-level Rules @@ -76,9 +74,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- #for i in $$(seq 1 6); do \
- # cd $(DIR_APP) && patch -Np0 <
$(DIR_SRC)/src/patches/readline/readline63-$$(printf "%03d" "$${i}") || exit 1; \
- #done
- for i in $$(seq 1 3); do \
cd $(DIR_APP) && patch -Np0 <
$(DIR_SRC)/src/patches/readline/readline70-$$(printf "%03d" "$${i}") || exit 1; \
- done
# prevent in some cases to trigger a linking bug in ldconfig cd $(DIR_APP) &&sed -i '/MV.*old/d' Makefile.in