Python 2.7.11 need this update, no dbm.so build with current The lfs file is prepared for tools build. Thie need for later perl 5.22.1 update. --- config/rootfiles/common/gdbm | 20 ++++++++++++-------- lfs/gdbm | 22 +++++++++++++++++----- 2 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/config/rootfiles/common/gdbm b/config/rootfiles/common/gdbm index 90bc8e8..0768e62 100644 --- a/config/rootfiles/common/gdbm +++ b/config/rootfiles/common/gdbm @@ -1,15 +1,19 @@ +#usr/bin/gdbm_dump +#usr/bin/gdbm_load +#usr/bin/gdbmtool #usr/include/dbm.h #usr/include/gdbm.h #usr/include/ndbm.h -#usr/info/gdbm.info -#usr/lib/libgdbm.a #usr/lib/libgdbm.la usr/lib/libgdbm.so -usr/lib/libgdbm.so.3 -usr/lib/libgdbm.so.3.0.0 -#usr/lib/libgdbm_compat.a +usr/lib/libgdbm.so.4 +usr/lib/libgdbm.so.4.0.0 #usr/lib/libgdbm_compat.la usr/lib/libgdbm_compat.so -usr/lib/libgdbm_compat.so.3 -usr/lib/libgdbm_compat.so.3.0.0 -#usr/man/man3/gdbm.3 +usr/lib/libgdbm_compat.so.4 +usr/lib/libgdbm_compat.so.4.0.0 +#usr/share/info/gdbm.info +#usr/share/man/man1/gdbm_dump.1 +#usr/share/man/man1/gdbm_load.1 +#usr/share/man/man1/gdbmtool.1 +#usr/share/man/man3/gdbm.3 \ No newline at end of file diff --git a/lfs/gdbm b/lfs/gdbm index 4db986c..1051975 100644 --- a/lfs/gdbm +++ b/lfs/gdbm @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2015 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 # @@ -24,7 +24,7 @@
include Config
-VER = 1.8.3 +VER = 1.11
THISAPP = gdbm-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,6 +32,16 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)
+# Normal build or /tools build. +# +ifeq "$(ROOT)" "" + PREFIX = /usr + TARGET = $(DIR_INFO)/$(THISAPP) +else + PREFIX = /tools + TARGET = $(DIR_INFO)/$(THISAPP)-tools +endif + ############################################################################### # Top-level Rules ############################################################################### @@ -40,7 +50,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 1d1b1d5c0245b1c00aff92da751e9aa1 +$(DL_FILE)_MD5 = 72c832680cf0999caedbe5b265c8c1bd
install : $(TARGET)
@@ -50,6 +60,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
+dist: + @$(PAK) + ############################################################################### # Downloading, checking, md5sum ############################################################################### @@ -70,9 +83,8 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls + cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --disable-nls --disable-static --enable-libgdbm-compat cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make BINOWN=root BINGRP=root install - cd $(DIR_APP) && make BINOWN=root BINGRP=root install-compat @rm -rf $(DIR_APP) @$(POSTBUILD)
Hello,
I have stated this before in a previous email that this makes no sense to post that many patches which all contain the same errors.
I appreciate that you are working on this, but it does not make any sense just to throw stuff on this list and not read the feedback.
Please go back to the previous email and look at that, fix the problems with the first patch and then we can move on to the next one, please.
Best, -Michael
On Thu, 2016-02-18 at 07:40 +0100, Marcel Lorenz wrote:
Python 2.7.11 need this update, no dbm.so build with current The lfs file is prepared for tools build. Thie need for later perl 5.22.1 update.
config/rootfiles/common/gdbm | 20 ++++++++++++-------- lfs/gdbm | 22 +++++++++++++++++----- 2 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/config/rootfiles/common/gdbm b/config/rootfiles/common/gdbm index 90bc8e8..0768e62 100644 --- a/config/rootfiles/common/gdbm +++ b/config/rootfiles/common/gdbm @@ -1,15 +1,19 @@ +#usr/bin/gdbm_dump +#usr/bin/gdbm_load +#usr/bin/gdbmtool #usr/include/dbm.h #usr/include/gdbm.h #usr/include/ndbm.h -#usr/info/gdbm.info -#usr/lib/libgdbm.a #usr/lib/libgdbm.la usr/lib/libgdbm.so -usr/lib/libgdbm.so.3 -usr/lib/libgdbm.so.3.0.0 -#usr/lib/libgdbm_compat.a +usr/lib/libgdbm.so.4 +usr/lib/libgdbm.so.4.0.0 #usr/lib/libgdbm_compat.la usr/lib/libgdbm_compat.so -usr/lib/libgdbm_compat.so.3 -usr/lib/libgdbm_compat.so.3.0.0 -#usr/man/man3/gdbm.3 +usr/lib/libgdbm_compat.so.4 +usr/lib/libgdbm_compat.so.4.0.0 +#usr/share/info/gdbm.info +#usr/share/man/man1/gdbm_dump.1 +#usr/share/man/man1/gdbm_load.1 +#usr/share/man/man1/gdbmtool.1 +#usr/share/man/man3/gdbm.3 \ No newline at end of file diff --git a/lfs/gdbm b/lfs/gdbm index 4db986c..1051975 100644 --- a/lfs/gdbm +++ b/lfs/gdbm @@ -1,7 +1,7 @@ #################################################################### ########### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2015 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 # @@ -24,7 +24,7 @@ include Config -VER = 1.8.3 +VER = 1.11 THISAPP = gdbm-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,6 +32,16 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) +# Normal build or /tools build. +# +ifeq "$(ROOT)" ""
- PREFIX = /usr
- TARGET = $(DIR_INFO)/$(THISAPP)
+else
- PREFIX = /tools
- TARGET = $(DIR_INFO)/$(THISAPP)-tools
+endif
#################################################################### ########### # Top-level Rules #################################################################### ########### @@ -40,7 +50,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 1d1b1d5c0245b1c00aff92da751e9aa1 +$(DL_FILE)_MD5 = 72c832680cf0999caedbe5b265c8c1bd install : $(TARGET) @@ -50,6 +60,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) +dist:
- @$(PAK)
#################################################################### ########### # Downloading, checking, md5sum #################################################################### ########### @@ -70,9 +83,8 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
- cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --disable-
nls --disable-static --enable-libgdbm-compat cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make BINOWN=root BINGRP=root install
- cd $(DIR_APP) && make BINOWN=root BINGRP=root install-compat
@rm -rf $(DIR_APP) @$(POSTBUILD)