Mercurial > mxe-octave

changeset 3261:a55be3b0022f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update to new version of nettle
author John W. Eaton <jwe@octave.org>
date Wed, 16 Oct 2013 18:50:52 -0400
parents 16321a166cc4
children fa1867a474e4
files index.html src/nettle-1-fixes.patch src/nettle.mk
diffstat 3 files changed, 89 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/index.html	Sat Oct 12 16:45:31 2013 +0200
+++ b/index.html	Wed Oct 16 18:50:52 2013 -0400
@@ -1898,7 +1898,7 @@
     </tr>
     <tr>
         <td id="nettle-package">nettle</td>
-        <td id="nettle-version">2.5</td>
+        <td id="nettle-version">2.7</td>
         <td id="nettle-website"><a href="http://www.lysator.liu.se/~nisse/nettle/">nettle</a></td>
     </tr>
     <tr>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/nettle-1-fixes.patch	Wed Oct 16 18:50:52 2013 -0400
@@ -0,0 +1,87 @@
+diff -ur a/examples/Makefile.in b/examples/Makefile.in
+--- a/examples/Makefile.in	2013-04-24 09:26:53.000000000 -0400
++++ b/examples/Makefile.in	2013-10-16 18:30:20.579120010 -0400
+@@ -117,8 +117,8 @@
+ 	-lhogweed -lnettle $(BENCH_LIBS) $(LIBS) $(OPENSSL_LIBFLAGS) \
+ 	-o hogweed-benchmark$(EXEEXT)
+ 
+-$(TARGETS) : io.$(OBJEXT) ../libnettle.a
+-$(HOGWEED_TARGETS): ../libhogweed.a
++$(TARGETS) : io.$(OBJEXT) ../libnettle.stamp
++$(HOGWEED_TARGETS): ../libhogweed.stamp
+ 
+ check: $(TS_ALL)
+ 	LD_LIBRARY_PATH=../.lib PATH="../.lib:$$PATH" srcdir="$(srcdir)" \
+diff -ur a/Makefile.in b/Makefile.in
+--- a/Makefile.in	2013-04-24 09:26:53.000000000 -0400
++++ b/Makefile.in	2013-10-16 18:48:59.141790433 -0400
+@@ -22,8 +22,19 @@
+ 
+ PRE_CPPFLAGS = -I.
+ # FIXME: Add configuration of LIBEXT?
+-LIBTARGETS = @IF_STATIC@ libnettle.a @IF_HOGWEED@ libhogweed.a
+-SHLIBTARGETS = @IF_SHARED@ $(LIBNETTLE_FORLINK) @IF_HOGWEED@ $(LIBHOGWEED_FORLINK)
++LIBTARGETS = libnettle.stamp libhogweed.stamp
++
++LIBNETTLE_STATIC = @IF_STATIC@ libnettle.a
++LIBNETTLE_SHARED = @IF_SHARED@ $(LIBNETTLE_FORLINK)
++
++LIBHOGWEED_STATIC = @IF_STATIC@ libhogweed.a
++LIBHOGWEED_SHARED = @IF_SHARED@ $(LIBHOGWEED_FORLINK)
++
++libnettle.stamp: $(LIBNETTLE_STATIC) $(LIBNETTLE_SHARED)
++	touch $@
++
++libhogweed.stamp: $(LIBHOGWEED_STATIC) $(LIBHOGWEED_SHARED)
++	touch $@
+ 
+ getopt_SOURCES = getopt.c getopt1.c
+ getopt_TARGETS = $(getopt_SOURCES:.c=.$(OBJEXT))
+@@ -35,7 +46,7 @@
+           twofishdata$(EXEEXT_FOR_BUILD) shadata$(EXEEXT_FOR_BUILD) \
+           gcmdata$(EXEEXT_FOR_BUILD) \
+ 	  $(getopt_TARGETS) $(internal_TARGETS) \
+-	  $(LIBTARGETS) $(SHLIBTARGETS)
++	  $(LIBTARGETS)
+ IMPLICIT_TARGETS = @IF_DLL@ $(LIBNETTLE_FILE) $(LIBHOGWEED_FILE)
+ 
+ DOCTARGETS = @IF_DOCUMENTATION@ nettle.info nettle.html nettle.pdf
+diff -ur a/testsuite/Makefile.in b/testsuite/Makefile.in
+--- a/testsuite/Makefile.in	2013-04-24 09:26:53.000000000 -0400
++++ b/testsuite/Makefile.in	2013-10-16 18:29:47.328230002 -0400
+@@ -96,7 +96,7 @@
+ include $(srcdir)/.test-rules.make
+ 
+ $(TARGETS) $(EXTRA_TARGETS): testutils.$(OBJEXT) ../nettle-internal.$(OBJEXT) \
+-	../libnettle.a @IF_HOGWEED@ ../libhogweed.a
++	../libnettle.stamp @IF_HOGWEED@ ../libhogweed.stamp
+ 
+ # For use as, e.g.,
+ #
+diff -ur a/tools/Makefile.in b/tools/Makefile.in
+--- a/tools/Makefile.in	2013-04-24 09:26:53.000000000 -0400
++++ b/tools/Makefile.in	2013-10-16 18:44:52.366014240 -0400
+@@ -34,19 +34,19 @@
+ DISTFILES = $(SOURCES) Makefile.in input.h misc.h output.h parse.h
+ 
+ sexp_conv_OBJS = $(sexp_conv_SOURCES:.c=.$(OBJEXT)) $(getopt_OBJS)
+-sexp-conv$(EXEEXT): $(sexp_conv_OBJS) ../libnettle.a
++sexp-conv$(EXEEXT): $(sexp_conv_OBJS) ../libnettle.stamp
+ 	$(LINK) $(sexp_conv_OBJS) -lnettle $(LIBS) -o $@
+ 
+-nettle-lfib-stream$(EXEEXT): nettle-lfib-stream.$(OBJEXT) ../libnettle.a
++nettle-lfib-stream$(EXEEXT): nettle-lfib-stream.$(OBJEXT) ../libnettle.stamp
+ 	$(LINK) nettle-lfib-stream.$(OBJEXT) -lnettle $(LIBS) -o $@
+ 
+ pkcs1_conv_OBJS = $(pkcs1_conv_SOURCES:.c=.$(OBJEXT)) $(getopt_OBJS)
+-pkcs1-conv$(EXEEXT): $(pkcs1_conv_OBJS) ../libnettle.a ../libhogweed.a
++pkcs1-conv$(EXEEXT): $(pkcs1_conv_OBJS) ../libnettle.stamp ../libhogweed.stamp
+ 	$(LINK) $(pkcs1_conv_OBJS) -lhogweed -lnettle $(LIBS) -o $@
+ 
+ # FIXME: Avoid linking with gmp
+ nettle_hash_OBJS = $(nettle_hash_SOURCES:.c=.$(OBJEXT)) $(getopt_OBJS)
+-nettle-hash$(EXEEXT): $(nettle_hash_OBJS) ../libnettle.a
++nettle-hash$(EXEEXT): $(nettle_hash_OBJS) ../libnettle.stamp
+ 	$(LINK) $(nettle_hash_OBJS) -lnettle $(LIBS) -o $@
+ 
+ 
--- a/src/nettle.mk	Sat Oct 12 16:45:31 2013 +0200
+++ b/src/nettle.mk	Wed Oct 16 18:50:52 2013 -0400
@@ -3,7 +3,7 @@
 
 PKG             := nettle
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 1061754feb69dd01354525fa7eb6154b28ac887d
+$(PKG)_CHECKSUM := e17de3678b987841e88a724b7d2f6856d97ab139
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://www.lysator.liu.se/~nisse/archive/$($(PKG)_FILE)
@@ -47,15 +47,7 @@
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)'
-    $(MAKE) -C '$(1)' -j '$(JOBS)' getopt.o getopt1.o
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
-
-    if [ -d $(HOST_PREFIX)/lib64 ]; then \
-      $(INSTALL) -d $(HOST_LIBDIR)/pkgconfig; \
-      mv $(HOST_PREFIX)/lib64/pkgconfig/* $(HOST_LIBDIR)/pkgconfig; \
-      rmdir $(HOST_PREFIX)/lib64/pkgconfig; \
-      mv $(HOST_PREFIX)/lib64/* $(HOST_LIBDIR); \
-    fi
 endef
 endif