Commit 9178347a authored by Eric Andersen's avatar Eric Andersen
Browse files

teach fontconfig to actually apply its patches

parent 8564ba68

package/fontconfig/fontconfig.mk

+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ fontconfig-source: $(DL_DIR)/$(FONTCONFIG_SOURCE) 


$(FONTCONFIG_DIR)/.unpacked: $(DL_DIR)/$(FONTCONFIG_SOURCE)

	$(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



$(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

	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



fontconfig: uclibc freetype $(TARGET_DIR)/lib/libfontconfig.so

package/fontconfig/libdir-la.patch

+2 −2
Original line number Diff line number Diff line 
--- fontconfig/builds/unix/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.orig	2006-04-20 08:27:27.000000000 -0600

+++ fontconfig/ltmain.sh	2007-01-13 14:26:01.000000000 -0700

@@ -273,8 +273,9 @@

 	# line option must be used.

 	if test -z "$tagname"; then