diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 11:40:49 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 21:56:31 +0200 |
| commit | f14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch) | |
| tree | 7617315e619f969c13e79c1f44c2428871719357 /package/openssl/Makefile | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'package/openssl/Makefile')
| -rw-r--r-- | package/openssl/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package/openssl/Makefile b/package/openssl/Makefile index 806d64c4e..a9836ffe9 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= openssl PKG_VERSION:= 1.0.1g PKG_RELEASE:= 1 PKG_MD5SUM:= de62b43dfcd858e66a74bee1c834e959 -PKG_DESCR:= Secure Socket Layer libraries -PKG_SECTION:= libs +PKG_DESCR:= secure socket layer libraries +PKG_SECTION:= libs/crypto PKG_DEPENDS:= zlib PKG_BUILDDEP:= zlib PKG_URL:= http://www.openssl.org/ @@ -19,8 +19,8 @@ PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz PKG_SUBPKGS:= LIBOPENSSL OPENSSL_UTIL -PKGSD_OPENSSL_UTIL:= OpenSSL command line tool -PKGSC_OPENSSL_UTIL:= crypto +PKGSD_OPENSSL_UTIL:= openssl command line tool +PKGSC_OPENSSL_UTIL:= app/crypto PKGSS_OPENSSL_UTIL:= libopenssl PKG_FLAVOURS_LIBOPENSSL:= WITH_CRYPTODEV |