aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/utils
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2016-04-17 12:51:41 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2016-04-17 12:51:41 +0000
commita4d646cf155f187892b6461d364546957dafd59d (patch)
tree971c72c7ec0844a45657ca6b01ad0e94d3f14e86 /package/network/utils
parenta2b15e6c1d84bda852ad4309b1ce3d5939898e00 (diff)
downloadupstream-a4d646cf155f187892b6461d364546957dafd59d.tar.gz
upstream-a4d646cf155f187892b6461d364546957dafd59d.tar.bz2
upstream-a4d646cf155f187892b6461d364546957dafd59d.zip
curl: add config option for NTLM support
Signed-off-by: Dirk Feytons <dirk.feytons@gmail.com> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 49183
Diffstat (limited to 'package/network/utils')
-rw-r--r--package/network/utils/curl/Config.in5
-rw-r--r--package/network/utils/curl/Makefile4
2 files changed, 8 insertions, 1 deletions
diff --git a/package/network/utils/curl/Config.in b/package/network/utils/curl/Config.in
index f41307a970..14d2047301 100644
--- a/package/network/utils/curl/Config.in
+++ b/package/network/utils/curl/Config.in
@@ -154,4 +154,9 @@ config LIBCURL_VERBOSE
bool "Enable verbose error strings"
default n
+config LIBCURL_NTLM
+ bool "Enable NTLM support"
+ depends LIBCURL_CRYPTO_AUTH && !LIBCURL_NOSSL
+ default n
+
endif
diff --git a/package/network/utils/curl/Makefile b/package/network/utils/curl/Makefile
index eada1aa596..319c0b710d 100644
--- a/package/network/utils/curl/Makefile
+++ b/package/network/utils/curl/Makefile
@@ -65,7 +65,8 @@ PKG_CONFIG_DEPENDS:= \
CONFIG_LIBCURL_THREADED_RESOLVER \
CONFIG_LIBCURL_TLS_SRP \
CONFIG_LIBCURL_UNIX_SOCKETS \
- CONFIG_LIBCURL_VERBOSE
+ CONFIG_LIBCURL_VERBOSE \
+ CONFIG_LIBCURL_NTLM
include $(INCLUDE_DIR)/package.mk
@@ -99,6 +100,7 @@ define Package/libcurl/config
endef
TARGET_CFLAGS += $(FPIC)
+TARGET_CPPFLAGS += $(if $(CONFIG_LIBCURL_NTLM),,-DCURL_DISABLE_NTLM)
CONFIGURE_ARGS += \
--disable-debug \
e.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */
#
# Copyright (C) 2008-2009 Industrie Dial Face S.p.A.
#               Luigi 'Comio' Mantellini <luigi.mantellini@idf-hit.com>
# Copyright (C) 2006-2008 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#

include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/version.mk

override MAKEFLAGS=

TOOLCHAIN_NAME:=$(VERSION_DIST_SANITIZED)-toolchain-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))_gcc-$(GCCV)$(DIR_SUFFIX).$(HOST_OS)-$(HOST_ARCH)
TOOLCHAIN_BUILD_DIR:=$(BUILD_DIR)/$(TOOLCHAIN_NAME)
EXCLUDE_DIRS:= \
	*/initial \
	*/stamp \
	*/stampfiles \
	*/man \
	*/info

all: compile

TOOLCHAIN_PREFIX:=$(TOOLCHAIN_BUILD_DIR)/toolchain-$(ARCH)$(ARCH_SUFFIX)_gcc-$(GCCV)$(DIR_SUFFIX)

$(BIN_DIR)/$(TOOLCHAIN_NAME).tar.bz2: clean
	mkdir -p $(TOOLCHAIN_BUILD_DIR)
	$(TAR) -cf - -C $(TOPDIR)/staging_dir/  \
	       $(foreach exclude,$(EXCLUDE_DIRS),--exclude="$(exclude)") \
	       toolchain-$(ARCH)$(ARCH_SUFFIX)_gcc-$(GCCV)$(DIR_SUFFIX) | \
	       $(TAR) -xf - -C $(TOOLCHAIN_BUILD_DIR)

	$(CP) \
		$(TOPDIR)/LICENSES \
		$(TOPDIR)/COPYING \
		./files/README.TOOLCHAIN \
		$(TOOLCHAIN_BUILD_DIR)/

	$(CP) ./files/wrapper.sh $(TOOLCHAIN_PREFIX)/bin/$(REAL_GNU_TARGET_NAME)-wrapper.sh
	chmod +x $(TOOLCHAIN_PREFIX)/bin/$(REAL_GNU_TARGET_NAME)-wrapper.sh
	(cd $(TOOLCHAIN_PREFIX)/bin; \
		for app in cc gcc g++ c++ cpp ld as ; do \
			[ -f $(REAL_GNU_TARGET_NAME)-$${app} ] && mv $(REAL_GNU_TARGET_NAME)-$${app} $(REAL_GNU_TARGET_NAME)-$${app}.bin ; \
			ln -sf $(REAL_GNU_TARGET_NAME)-wrapper.sh $(REAL_GNU_TARGET_NAME)-$${app} ; \
		done; \
	)

	@-( \
		find \
			$(TOOLCHAIN_BUILD_DIR)/*/bin \
			$(TOOLCHAIN_BUILD_DIR)/*/*/bin \
			$(TOOLCHAIN_BUILD_DIR)/*/libexec \
			-type f; \
	) | xargs strip 2>/dev/null >/dev/null

	echo REVISION:="$(REVISION)" > $(TOOLCHAIN_BUILD_DIR)/version.mk
	find $(TOOLCHAIN_BUILD_DIR) -name .git | $(XARGS) rm -rf
	find $(TOOLCHAIN_BUILD_DIR) -name .svn | $(XARGS) rm -rf
	find $(TOOLCHAIN_BUILD_DIR) -name CVS | $(XARGS) rm -rf
	mkdir -p $(BIN_DIR)
	(cd $(BUILD_DIR); \
		tar cfj $@ $(TOOLCHAIN_NAME); \
	)

download:
prepare:
compile: $(BIN_DIR)/$(TOOLCHAIN_NAME).tar.bz2
install: compile

clean:
	rm -rf $(TOOLCHAIN_BUILD_DIR) $(BIN_DIR)/$(TOOLCHAIN_NAME).tar.bz2