pango: generate pango.modules at build time rather than run time

Generate pango.modules using the host tools instead of setting up an init
script to do it at run time. Also apply patches to host build to get
identical pango.modules file.
This commit is contained in:
Peter Korsgaard 2009-03-18 22:39:09 +00:00
parent d20a2eb972
commit dc69684e58
2 changed files with 4 additions and 21 deletions

View File

@ -1,20 +0,0 @@
#! /bin/sh
#
# run pango-querymodules if needed
FILE=/etc/pango/pango.modules
case "$1" in
start|"")
if [ ! -f "$FILE" ] ; then
mkdir -p /etc/pango
/usr/bin/pango-querymodules > "$FILE"
fi
;;
stop)
;;
*)
echo "Usage: $0 {start|stop}" >&2
exit 1
;;
esac

View File

@ -57,7 +57,9 @@ PANGO_DEPENDENCIES = uclibc gettext libintl host-pkgconfig libglib2 $(XSERVER) c
$(eval $(call AUTOTARGETS,package,pango)) $(eval $(call AUTOTARGETS,package,pango))
$(PANGO_HOOK_POST_INSTALL): $(PANGO_HOOK_POST_INSTALL):
$(INSTALL) -m 755 package/pango/S25pango $(TARGET_DIR)/etc/init.d/ mkdir -p $(TARGET_DIR)/etc/pango
$(PANGO_HOST_BINARY) > $(TARGET_DIR)/etc/pango/pango.modules
$(SED) 's~$(HOST_DIR)~~g' $(TARGET_DIR)/etc/pango/pango.modules
touch $@ touch $@
# pango for the host # pango for the host
@ -68,6 +70,7 @@ $(PANGO_HOST_DIR)/.unpacked: $(DL_DIR)/$(PANGO_SOURCE)
mkdir -p $(@D) mkdir -p $(@D)
$(INFLATE$(suffix $(PANGO_SOURCE))) $< | \ $(INFLATE$(suffix $(PANGO_SOURCE))) $< | \
$(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) - $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(@D) package/pango/ \*.patch
touch $@ touch $@
$(PANGO_HOST_DIR)/.configured: $(PANGO_HOST_DIR)/.unpacked $(PKGCONFIG_HOST_BINARY) $(CAIRO_HOST_BINARY) $(LIBGLIB2_HOST_BINARY) $(PANGO_HOST_DIR)/.configured: $(PANGO_HOST_DIR)/.unpacked $(PKGCONFIG_HOST_BINARY) $(CAIRO_HOST_BINARY) $(LIBGLIB2_HOST_BINARY)