From a1d55fca65eb829cb5fe609640850376da1e53ee Mon Sep 17 00:00:00 2001 From: Marcel Lorenz Date: Thu, 17 Mar 2016 15:12:29 +0100 Subject: [PATCH] nettle: update to 3.2 Signed-off-by: Marcel Lorenz Signed-off-by: Michael Tremer --- config/rootfiles/common/nettle | 6 +++--- lfs/nettle | 14 ++++---------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/config/rootfiles/common/nettle b/config/rootfiles/common/nettle index 7845a34bc4..5d5777b18a 100644 --- a/config/rootfiles/common/nettle +++ b/config/rootfiles/common/nettle @@ -63,11 +63,11 @@ #usr/include/nettle/yarrow.h usr/lib/libhogweed.so usr/lib/libhogweed.so.4 -usr/lib/libhogweed.so.4.1 +usr/lib/libhogweed.so.4.2 #usr/lib/libnettle.so usr/lib/libnettle.so.6 -usr/lib/libnettle.so.6.1 +usr/lib/libnettle.so.6.2 #usr/lib/pkgconfig/hogweed.pc #usr/lib/pkgconfig/nettle.pc -#usr/share/doc/nettle-3.1.1 +usr/share/doc/nettle-3.2 #usr/share/info/nettle.info diff --git a/lfs/nettle b/lfs/nettle index b48b405e37..d0a3e5a2b6 100644 --- a/lfs/nettle +++ b/lfs/nettle @@ -24,7 +24,7 @@ include Config -VER = 3.1.1 +VER = 3.2 THISAPP = nettle-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b40fa88dc32f37a182b6b42092ebb144 +$(DL_FILE)_MD5 = afb15b4764ebf1b4e6d06c62bd4d29e4 install : $(TARGET) @@ -70,16 +70,10 @@ $(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 \ - --prefix=/usr \ - --enable-shared - + cd $(DIR_APP) && ./configure --prefix=/usr --disable-static cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && sed -i '/^install-here/ s/ install-static//' Makefile cd $(DIR_APP) && make install - chmod -v 755 /usr/lib/lib{hogweed,nettle}.so - install -v -m755 -d /usr/share/doc/nettle-3.1.1 - + install -v -m755 -d /usr/share/doc/nettle-3.2 @rm -rf $(DIR_APP) @$(POSTBUILD) -- 2.39.2