Sfoglia il codice sorgente

package/apr-util: make sqlite optional

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Bernd Kuhls 10 anni fa
parent
commit
86a91e2c57
2 ha cambiato i file con 8 aggiunte e 2 eliminazioni
  1. 0 1
      package/apr-util/Config.in
  2. 8 1
      package/apr-util/apr-util.mk

+ 0 - 1
package/apr-util/Config.in

@@ -1,7 +1,6 @@
 config BR2_PACKAGE_APR_UTIL
 config BR2_PACKAGE_APR_UTIL
 	bool "apr-util"
 	bool "apr-util"
 	select BR2_PACKAGE_APR
 	select BR2_PACKAGE_APR
-	select BR2_PACKAGE_SQLITE
 	select BR2_PACKAGE_EXPAT
 	select BR2_PACKAGE_EXPAT
 	# apr really needs shared library support
 	# apr really needs shared library support
 	depends on !BR2_PREFER_STATIC_LIB
 	depends on !BR2_PREFER_STATIC_LIB

+ 8 - 1
package/apr-util/apr-util.mk

@@ -9,7 +9,7 @@ APR_UTIL_SITE = http://archive.apache.org/dist/apr
 APR_UTIL_LICENSE = Apache-2.0
 APR_UTIL_LICENSE = Apache-2.0
 APR_UTIL_LICENSE_FILES = LICENSE
 APR_UTIL_LICENSE_FILES = LICENSE
 APR_UTIL_INSTALL_STAGING = YES
 APR_UTIL_INSTALL_STAGING = YES
-APR_UTIL_DEPENDENCIES = apr expat sqlite
+APR_UTIL_DEPENDENCIES = apr expat
 APR_UTIL_CONF_OPTS = \
 APR_UTIL_CONF_OPTS = \
 	--with-apr=$(STAGING_DIR)/usr/bin/apr-1-config
 	--with-apr=$(STAGING_DIR)/usr/bin/apr-1-config
 APR_UTIL_CONFIG_SCRIPTS = apu-1-config
 APR_UTIL_CONFIG_SCRIPTS = apu-1-config
@@ -18,4 +18,11 @@ APR_UTIL_CONFIG_SCRIPTS = apu-1-config
 # features.
 # features.
 APR_UTIL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 APR_UTIL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 
 
+ifeq ($(BR2_PACKAGE_SQLITE),y)
+APR_UTIL_CONF_OPTS += --with-sqlite3="$(STAGING_DIR)/usr"
+APR_UTIL_DEPENDENCIES += sqlite
+else
+APR_UTIL_CONF_OPTS += --without-sqlite3
+endif
+
 $(eval $(autotools-package))
 $(eval $(autotools-package))