|
|
@ -1,5 +1,5 @@ |
|
|
|
#
|
|
|
|
# Copyright (C) 2007-2014 OpenWrt.org
|
|
|
|
# Copyright (C) 2007-2016 OpenWrt.org
|
|
|
|
#
|
|
|
|
# This is free software, licensed under the GNU General Public License v2.
|
|
|
|
# See /LICENSE for more information.
|
|
|
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk |
|
|
|
|
|
|
|
PKG_NAME:=apr-util |
|
|
|
PKG_VERSION:=1.5.4 |
|
|
|
PKG_RELEASE:=1 |
|
|
|
PKG_RELEASE:=2 |
|
|
|
|
|
|
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 |
|
|
|
PKG_SOURCE_URL:=@APACHE/apr/ |
|
|
@ -41,16 +41,21 @@ CONFIGURE_ARGS += \ |
|
|
|
--with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \
|
|
|
|
--with-expat="$(STAGING_DIR)/usr" \
|
|
|
|
--without-sqlite2 \
|
|
|
|
--with-sqlite3="$(STAGING_DIR)/usr" \
|
|
|
|
--with-iconv="$(ICONV_PREFIX)" \
|
|
|
|
--with-sqlite3="$(STAGING_DIR)/usr" |
|
|
|
|
|
|
|
ifdef $(CONFIG_BUILD_NLS) |
|
|
|
CONFIGURE_ARGS += --with-iconv="$(ICONV_PREFIX)" |
|
|
|
else |
|
|
|
CONFIGURE_ARGS += --without-iconv |
|
|
|
endif |
|
|
|
|
|
|
|
CONFIGURE_VARS += \
|
|
|
|
ac_cv_file_dbd_apr_dbd_mysql_c=no \
|
|
|
|
ac_cv_path_ODBC_CONFIG= \
|
|
|
|
APR_BUILD_DIR="$(STAGING_DIR)/usr/share/build-1" \
|
|
|
|
APR_BUILD_DIR="$(STAGING_DIR)/usr/share/build-1" |
|
|
|
|
|
|
|
MAKE_FLAGS += \
|
|
|
|
APRUTIL_LIBS="-lsqlite3 $(TARGET_LDFLAGS) -lexpat $(if $(ICONV_FULL),-liconv) -lapr-1 -luuid -lm -lcrypt" \
|
|
|
|
APRUTIL_LIBS="-lsqlite3 $(TARGET_LDFLAGS) -lexpat $(if $(ICONV_FULL),-liconv) -lapr-1 -luuid -lm -lcrypt" |
|
|
|
|
|
|
|
define Build/InstallDev |
|
|
|
$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include/apr-1/ $(1)/usr/lib $(1)/usr/lib/pkgconfig/ |
|
|
|