diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-21 17:25:35 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-21 17:25:35 +0200 |
| commit | 98b7adfbd06f0f6bd99ca4805ca34250ee027fa1 (patch) | |
| tree | a68345ba8ba7ee532e4b7426cadad31d7add24c0 /package/fontconfig/Makefile | |
| parent | 09d28322f4828a387eeee03d303c833eab8828c5 (diff) | |
| parent | 32a82e38679501da738199135b35f93ddc8aca0a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/fontconfig/Makefile')
| -rw-r--r-- | package/fontconfig/Makefile | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/package/fontconfig/Makefile b/package/fontconfig/Makefile index 72e996001..b06835552 100644 --- a/package/fontconfig/Makefile +++ b/package/fontconfig/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= fontconfig PKG_VERSION:= 2.10.91 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 0a8edc63aa79377b2bf44e469d5bbbb7 PKG_DESCR:= library for configuring and customizing font access PKG_SECTION:= libs @@ -13,19 +13,15 @@ PKG_DEPENDS:= libxml2 libiconv PKG_BUILDDEP:= freetype libxml2 libiconv PKG_URL:= http://fontconfig.org/ PKG_SITES:= http://fontconfig.org/release/ - -PKG_SUBPKGS:= FONTCONFIG FONTCONFIG_DEV -PKGSD_FONTCONFIG_DEV:= configuring and customizing font access headers -PKGSC_FONTCONFIG_DEV:= devel +PKG_OPTS:= dev ifeq ($(ADK_STATIC),y) -PKG_OPTS:= libonly +PKG_OPTS+= libonly endif include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,FONTCONFIG,fontconfig,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -$(eval $(call PKG_template,FONTCONFIG_DEV,fontconfig-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FONTCONFIG_DEV},${PKGSC_FONTCONFIG_DEV},${PKG_OPTS})) TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) TARGET_LDFLAGS+= -liconv @@ -38,12 +34,4 @@ fontconfig-install: ${CP} ${WRKINST}/usr/lib/libfontconfig.so* ${IDIR_FONTCONFIG}/usr/lib $(CP) ${WRKINST}/etc/fonts/* ${IDIR_FONTCONFIG}/etc/fonts -fontconfig-dev-install: - ${INSTALL_DIR} ${IDIR_FONTCONFIG_DEV}/usr/lib/pkgconfig - ${CP} ${WRKINST}/usr/lib/pkgconfig/fontconfig.pc \ - ${IDIR_FONTCONFIG_DEV}/usr/lib/pkgconfig - ${INSTALL_DIR} ${IDIR_FONTCONFIG_DEV}/usr/include - ${CP} ${WRKINST}/usr/include/* \ - ${IDIR_FONTCONFIG_DEV}/usr/include - include ${TOPDIR}/mk/pkg-bottom.mk |