teach fontconfig to actually apply its patches

This commit is contained in:
Eric Andersen 2007-01-15 21:26:43 +00:00
parent 8564ba689d
commit 9178347a60
2 changed files with 6 additions and 2 deletions

View File

@ -16,6 +16,8 @@ fontconfig-source: $(DL_DIR)/$(FONTCONFIG_SOURCE)
$(FONTCONFIG_DIR)/.unpacked: $(DL_DIR)/$(FONTCONFIG_SOURCE) $(FONTCONFIG_DIR)/.unpacked: $(DL_DIR)/$(FONTCONFIG_SOURCE)
$(FONTCONFIG_CAT) $(DL_DIR)/$(FONTCONFIG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - $(FONTCONFIG_CAT) $(DL_DIR)/$(FONTCONFIG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(FONTCONFIG_DIR) package/fontconfig/ \*.patch*
$(CONFIG_UPDATE) $(FONTCONFIG_DIR)
touch $(FONTCONFIG_DIR)/.unpacked touch $(FONTCONFIG_DIR)/.unpacked
$(FONTCONFIG_DIR)/.configured: $(FONTCONFIG_DIR)/.unpacked $(FONTCONFIG_DIR)/.configured: $(FONTCONFIG_DIR)/.unpacked
@ -54,6 +56,8 @@ $(STAGING_DIR)/lib/libfontconfig.so: $(FONTCONFIG_DIR)/.compiled
$(TARGET_DIR)/lib/libfontconfig.so: $(STAGING_DIR)/lib/libfontconfig.so $(TARGET_DIR)/lib/libfontconfig.so: $(STAGING_DIR)/lib/libfontconfig.so
cp -dpf $(STAGING_DIR)/lib/libfontconfig.so* $(TARGET_DIR)/lib/ cp -dpf $(STAGING_DIR)/lib/libfontconfig.so* $(TARGET_DIR)/lib/
mkdir -p $(TARGET_DIR)/etc/fonts
cp $(STAGING_DIR)/etc/fonts/fonts.conf $(TARGET_DIR)/etc/fonts/
-$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libfontconfig.so -$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libfontconfig.so
fontconfig: uclibc freetype $(TARGET_DIR)/lib/libfontconfig.so fontconfig: uclibc freetype $(TARGET_DIR)/lib/libfontconfig.so

View File

@ -1,5 +1,5 @@
--- fontconfig/builds/unix/ltmain.sh.orig 2006-04-20 08:27:27.000000000 -0600 --- fontconfig/ltmain.sh.orig 2006-04-20 08:27:27.000000000 -0600
+++ fontconfig/builds/unix/ltmain.sh 2007-01-13 14:26:01.000000000 -0700 +++ fontconfig/ltmain.sh 2007-01-13 14:26:01.000000000 -0700
@@ -273,8 +273,9 @@ @@ -273,8 +273,9 @@
# line option must be used. # line option must be used.
if test -z "$tagname"; then if test -z "$tagname"; then