summaryrefslogtreecommitdiff
path: root/package/cairo/Makefile
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-10-21 17:25:35 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2013-10-21 17:25:35 +0200
commit98b7adfbd06f0f6bd99ca4805ca34250ee027fa1 (patch)
treea68345ba8ba7ee532e4b7426cadad31d7add24c0 /package/cairo/Makefile
parent09d28322f4828a387eeee03d303c833eab8828c5 (diff)
parent32a82e38679501da738199135b35f93ddc8aca0a (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/cairo/Makefile')
-rw-r--r--package/cairo/Makefile12
1 files changed, 4 insertions, 8 deletions
diff --git a/package/cairo/Makefile b/package/cairo/Makefile
index c0a4b5530..7483bb7e2 100644
--- a/package/cairo/Makefile
+++ b/package/cairo/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= cairo
PKG_VERSION:= 1.10.2
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= f101a9e88b783337b20b2e26dfd26d5f
PKG_DESCR:= cairo graphics library
PKG_SECTION:= libs
@@ -15,23 +15,19 @@ PKG_BUILDDEP:= libpng pixman freetype fontconfig libX11 libXrender glib
PKG_BUILDDEP+= libXext
PKG_URL:= http://cairographics.org/
PKG_SITES:= http://cairographics.org/releases/
+PKG_OPTS:= dev
PKG_ARCH_DEPENDS:= !m68k
#DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz
-PKG_SUBPKGS:= CAIRO CAIRO_DEV
-PKGSC_CAIRO_DEV:= devel
-PKGSD_CAIRO_DEV:= cairo headers
-
ifeq ($(ADK_STATIC),y)
-PKG_OPTS:= libonly
+PKG_OPTS+= libonly
endif
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,CAIRO_DEV,cairo-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_CAIRO_DEV},${PKGSC_CAIRO_DEV},${PKG_OPTS}))
+$(eval $(call PKG_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS},${PKG_OPTS}))
ifeq (,$(filter arm,$(TARGET_ARCH)))
TARGET_CFLAGS:= $(filter-out -Os,$(TARGET_CFLAGS))