From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 May 2014 11:40:49 +0200 Subject: resolve merge conflict --- package/gnutls/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'package/gnutls') diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile index cac41d5fa..ff2196d2a 100644 --- a/package/gnutls/Makefile +++ b/package/gnutls/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 3.2.14 PKG_RELEASE:= 1 PKG_MD5SUM:= 807bbf14a5b6c81a9249fffab5c3982b PKG_DESCR:= transport layer security library -PKG_SECTION:= crypto +PKG_SECTION:= libs/crypto PKG_DEPENDS:= libgcrypt libtasn1 zlib libnettle libgmp PKG_BUILDDEP:= libiconv-tiny libgcrypt liblzo libtasn1 PKG_BUILDDEP+= zlib ncurses libnettle @@ -20,10 +20,10 @@ PKG_OPTS:= dev PKG_SUBPKGS:= LIBGNUTLS GNUTLS_UTILS LIBGNUTLS_EXTRA LIBGNUTLS_OPENSSL PKGSD_GNUTLS_UTILS:= transport layer security utilities PKGSS_GNUTLS_UTILS:= libgnutls libgnutls-extra -PKGSC_GNUTLS_UTILS:= crypto -PKGSC_LIBGNUTLS:= libs -PKGSC_LIBGNUTLS_EXTRA:= libs -PKGSC_LIBGNUTLS_OPENSSL:= libs +PKGSC_GNUTLS_UTILS:= app/crypto +PKGSC_LIBGNUTLS:= libs/crypto +PKGSC_LIBGNUTLS_EXTRA:= libs/crypto +PKGSC_LIBGNUTLS_OPENSSL:= libs/crypto PKG_FLAVOURS_LIBGNUTLS:= WITH_CRYPTODEV PKGFD_WITH_CRYPTODEV:= enable support for cryptodev-linux -- cgit v1.2.3