Mercurial > mxe-octave

annotate src/nettle-1-fixes.patch @ 3705:d30ced3f489e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
libpng: update to 1.6.13
author John W. Eaton <jwe@octave.org>
date Tue, 02 Sep 2014 11:45:16 -0400
parents a55be3b0022f
children 0a747a64a790
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3261
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 diff -ur a/examples/Makefile.in b/examples/Makefile.in
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2 --- a/examples/Makefile.in 2013-04-24 09:26:53.000000000 -0400
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
3 +++ b/examples/Makefile.in 2013-10-16 18:30:20.579120010 -0400
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4 @@ -117,8 +117,8 @@
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 -lhogweed -lnettle $(BENCH_LIBS) $(LIBS) $(OPENSSL_LIBFLAGS) \
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6 -o hogweed-benchmark$(EXEEXT)
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8 -$(TARGETS) : io.$(OBJEXT) ../libnettle.a
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 -$(HOGWEED_TARGETS): ../libhogweed.a
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10 +$(TARGETS) : io.$(OBJEXT) ../libnettle.stamp
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
11 +$(HOGWEED_TARGETS): ../libhogweed.stamp
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
13 check: $(TS_ALL)
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
14 LD_LIBRARY_PATH=../.lib PATH="../.lib:$$PATH" srcdir="$(srcdir)" \
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
15 diff -ur a/Makefile.in b/Makefile.in
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
16 --- a/Makefile.in 2013-04-24 09:26:53.000000000 -0400
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
17 +++ b/Makefile.in 2013-10-16 18:48:59.141790433 -0400
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
18 @@ -22,8 +22,19 @@
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
19
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
20 PRE_CPPFLAGS = -I.
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
21 # FIXME: Add configuration of LIBEXT?
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
22 -LIBTARGETS = @IF_STATIC@ libnettle.a @IF_HOGWEED@ libhogweed.a
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
23 -SHLIBTARGETS = @IF_SHARED@ $(LIBNETTLE_FORLINK) @IF_HOGWEED@ $(LIBHOGWEED_FORLINK)
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
24 +LIBTARGETS = libnettle.stamp libhogweed.stamp
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
25 +
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
26 +LIBNETTLE_STATIC = @IF_STATIC@ libnettle.a
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
27 +LIBNETTLE_SHARED = @IF_SHARED@ $(LIBNETTLE_FORLINK)
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
28 +
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
29 +LIBHOGWEED_STATIC = @IF_STATIC@ libhogweed.a
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
30 +LIBHOGWEED_SHARED = @IF_SHARED@ $(LIBHOGWEED_FORLINK)
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
31 +
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
32 +libnettle.stamp: $(LIBNETTLE_STATIC) $(LIBNETTLE_SHARED)
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
33 + touch $@
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
34 +
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
35 +libhogweed.stamp: $(LIBHOGWEED_STATIC) $(LIBHOGWEED_SHARED)
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
36 + touch $@
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
37
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
38 getopt_SOURCES = getopt.c getopt1.c
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
39 getopt_TARGETS = $(getopt_SOURCES:.c=.$(OBJEXT))
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
40 @@ -35,7 +46,7 @@
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
41 twofishdata$(EXEEXT_FOR_BUILD) shadata$(EXEEXT_FOR_BUILD) \
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
42 gcmdata$(EXEEXT_FOR_BUILD) \
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
43 $(getopt_TARGETS) $(internal_TARGETS) \
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
44 - $(LIBTARGETS) $(SHLIBTARGETS)
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
45 + $(LIBTARGETS)
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
46 IMPLICIT_TARGETS = @IF_DLL@ $(LIBNETTLE_FILE) $(LIBHOGWEED_FILE)
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
47
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
48 DOCTARGETS = @IF_DOCUMENTATION@ nettle.info nettle.html nettle.pdf
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
49 diff -ur a/testsuite/Makefile.in b/testsuite/Makefile.in
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
50 --- a/testsuite/Makefile.in 2013-04-24 09:26:53.000000000 -0400
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
51 +++ b/testsuite/Makefile.in 2013-10-16 18:29:47.328230002 -0400
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
52 @@ -96,7 +96,7 @@
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
53 include $(srcdir)/.test-rules.make
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
54
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
55 $(TARGETS) $(EXTRA_TARGETS): testutils.$(OBJEXT) ../nettle-internal.$(OBJEXT) \
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
56 - ../libnettle.a @IF_HOGWEED@ ../libhogweed.a
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
57 + ../libnettle.stamp @IF_HOGWEED@ ../libhogweed.stamp
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
58
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
59 # For use as, e.g.,
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
60 #
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
61 diff -ur a/tools/Makefile.in b/tools/Makefile.in
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
62 --- a/tools/Makefile.in 2013-04-24 09:26:53.000000000 -0400
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
63 +++ b/tools/Makefile.in 2013-10-16 18:44:52.366014240 -0400
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
64 @@ -34,19 +34,19 @@
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
65 DISTFILES = $(SOURCES) Makefile.in input.h misc.h output.h parse.h
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
66
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
67 sexp_conv_OBJS = $(sexp_conv_SOURCES:.c=.$(OBJEXT)) $(getopt_OBJS)
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
68 -sexp-conv$(EXEEXT): $(sexp_conv_OBJS) ../libnettle.a
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
69 +sexp-conv$(EXEEXT): $(sexp_conv_OBJS) ../libnettle.stamp
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
70 $(LINK) $(sexp_conv_OBJS) -lnettle $(LIBS) -o $@
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
71
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
72 -nettle-lfib-stream$(EXEEXT): nettle-lfib-stream.$(OBJEXT) ../libnettle.a
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
73 +nettle-lfib-stream$(EXEEXT): nettle-lfib-stream.$(OBJEXT) ../libnettle.stamp
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
74 $(LINK) nettle-lfib-stream.$(OBJEXT) -lnettle $(LIBS) -o $@
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
75
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
76 pkcs1_conv_OBJS = $(pkcs1_conv_SOURCES:.c=.$(OBJEXT)) $(getopt_OBJS)
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
77 -pkcs1-conv$(EXEEXT): $(pkcs1_conv_OBJS) ../libnettle.a ../libhogweed.a
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
78 +pkcs1-conv$(EXEEXT): $(pkcs1_conv_OBJS) ../libnettle.stamp ../libhogweed.stamp
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
79 $(LINK) $(pkcs1_conv_OBJS) -lhogweed -lnettle $(LIBS) -o $@
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
80
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
81 # FIXME: Avoid linking with gmp
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
82 nettle_hash_OBJS = $(nettle_hash_SOURCES:.c=.$(OBJEXT)) $(getopt_OBJS)
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
83 -nettle-hash$(EXEEXT): $(nettle_hash_OBJS) ../libnettle.a
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
84 +nettle-hash$(EXEEXT): $(nettle_hash_OBJS) ../libnettle.stamp
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
85 $(LINK) $(nettle_hash_OBJS) -lnettle $(LIBS) -o $@
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
86
a55be3b0022f update to new version of nettle
John W. Eaton <jwe@octave.org>
parents:
diff changeset
87