summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/Makefile.in10
-rw-r--r--package/bind/bind.mk2
-rw-r--r--package/database/sqlite/sqlite.mk2
-rw-r--r--package/libxml2/libxml2.mk7
-rw-r--r--package/openssl/openssl.mk8
5 files changed, 7 insertions, 22 deletions
diff --git a/package/Makefile.in b/package/Makefile.in
index f0dc47a36..3dcdfe104 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -210,16 +210,6 @@ HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \
GNU_HOST_NAME:=$(HOST_ARCH)-$(subst ",,$(BR2_GNU_BUILD_SUFFIX))
#")
-AUTO_CONFIGURE_TARGET=\
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- $(TARGET_CONFIGURE_ENV) \
- $(if $(THIS_SRCDIR),$(THIS_SRCDIR)/,./)configure \
- $(if $(BR2_CONFIG_CACHE),--cache-file="$(PROJECT_BUILD_DIR)/tgt-config.cache",) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME)
-
TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
AR="$(TARGET_AR)" \
AS="$(TARGET_AS)" \
diff --git a/package/bind/bind.mk b/package/bind/bind.mk
index 1bf162792..c6d77e513 100644
--- a/package/bind/bind.mk
+++ b/package/bind/bind.mk
@@ -3,7 +3,7 @@
# bind
#
#############################################################
-BIND_VERSION = 9.5.1-P2
+BIND_VERSION = 9.5.1-P3
BIND_SOURCE = bind-$(BIND_VERSION).tar.gz
BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION)
BIND_LIBTOOL_PATCH = NO
diff --git a/package/database/sqlite/sqlite.mk b/package/database/sqlite/sqlite.mk
index 9bceee219..564ea3e59 100644
--- a/package/database/sqlite/sqlite.mk
+++ b/package/database/sqlite/sqlite.mk
@@ -4,7 +4,7 @@
#
#############################################################
-SQLITE_VERSION = 3.6.15
+SQLITE_VERSION = 3.6.16
SQLITE_SOURCE = sqlite-amalgamation-$(SQLITE_VERSION).tar.gz
SQLITE_SITE = http://www.sqlite.org
SQLITE_INSTALL_STAGING = YES
diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk
index eca96ea89..e9c8752db 100644
--- a/package/libxml2/libxml2.mk
+++ b/package/libxml2/libxml2.mk
@@ -3,7 +3,7 @@
# libxml2
#
#############################################################
-LIBXML2_VERSION = 2.6.32
+LIBXML2_VERSION = 2.7.3
LIBXML2_SOURCE = libxml2-sources-$(LIBXML2_VERSION).tar.gz
LIBXML2_SITE = ftp://xmlsoft.org/libxml2
LIBXML2_INSTALL_STAGING = YES
@@ -22,11 +22,6 @@ LIBXML2_DEPENDENCIES = uclibc
$(eval $(call AUTOTARGETS,package,libxml2))
-$(LIBXML2_HOOK_POST_EXTRACT):
- rm -f $(LIBXML2_DIR)/win32/Makefile.msvc.rej
- rm -f $(LIBXML2_DIR)/macos/src/XMLTestPrefix.h.rej
- touch $@
-
$(LIBXML2_HOOK_POST_INSTALL):
$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xml2-config
$(SED) "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xml2-config
diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index a0e6f7e54..8c24db19f 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -9,16 +9,16 @@ OPENSSL_SITE:=http://www.openssl.org/source
OPENSSL_TARGET_ARCH=generic32
# Some architectures are optimized in OpenSSL
-ifeq ($(BR2_ARCH),avr32)
+ifeq ($(ARCH),avr32)
OPENSSL_TARGET_ARCH=avr32
endif
-ifeq ($(BR2_ARCH),ia64)
+ifeq ($(ARCH),ia64)
OPENSSL_TARGET_ARCH=ia64
endif
-ifeq ($(BR2_ARCH),powerpc)
+ifeq ($(ARCH),powerpc)
OPENSSL_TARGET_ARCH=ppc
endif
-ifeq ($(BR2_ARCH),x86_64)
+ifeq ($(ARCH),x86_64)
OPENSSL_TARGET_ARCH=x86_64
endif