]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
nettle: update to 3.2
authorMarcel Lorenz <marcel.lorenz@ipfire.org>
Thu, 17 Mar 2016 14:12:29 +0000 (15:12 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 21 Mar 2016 21:30:07 +0000 (21:30 +0000)
Signed-off-by: Marcel Lorenz <marcel.lorenz@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
config/rootfiles/common/nettle
lfs/nettle

index 7845a34bc4e547ff33d5a29dbfe7502933361fea..5d5777b18a282356d232633de14e9082e12d5ce9 100644 (file)
 #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
index b48b405e37962c342f99f70b17ea7c432edf6bf5..d0a3e5a2b6b64ec6c75e525287093975b9baefc2 100644 (file)
@@ -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)