diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-08 11:43:10 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-08 11:43:10 +0200 |
| commit | 3c7d86149b8a3cd7c8fa3d8f71fc6ba4f73ea92d (patch) | |
| tree | 46c1b3963ee2d4f1d40f1b040635cf5bf4beca08 /package | |
| parent | 6bde5bd7302d9eeca63d55c8b57a6c544e56fe8c (diff) | |
| parent | 4fd5ddcbcb150d6f687f919c2e5ddefe1a804ec9 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
| -rw-r--r-- | package/gnutls/Makefile | 9 | ||||
| -rw-r--r-- | package/gnutls/patches/patch-build-aux_ltmain_sh | 11 | ||||
| -rw-r--r-- | package/gnutls/patches/patch-lib_build-aux_ltmain_sh | 11 | ||||
| -rw-r--r-- | package/gnutls/patches/patch-libextra_build-aux_ltmain_sh | 11 |
4 files changed, 6 insertions, 36 deletions
diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile index bd4fc9f81..c4c5e0cb1 100644 --- a/package/gnutls/Makefile +++ b/package/gnutls/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gnutls -PKG_VERSION:= 2.8.6 +PKG_VERSION:= 2.12.11 PKG_RELEASE:= 1 -PKG_MD5SUM:= eb0a6d7d3cb9ac684d971c14f9f6d3ba +PKG_MD5SUM:= f08234b64a8025d6d5aa1307868b02ed PKG_DESCR:= GNU TLS library PKG_SECTION:= crypto PKG_DEPENDS:= libgcrypt libtasn1 zlib @@ -34,9 +34,12 @@ $(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${ TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ARGS+= --without-libopencdk-prefix \ --disable-camellia \ + --with-libgcrypt \ --with-libgcrypt-prefix=${STAGING_TARGET_DIR}/usr \ --disable-rpath \ - --without-libz-prefix + --without-libz-prefix \ + --without-p11-kit \ + --without-nettle-prefix post-install: ${INSTALL_DIR} ${IDIR_LIBGNUTLS}/usr/lib diff --git a/package/gnutls/patches/patch-build-aux_ltmain_sh b/package/gnutls/patches/patch-build-aux_ltmain_sh deleted file mode 100644 index 564eeb34b..000000000 --- a/package/gnutls/patches/patch-build-aux_ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- gnutls-2.8.6.orig/build-aux/ltmain.sh 2010-03-15 11:28:59.000000000 +0100 -+++ gnutls-2.8.6/build-aux/ltmain.sh 2011-01-15 19:40:55.000000000 +0100 -@@ -4765,7 +4765,7 @@ func_mode_link () - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" diff --git a/package/gnutls/patches/patch-lib_build-aux_ltmain_sh b/package/gnutls/patches/patch-lib_build-aux_ltmain_sh deleted file mode 100644 index e16ccadeb..000000000 --- a/package/gnutls/patches/patch-lib_build-aux_ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- gnutls-2.8.6.orig/lib/build-aux/ltmain.sh 2010-03-15 11:28:24.000000000 +0100 -+++ gnutls-2.8.6/lib/build-aux/ltmain.sh 2011-01-15 19:44:32.000000000 +0100 -@@ -4765,7 +4765,7 @@ func_mode_link () - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" diff --git a/package/gnutls/patches/patch-libextra_build-aux_ltmain_sh b/package/gnutls/patches/patch-libextra_build-aux_ltmain_sh deleted file mode 100644 index 75df0e2d6..000000000 --- a/package/gnutls/patches/patch-libextra_build-aux_ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- gnutls-2.8.6.orig/libextra/build-aux/ltmain.sh 2010-03-15 11:28:49.000000000 +0100 -+++ gnutls-2.8.6/libextra/build-aux/ltmain.sh 2011-01-15 19:44:14.000000000 +0100 -@@ -4765,7 +4765,7 @@ func_mode_link () - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" |