diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2008-06-11 11:34:50 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2008-06-11 11:34:50 +0000 |
| commit | b141010d2b4cf833e073a9ff5969e46913be4c6b (patch) | |
| tree | 4ed699d84a22d70add6a613dfbd20fc9236d6ff1 /rules/freetype.make | |
| parent | d5d9cac7cb36854ad4b34f15b8b95723c2555143 (diff) | |
| download | ptxdist-b141010d2b4cf833e073a9ff5969e46913be4c6b.tar.gz ptxdist-b141010d2b4cf833e073a9ff5969e46913be4c6b.tar.xz | |
* rules/freetype.make, patches/freetype-2.3.4, patches/freetype-2.3.6:
version bump -> 2.3.6
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@8487 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/freetype.make')
| -rw-r--r-- | rules/freetype.make | 62 |
1 files changed, 10 insertions, 52 deletions
diff --git a/rules/freetype.make b/rules/freetype.make index 947746f1f..c2f7bc256 100644 --- a/rules/freetype.make +++ b/rules/freetype.make @@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_FREETYPE) += freetype # # Paths and names # -FREETYPE_VERSION := 2.3.4 +FREETYPE_VERSION := 2.3.6 FREETYPE := freetype-$(FREETYPE_VERSION) FREETYPE_SUFFIX := tar.bz2 FREETYPE_URL := http://download.savannah.gnu.org/releases/freetype/$(FREETYPE).$(FREETYPE_SUFFIX) @@ -29,30 +29,11 @@ FREETYPE_DIR := $(BUILDDIR)/$(FREETYPE) # Get # ---------------------------------------------------------------------------- -freetype_get: $(STATEDIR)/freetype.get - -$(STATEDIR)/freetype.get: - @$(call targetinfo, $@) - @$(call touch, $@) - $(FREETYPE_SOURCE): - @$(call targetinfo, $@) + @$(call targetinfo) @$(call get, FREETYPE) # ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -freetype_extract: $(STATEDIR)/freetype.extract - -$(STATEDIR)/freetype.extract: - @$(call targetinfo, $@) - @$(call clean, $(FREETYPE_DIR)) - @$(call extract, FREETYPE) - @$(call patchin, FREETYPE) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- @@ -66,46 +47,23 @@ FREETYPE_ENV := $(CROSS_ENV) # FREETYPE_AUTOCONF := $(CROSS_AUTOCONF_USR) -$(STATEDIR)/freetype.prepare: - @$(call targetinfo, $@) - cd $(FREETYPE_DIR) && \ - $(FREETYPE_PATH) $(FREETYPE_ENV) \ - ./configure $(FREETYPE_AUTOCONF) - @$(call touch, $@) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -freetype_compile: $(STATEDIR)/freetype.compile - -$(STATEDIR)/freetype.compile: - @$(call targetinfo, $@) - cd $(FREETYPE_DIR) && \ - $(FREETYPE_PATH) $(MAKE) $(PARALLELMFLAGS) - @$(call touch, $@) - # ---------------------------------------------------------------------------- # Install # ---------------------------------------------------------------------------- -freetype_install: $(STATEDIR)/freetype.install - $(STATEDIR)/freetype.install: - @$(call targetinfo, $@) + @$(call targetinfo) @$(call install, FREETYPE) $(INSTALL) -m 755 -D $(FREETYPE_DIR)/builds/unix/freetype-config \ $(PTXCONF_SYSROOT_CROSS)/bin/freetype-config - @$(call touch, $@) + @$(call touch) # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- -freetype_targetinstall: $(STATEDIR)/freetype.targetinstall - $(STATEDIR)/freetype.targetinstall: - @$(call targetinfo, $@) + @$(call targetinfo) @$(call install_init, freetype) @$(call install_fixup, freetype,PACKAGE,freetype) @@ -117,14 +75,14 @@ $(STATEDIR)/freetype.targetinstall: @$(call install_fixup, freetype,DESCRIPTION,missing) @$(call install_copy, freetype, 0, 0, 0644, \ - $(FREETYPE_DIR)/objs/.libs/libfreetype.so.6.3.15, \ - /usr/lib/libfreetype.so.6.3.15) - @$(call install_link, freetype, libfreetype.so.6.3.15, /usr/lib/libfreetype.so.6) - @$(call install_link, freetype, libfreetype.so.6.3.15, /usr/lib/libfreetype.so) + $(FREETYPE_DIR)/objs/.libs/libfreetype.so.6.3.17, \ + /usr/lib/libfreetype.so.6.3.17) + @$(call install_link, freetype, libfreetype.so.6.3.17, /usr/lib/libfreetype.so.6) + @$(call install_link, freetype, libfreetype.so.6.3.16, /usr/lib/libfreetype.so) @$(call install_finish, freetype) - @$(call touch, $@) + @$(call touch) # ---------------------------------------------------------------------------- # Clean |