summaryrefslogtreecommitdiff
path: root/package/libpng
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-10-21 17:22:31 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2013-10-21 17:22:31 +0200
commit32a82e38679501da738199135b35f93ddc8aca0a (patch)
treeed280e079a8bab790b3dba5f62f1d300ada7540b /package/libpng
parent90d5c8b73e8d538e121275b12e714332ca785cff (diff)
parent86c05906d3e804b41b9280c226a3a07f6fad5f27 (diff)
resolve conflicts
Diffstat (limited to 'package/libpng')
-rw-r--r--package/libpng/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/package/libpng/Makefile b/package/libpng/Makefile
index 1d43a4998..af067f4d2 100644
--- a/package/libpng/Makefile
+++ b/package/libpng/Makefile
@@ -15,6 +15,8 @@ PKG_URL:= http://www.libpng.org/pub/png/libpng.html
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libpng/}
PKG_OPTS:= dev
+PKG_ARCH_DEPENDS:= !m68k
+
ifeq ($(ADK_STATIC),y)
PKG_OPTS+= libonly
endif