| 1 |
commit: acc7f1d231cb28cf008e66f8aeab28080492e7cc |
| 2 |
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Aug 4 19:35:32 2016 +0000 |
| 4 |
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 4 19:41:43 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acc7f1d2 |
| 7 |
|
| 8 |
dev-libs/nettle: cleanup |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28 |
| 11 |
|
| 12 |
dev-libs/nettle/files/nettle-2.7-shared.patch | 77 --------------------------- |
| 13 |
1 file changed, 77 deletions(-) |
| 14 |
|
| 15 |
diff --git a/dev-libs/nettle/files/nettle-2.7-shared.patch b/dev-libs/nettle/files/nettle-2.7-shared.patch |
| 16 |
deleted file mode 100644 |
| 17 |
index 9b9d6c8..0000000 |
| 18 |
--- a/dev-libs/nettle/files/nettle-2.7-shared.patch |
| 19 |
+++ /dev/null |
| 20 |
@@ -1,77 +0,0 @@ |
| 21 |
---- nettle-2.7/examples/Makefile.in |
| 22 |
-+++ nettle-2.7/examples/Makefile.in |
| 23 |
-@@ -8,7 +8,7 @@ |
| 24 |
- include ../config.make |
| 25 |
- |
| 26 |
- PRE_CPPFLAGS = -I.. -I$(top_srcdir) |
| 27 |
--PRE_LDFLAGS = -L.. |
| 28 |
-+PRE_LDFLAGS = -L../.lib |
| 29 |
- |
| 30 |
- OPENSSL_LIBFLAGS = @OPENSSL_LIBFLAGS@ |
| 31 |
- BENCH_LIBS = @BENCH_LIBS@ -lm |
| 32 |
-@@ -117,8 +117,8 @@ |
| 33 |
- -lhogweed -lnettle $(BENCH_LIBS) $(LIBS) $(OPENSSL_LIBFLAGS) \ |
| 34 |
- -o hogweed-benchmark$(EXEEXT) |
| 35 |
- |
| 36 |
--$(TARGETS) : io.$(OBJEXT) ../libnettle.a |
| 37 |
--$(HOGWEED_TARGETS): ../libhogweed.a |
| 38 |
-+$(TARGETS) : io.$(OBJEXT) ../$(LIBNETTLE_FORLINK) |
| 39 |
-+$(HOGWEED_TARGETS): ../$(LIBHOGWEED_FORLINK) |
| 40 |
- |
| 41 |
- check: $(TS_ALL) |
| 42 |
- LD_LIBRARY_PATH=../.lib PATH="../.lib:$$PATH" srcdir="$(srcdir)" \ |
| 43 |
---- nettle-2.7/testsuite/Makefile.in |
| 44 |
-+++ nettle-2.7/testsuite/Makefile.in |
| 45 |
-@@ -8,7 +8,7 @@ |
| 46 |
- include ../config.make |
| 47 |
- |
| 48 |
- PRE_CPPFLAGS = -I.. -I$(top_srcdir) |
| 49 |
--PRE_LDFLAGS = -L.. |
| 50 |
-+PRE_LDFLAGS = -L../.lib |
| 51 |
- |
| 52 |
- TS_NETTLE_SOURCES = aes-test.c arcfour-test.c arctwo-test.c \ |
| 53 |
- blowfish-test.c cast128-test.c \ |
| 54 |
-@@ -96,7 +96,7 @@ |
| 55 |
- include $(srcdir)/.test-rules.make |
| 56 |
- |
| 57 |
- $(TARGETS) $(EXTRA_TARGETS): testutils.$(OBJEXT) ../nettle-internal.$(OBJEXT) \ |
| 58 |
-- ../libnettle.a @IF_HOGWEED@ ../libhogweed.a |
| 59 |
-+ ../$(LIBNETTLE_FORLINK) @IF_HOGWEED@ ../$(LIBHOGWEED_FORLINK) |
| 60 |
- |
| 61 |
- # For use as, e.g., |
| 62 |
- # |
| 63 |
---- nettle-2.7/tools/Makefile.in |
| 64 |
-+++ nettle-2.7/tools/Makefile.in |
| 65 |
-@@ -15,7 +15,7 @@ |
| 66 |
- include ../config.make |
| 67 |
- |
| 68 |
- PRE_CPPFLAGS = -I.. -I$(top_srcdir) |
| 69 |
--PRE_LDFLAGS = -L.. |
| 70 |
-+PRE_LDFLAGS = -L../.lib |
| 71 |
- |
| 72 |
- HOGWEED_TARGETS = pkcs1-conv$(EXEEXT) |
| 73 |
- TARGETS = sexp-conv$(EXEEXT) nettle-hash$(EXEEXT) nettle-lfib-stream$(EXEEXT) \ |
| 74 |
-@@ -34,19 +34,19 @@ |
| 75 |
- DISTFILES = $(SOURCES) Makefile.in input.h misc.h output.h parse.h |
| 76 |
- |
| 77 |
- sexp_conv_OBJS = $(sexp_conv_SOURCES:.c=.$(OBJEXT)) $(getopt_OBJS) |
| 78 |
--sexp-conv$(EXEEXT): $(sexp_conv_OBJS) ../libnettle.a |
| 79 |
-+sexp-conv$(EXEEXT): $(sexp_conv_OBJS) ../$(LIBNETTLE_FORLINK) |
| 80 |
- $(LINK) $(sexp_conv_OBJS) -lnettle $(LIBS) -o $@ |
| 81 |
- |
| 82 |
--nettle-lfib-stream$(EXEEXT): nettle-lfib-stream.$(OBJEXT) ../libnettle.a |
| 83 |
-+nettle-lfib-stream$(EXEEXT): nettle-lfib-stream.$(OBJEXT) ../$(LIBNETTLE_FORLINK) |
| 84 |
- $(LINK) nettle-lfib-stream.$(OBJEXT) -lnettle $(LIBS) -o $@ |
| 85 |
- |
| 86 |
- pkcs1_conv_OBJS = $(pkcs1_conv_SOURCES:.c=.$(OBJEXT)) $(getopt_OBJS) |
| 87 |
--pkcs1-conv$(EXEEXT): $(pkcs1_conv_OBJS) ../libnettle.a ../libhogweed.a |
| 88 |
-+pkcs1-conv$(EXEEXT): $(pkcs1_conv_OBJS) ../$(LIBNETTLE_FORLINK) ../$(LIBHOGWEED_FORLINK) |
| 89 |
- $(LINK) $(pkcs1_conv_OBJS) -lhogweed -lnettle $(LIBS) -o $@ |
| 90 |
- |
| 91 |
- # FIXME: Avoid linking with gmp |
| 92 |
- nettle_hash_OBJS = $(nettle_hash_SOURCES:.c=.$(OBJEXT)) $(getopt_OBJS) |
| 93 |
--nettle-hash$(EXEEXT): $(nettle_hash_OBJS) ../libnettle.a |
| 94 |
-+nettle-hash$(EXEEXT): $(nettle_hash_OBJS) ../$(LIBNETTLE_FORLINK) |
| 95 |
- $(LINK) $(nettle_hash_OBJS) -lnettle $(LIBS) -o $@ |
| 96 |
- |
| 97 |
- |
Archives