From 0c0815c8097bc607e3300a0c6ab6422e28b7b8c6 Mon Sep 17 00:00:00 2001 From: Ryan Hill Date: Wed, 9 May 2007 14:53:05 +0000 Subject: Fix parallel make race in ft2demos. (Portage version: 2.1.2.7) --- media-libs/freetype/ChangeLog | 7 +++- .../files/freetype-2.3.3-ft2demos-Makefile.patch | 47 ++++++++++++++++++++++ .../files/freetype-2.3.3-fttimer-noX.patch | 45 --------------------- media-libs/freetype/freetype-2.3.3.ebuild | 6 +-- 4 files changed, 55 insertions(+), 50 deletions(-) create mode 100644 media-libs/freetype/files/freetype-2.3.3-ft2demos-Makefile.patch delete mode 100644 media-libs/freetype/files/freetype-2.3.3-fttimer-noX.patch (limited to 'media-libs/freetype') diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog index f659335c1598..bffa2ba27310 100644 --- a/media-libs/freetype/ChangeLog +++ b/media-libs/freetype/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/freetype # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.132 2007/05/09 01:31:40 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.133 2007/05/09 14:53:05 dirtyepic Exp $ + + 09 May 2007; Ryan Hill + +files/freetype-2.3.3-ft2demos-Makefile.patch, + -files/freetype-2.3.3-fttimer-noX.patch, freetype-2.3.3.ebuild: + Fix parallel make race in ft2demos. 09 May 2007; Ryan Hill +files/freetype-2.3.3-fttimer-noX.patch, freetype-2.3.3.ebuild: diff --git a/media-libs/freetype/files/freetype-2.3.3-ft2demos-Makefile.patch b/media-libs/freetype/files/freetype-2.3.3-ft2demos-Makefile.patch new file mode 100644 index 000000000000..ece447615a02 --- /dev/null +++ b/media-libs/freetype/files/freetype-2.3.3-ft2demos-Makefile.patch @@ -0,0 +1,47 @@ +diff -Naur ft2demos-2.3.3-orig/Makefile ft2demos-2.3.3/Makefile +--- ft2demos-2.3.3-orig/Makefile 2007-05-09 08:45:56.000000000 -0600 ++++ ft2demos-2.3.3/Makefile 2007-05-09 08:47:23.000000000 -0600 +@@ -308,6 +308,9 @@ + $(OBJ_DIR_2)/ftmemchk.$(SO): $(SRC_DIR)/ftmemchk.c + $(COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<) + ++ $(OBJ_DIR_2)/fttimer.$(SO): $(SRC_DIR)/fttimer.c ++ $(COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<) ++ + $(OBJ_DIR_2)/fttry.$(SO): $(SRC_DIR)/fttry.c + $(COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<) + +@@ -338,10 +341,6 @@ + $(COMPILE) $(GRAPH_INCLUDES:%=$I%) \ + $T$(subst /,$(COMPILER_SEP),$@ $<) + +- $(OBJ_DIR_2)/fttimer.$(SO): $(SRC_DIR)/fttimer.c $(GRAPH_LIB) +- $(COMPILE) $(GRAPH_INCLUDES:%=$I%) \ +- $T$(subst /,$(COMPILER_SEP),$@ $<) +- + + # $(OBJ_DIR_2)/ftsbit.$(SO): $(SRC_DIR)/ftsbit.c $(GRAPH_LIB) + # $(COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<) +@@ -438,7 +437,10 @@ + $(BIN_DIR_2)/ftvalid$E: $(OBJ_DIR_2)/ftvalid.$(SO) $(FTLIB) $(COMMON_OBJ) + $(LINK_COMMON) + +- $(BIN_DIR_2)/ftdump$E: $(OBJ_DIR_2)/ftdump.$(SO) $(FTLIB) ++ $(BIN_DIR_2)/ftdump$E: $(OBJ_DIR_2)/ftdump.$(SO) $(FTLIB) $(COMMON_OBJ) ++ $(LINK_COMMON) ++ ++ $(BIN_DIR_2)/fttimer$E: $(OBJ_DIR_2)/fttimer.$(SO) $(FTLIB) $(COMMON_OBJ) + $(LINK_COMMON) + + $(BIN_DIR_2)/fttry$E: $(OBJ_DIR_2)/fttry.$(SO) $(FTLIB) +@@ -481,10 +483,6 @@ + $(GRAPH_LIB) $(COMMON_OBJ) $(FTCOMMON_OBJ) + $(LINK_NEW) + +- $(BIN_DIR_2)/fttimer$E: $(OBJ_DIR_2)/fttimer.$(SO) $(FTLIB) \ +- $(GRAPH_LIB) $(COMMON_OBJ) +- $(LINK_GRAPH) +- + + endif + diff --git a/media-libs/freetype/files/freetype-2.3.3-fttimer-noX.patch b/media-libs/freetype/files/freetype-2.3.3-fttimer-noX.patch deleted file mode 100644 index 4123f02ef08d..000000000000 --- a/media-libs/freetype/files/freetype-2.3.3-fttimer-noX.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -Naur ft2demos-2.3.3-orig/Makefile ft2demos-2.3.3/Makefile ---- ft2demos-2.3.3-orig/Makefile 2007-05-08 17:07:01.000000000 -0600 -+++ ft2demos-2.3.3/Makefile 2007-05-08 17:17:35.000000000 -0600 -@@ -308,6 +308,9 @@ - $(OBJ_DIR_2)/ftmemchk.$(SO): $(SRC_DIR)/ftmemchk.c - $(COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<) - -+ $(OBJ_DIR_2)/fttimer.$(SO): $(SRC_DIR)/fttimer.c -+ $(COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<) -+ - $(OBJ_DIR_2)/fttry.$(SO): $(SRC_DIR)/fttry.c - $(COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<) - -@@ -338,10 +341,6 @@ - $(COMPILE) $(GRAPH_INCLUDES:%=$I%) \ - $T$(subst /,$(COMPILER_SEP),$@ $<) - -- $(OBJ_DIR_2)/fttimer.$(SO): $(SRC_DIR)/fttimer.c $(GRAPH_LIB) -- $(COMPILE) $(GRAPH_INCLUDES:%=$I%) \ -- $T$(subst /,$(COMPILER_SEP),$@ $<) -- - - # $(OBJ_DIR_2)/ftsbit.$(SO): $(SRC_DIR)/ftsbit.c $(GRAPH_LIB) - # $(COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<) -@@ -441,6 +440,9 @@ - $(BIN_DIR_2)/ftdump$E: $(OBJ_DIR_2)/ftdump.$(SO) $(FTLIB) - $(LINK_COMMON) - -+ $(BIN_DIR_2)/fttimer$E: $(OBJ_DIR_2)/fttimer.$(SO) $(FTLIB) $(COMMON_OBJ) -+ $(LINK_COMMON) -+ - $(BIN_DIR_2)/fttry$E: $(OBJ_DIR_2)/fttry.$(SO) $(FTLIB) - $(LINK) - -@@ -481,10 +483,6 @@ - $(GRAPH_LIB) $(COMMON_OBJ) $(FTCOMMON_OBJ) - $(LINK_NEW) - -- $(BIN_DIR_2)/fttimer$E: $(OBJ_DIR_2)/fttimer.$(SO) $(FTLIB) \ -- $(GRAPH_LIB) $(COMMON_OBJ) -- $(LINK_GRAPH) -- - - endif - diff --git a/media-libs/freetype/freetype-2.3.3.ebuild b/media-libs/freetype/freetype-2.3.3.ebuild index a8ea86d75112..a2400baab4c0 100644 --- a/media-libs/freetype/freetype-2.3.3.ebuild +++ b/media-libs/freetype/freetype-2.3.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.3.3.ebuild,v 1.8 2007/05/09 01:31:40 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.3.3.ebuild,v 1.9 2007/05/09 14:53:05 dirtyepic Exp $ inherit eutils flag-o-matic libtool @@ -72,9 +72,7 @@ src_unpack() { ### ft2demos ### cd ../ft2demos-${PV} - # fttimer demo does not require X11. fix linking appropriately. - epatch "${FILESDIR}"/${P}-fttimer-noX.patch - + epatch "${FILESDIR}"/${P}-ft2demos-Makefile.patch sed -i -e "s:\.\.\/freetype2$:../freetype-${PV}:" Makefile # Disable tests needing X11 when USE="-X". (bug #177597) -- cgit v1.2.3-65-gdbad