summaryrefslogtreecommitdiffstats
path: root/meta/packages/fontconfig
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/fontconfig')
-rw-r--r--meta/packages/fontconfig/fontconfig-native_2.6.0.bb10
-rw-r--r--meta/packages/fontconfig/fontconfig_2.6.0.bb18
2 files changed, 9 insertions, 19 deletions
diff --git a/meta/packages/fontconfig/fontconfig-native_2.6.0.bb b/meta/packages/fontconfig/fontconfig-native_2.6.0.bb
index b91e5fbfa7..03a1bc86c2 100644
--- a/meta/packages/fontconfig/fontconfig-native_2.6.0.bb
+++ b/meta/packages/fontconfig/fontconfig-native_2.6.0.bb
@@ -5,10 +5,8 @@ DEPENDS = "freetype-native expat-native zlib-native"
5EXTRA_OEMAKE = "" 5EXTRA_OEMAKE = ""
6EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1))]}" 6EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1))]}"
7 7
8do_stage () { 8do_install_append () {
9 oe_runmake install 9 install -d ${D}${bindir}/
10 install fc-lang/fc-lang ${STAGING_BINDIR} 10 install fc-lang/fc-lang ${D}${bindir}/
11 install fc-glyphname/fc-glyphname ${STAGING_BINDIR} 11 install fc-glyphname/fc-glyphname ${D}${bindir}/
12 install -d ${STAGING_LIBDIR}/pkgconfig/
13 install -m 0644 fontconfig.pc ${STAGING_LIBDIR}/pkgconfig/
14} 12}
diff --git a/meta/packages/fontconfig/fontconfig_2.6.0.bb b/meta/packages/fontconfig/fontconfig_2.6.0.bb
index 3a26fd49b4..d9697432ed 100644
--- a/meta/packages/fontconfig/fontconfig_2.6.0.bb
+++ b/meta/packages/fontconfig/fontconfig_2.6.0.bb
@@ -21,7 +21,7 @@ DEBIAN_NOAUTONAME_fontconfig-utils = "1"
21 21
22PARALLEL_MAKE = "" 22PARALLEL_MAKE = ""
23 23
24inherit autotools pkgconfig 24inherit autotools_stage pkgconfig
25 25
26export HASDOCBOOK="no" 26export HASDOCBOOK="no"
27 27
@@ -40,14 +40,6 @@ python do_unpack () {
40 bb.build.exec_func('fontconfig_do_unpack', d) 40 bb.build.exec_func('fontconfig_do_unpack', d)
41} 41}
42 42
43do_stage () {
44 oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR}
45 install -d ${STAGING_INCDIR}/fontconfig
46 for i in ${S}/fontconfig/*.h; do install -m 0644 $i ${STAGING_INCDIR}/fontconfig/; done
47 install -d ${STAGING_LIBDIR}/pkgconfig/
48 install -m 0644 fontconfig.pc ${STAGING_LIBDIR}/pkgconfig/
49}
50
51BUILD_CFLAGS += " -I${STAGING_INCDIR}/freetype2" 43BUILD_CFLAGS += " -I${STAGING_INCDIR}/freetype2"
52 44
53do_configure_append () { 45do_configure_append () {
@@ -78,10 +70,10 @@ do_install () {
78} 70}
79 71
80do_install_append() { 72do_install_append() {
81 install -d ${D}/etc/default/volatiles 73 install -d ${D}${sysconfdir}/default/volatiles
82 install -m 0644 ${WORKDIR}/97_fontconfig ${D}/etc/default/volatiles 74 install -m 0644 ${WORKDIR}/97_fontconfig ${D}${sysconfdir}/default/volatiles
83 rmdir ${D}/var/cache/fontconfig 75 rmdir ${D}${localstatedir}/cache/fontconfig
84 rmdir ${D}/var/cache/ 76 rmdir ${D}${localstatedir}/cache/
85} 77}
86 78
87pkg_postinst_hal () { 79pkg_postinst_hal () {