diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-05-15 21:40:58 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-05-15 21:40:58 +0200 |
| commit | 88dc317d5510827a551697805c5d167d3ecb0975 (patch) | |
| tree | 844617488fd1dc07aaccac5f680cb73a66622939 /package/libnettle | |
| parent | dff2d49e4342587e3d4c2f578eacfdc0e4089cca (diff) | |
| parent | 0a1c8865d1e019c19639108b2ae1cf53eb863f31 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/libnettle')
| -rw-r--r-- | package/libnettle/Makefile | 6 | ||||
| -rw-r--r-- | package/libnettle/patches/patch-Makefile_in | 10 | ||||
| -rw-r--r-- | package/libnettle/patches/patch-hogweed_pc_in | 15 |
3 files changed, 24 insertions, 7 deletions
diff --git a/package/libnettle/Makefile b/package/libnettle/Makefile index e640b6b18..90d86e599 100644 --- a/package/libnettle/Makefile +++ b/package/libnettle/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libnettle -PKG_VERSION:= 2.7.1 +PKG_VERSION:= 3.1 PKG_RELEASE:= 2 -PKG_HASH:= bc71ebd43435537d767799e414fce88e521b7278d48c860651216e1fc6555b40 +PKG_HASH:= f6859d4ec88e70805590af9862b4b8c43a2d1fc7991df0a7a711b1e7ca9fc9d3 PKG_DESCR:= crypto library PKG_SECTION:= libs/crypto PKG_DEPENDS:= libgmp @@ -22,6 +22,8 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBNETTLE,libnettle,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +CONFIGURE_ARGS+= --disable-documentation + libnettle-install: $(INSTALL_DIR) $(IDIR_LIBNETTLE)/usr/lib $(CP) $(WRKINST)/usr/lib/libnettle*.so* \ diff --git a/package/libnettle/patches/patch-Makefile_in b/package/libnettle/patches/patch-Makefile_in index d63bbdc56..fb5b2e914 100644 --- a/package/libnettle/patches/patch-Makefile_in +++ b/package/libnettle/patches/patch-Makefile_in @@ -1,8 +1,8 @@ ---- nettle-2.4.orig/Makefile.in 2011-09-03 14:51:07.000000000 +0200 -+++ nettle-2.4/Makefile.in 2012-04-03 15:14:44.000000000 +0200 -@@ -14,7 +14,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = $(INSTALL_PROGRAM) -s - MKDIR_P = @MKDIR_P@ +--- nettle-3.1.orig/Makefile.in 2015-04-07 14:00:08.000000000 -0500 ++++ nettle-3.1/Makefile.in 2015-05-13 17:12:36.605171868 -0500 +@@ -17,7 +17,7 @@ OPT_HOGWEED_OBJS = @OPT_HOGWEED_OBJS@ + + OPT_NETTLE_SOURCES = @OPT_NETTLE_SOURCES@ -SUBDIRS = tools testsuite examples +SUBDIRS = tools testsuite diff --git a/package/libnettle/patches/patch-hogweed_pc_in b/package/libnettle/patches/patch-hogweed_pc_in new file mode 100644 index 000000000..85fe0489d --- /dev/null +++ b/package/libnettle/patches/patch-hogweed_pc_in @@ -0,0 +1,15 @@ +--- nettle-3.1.orig/hogweed.pc.in 2015-04-07 14:00:09.000000000 -0500 ++++ nettle-3.1/hogweed.pc.in 2015-05-14 02:43:51.148857825 -0500 +@@ -11,9 +11,9 @@ Name: Hogweed + Description: Nettle low-level cryptographic library (public-key algorithms) + URL: http://www.lysator.liu.se/~nisse/nettle + Version: @PACKAGE_VERSION@ +-Requires: @IF_NOT_SHARED@ nettle ++Requires: nettle + Requires.private: @IF_SHARED@ nettle +-Libs: -L${libdir} -lhogweed @IF_NOT_SHARED@ @LIBS@ +-Libs.private: @IF_SHARED@ @LIBS@ ++Libs: -L${libdir} -lhogweed @LIBS@ ++Libs.private: @LIBS@ + Cflags: -I${includedir} + |