浏览代码

libsoup: add option to enable HTTPS (SSL) support

By selecting BR2_PACKAGE_LIBSOUP_SSL the gnutls package is selected
and libsoup will be compiled with SSL support.

[Peter: pass --with-libgcrypt-prefix so configure finds it]
Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Sven Neumann 14 年之前
父节点
当前提交
bd387486ad
共有 2 个文件被更改,包括 14 次插入1 次删除
  1. 7 0
      package/libsoup/Config.in
  2. 7 1
      package/libsoup/libsoup.mk

+ 7 - 0
package/libsoup/Config.in

@@ -12,5 +12,12 @@ config BR2_PACKAGE_LIBSOUP
 
 	  http://live.gnome.org/LibSoup
 
+config BR2_PACKAGE_LIBSOUP_SSL
+	bool "https support"
+	select BR2_PACKAGE_GNUTLS
+	depends on BR2_PACKAGE_LIBSOUP
+	help
+	  Enable HTTPS (SSL) support.
+
 comment "libsoup requires a toolchain with WCHAR support"
 	depends on !BR2_USE_WCHAR

+ 7 - 1
package/libsoup/libsoup.mk

@@ -19,9 +19,15 @@ endif
 LIBSOUP_CONF_OPT = \
 	--disable-explicit-deps \
 	--disable-glibtest	\
-	--disable-ssl		\
 	--without-gnome
 
 LIBSOUP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) host-pkg-config host-libglib2 libglib2 libxml2
 
+ifeq ($(BR2_PACKAGE_LIBSOUP_SSL),y)
+LIBSOUP_DEPENDENCIES += gnutls
+LIBSOUP_CONF_OPT += --enable-ssl --with-libgcrypt-prefix=$(STAGING_DIR)/usr
+else
+LIBSOUP_CONF_OPT += --disable-ssl
+endif
+
 $(eval $(call AUTOTARGETS,package,libsoup))