diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-31 09:24:31 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-31 09:24:31 +0100 |
commit | 1e9a681a0fc22e40abe393aa9f015a12f7b6dc63 (patch) | |
tree | 250019d7025db0f012d830cc7b257b091347f97f /package/cups | |
parent | bf73dab7201f06f26290c4ceb5cdcca603f027d7 (diff) | |
parent | 1b6a9fa3f18fdeaa3f3869a22cd91490ffec608c (diff) |
resolve merge conflict
Diffstat (limited to 'package/cups')
-rw-r--r-- | package/cups/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/package/cups/Makefile b/package/cups/Makefile index e3fc672e9..4d83cf472 100644 --- a/package/cups/Makefile +++ b/package/cups/Makefile @@ -24,6 +24,10 @@ include ${TOPDIR}/mk/package.mk $(eval $(call HOST_template,CUPS,cups,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,CUPS,cups,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +ifneq ($(ADK_HOST_LINUX),y) +HOST_LINUX_ONLY:= 1 +endif + HOST_STYLE:= auto HOST_CONFIGURE_ARGS+= --disable-tcp-wrappers \ --disable-webif \ |