do not depend on external opencdk (not used) and libtasn1, use bundled version instead, set common lib searchpath

SVN-Revision: 1695
This commit is contained in:
Nicolas Thill 2005-08-18 08:18:15 +00:00
parent 28a9c5123c
commit dc1be63445
4 changed files with 8 additions and 11 deletions

View File

@ -41,7 +41,7 @@ package-$(BR2_PACKAGE_FUSE) += fuse
package-$(BR2_PACKAGE_GDBSERVER) += gdbserver package-$(BR2_PACKAGE_GDBSERVER) += gdbserver
package-$(BR2_PACKAGE_GLIB) += glib package-$(BR2_PACKAGE_GLIB) += glib
package-$(BR2_PACKAGE_GMP) += gmp package-$(BR2_PACKAGE_GMP) += gmp
package-$(BR2_PACKAGE_GNUTLS) += gnutls package-$(BR2_COMPILE_GNUTLS) += gnutls
package-$(BR2_PACKAGE_HASERL) += haserl package-$(BR2_PACKAGE_HASERL) += haserl
package-$(BR2_PACKAGE_HOSTAPD) += hostapd package-$(BR2_PACKAGE_HOSTAPD) += hostapd
package-$(BR2_PACKAGE_HOWL) += howl package-$(BR2_PACKAGE_HOWL) += howl

View File

@ -1,4 +1,4 @@
config BR2_PACKAGE_GNUTLS config BR2_COMPILE_GNUTLS
bool bool
default n default n
depends BR2_PACKAGE_LIBGNUTLS depends BR2_PACKAGE_LIBGNUTLS
@ -7,10 +7,8 @@ config BR2_PACKAGE_LIBGNUTLS
tristate "libgnutls - The GNU TLS library" tristate "libgnutls - The GNU TLS library"
# default m if CONFIG_DEVEL # default m if CONFIG_DEVEL
default n default n
select BR2_PACKAGE_GNUTLS select BR2_COMPILE_GNUTLS
select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBGCRYPT
select BR2_PACKAGE_LIBOPENCDK
select BR2_PACKAGE_LIBTASN1
help help
GnuTLS is a project that aims to develop a library which provides a GnuTLS is a project that aims to develop a library which provides a
secure layer, over a reliable transport layer. Currently the GnuTLS secure layer, over a reliable transport layer. Currently the GnuTLS

View File

@ -35,7 +35,7 @@ $(PKG_BUILD_DIR)/.configured:
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \ CFLAGS="$(TARGET_CFLAGS)" \
CPPFLAGS="-I$(STAGING_DIR)/usr/include" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
./configure \ ./configure \
--target=$(GNU_TARGET_NAME) \ --target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \
@ -62,10 +62,9 @@ $(PKG_BUILD_DIR)/.configured:
--disable-srp-authentication \ --disable-srp-authentication \
--disable-anon-authentication \ --disable-anon-authentication \
--disable-openpgp-authentication \ --disable-openpgp-authentication \
--with-libgcrypt-prefix="$(STAGING_DIR)/usr" \ --with-included-opencdk=yes \
--with-libopencdk-prefix="$(STAGING_DIR)/usr" \ --with-included-libtasn1=yes \
--with-libtasn1-prefix="$(STAGING_DIR)/usr" \ --with-included-libcfg=yes \
--with-included-libcfg \
--without-zlib \ --without-zlib \
--without-lzo \ --without-lzo \
); );

View File

@ -6,4 +6,4 @@ Architecture: [TBDL]
Maintainer: OpenWrt Developers Team <bugs@openwrt.org> Maintainer: OpenWrt Developers Team <bugs@openwrt.org>
Source: http://openwrt.org/cgi-bin/viewcvs.cgi/openwrt/package/gnutls/ Source: http://openwrt.org/cgi-bin/viewcvs.cgi/openwrt/package/gnutls/
Description: GNU TLS library Description: GNU TLS library
Depends: libgcrypt, libopencdk, libtasn1 Depends: libgcrypt