diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2010-03-19 17:04:43 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2010-03-19 17:04:43 +0000 |
| commit | 7555e18aa15eb3514b6eb8009e49e6c29a05e1cf (patch) | |
| tree | c4fcadc7fe1b324a7c107e77fe153d398e8008c3 /dev-python/pygobject/files | |
| parent | whitespace (diff) | |
| download | historical-7555e18aa15eb3514b6eb8009e49e6c29a05e1cf.tar.gz historical-7555e18aa15eb3514b6eb8009e49e6c29a05e1cf.tar.bz2 historical-7555e18aa15eb3514b6eb8009e49e6c29a05e1cf.zip | |
Fix bug 299680
Package-Manager: portage-2.1.7.17/cvs/Linux x86_64
Diffstat (limited to 'dev-python/pygobject/files')
| -rw-r--r-- | dev-python/pygobject/files/pygobject-2.20.0-tmpdir-makefile.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/dev-python/pygobject/files/pygobject-2.20.0-tmpdir-makefile.patch b/dev-python/pygobject/files/pygobject-2.20.0-tmpdir-makefile.patch new file mode 100644 index 000000000000..11d326e97359 --- /dev/null +++ b/dev-python/pygobject/files/pygobject-2.20.0-tmpdir-makefile.patch @@ -0,0 +1,50 @@ +From 4e2efa91d101bf755739e1cca8eee41eb0ad20fd Mon Sep 17 00:00:00 2001 +From: Gian Mario Tagliaretti <gianmt@gnome.org> +Date: Mon, 04 Jan 2010 07:35:14 +0000 +Subject: Bug 605937 - pygobject: Makefile.am sets $TMPDIR, disrupting distcc + +Committed a patch from Kevin Pyle +--- +diff --git a/Makefile.am b/Makefile.am +index 93442af..580b489 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -55,23 +55,22 @@ uninstall-local: + rm -f $(DESTDIR)$(pythondir)/pygtk.pth $(DESTDIR)$(pyexecdir)/pygtk.pth + + EGG_NAME = $(PACKAGE)-$(PACKAGE_VERSION)-py$(PYTHON_VERSION)-$(PLATFORM).egg +-TMPDIR = `pwd`/$(PACKAGE)-$(PACKAGE_VERSION) + ++egg: EGG_TMPDIR:=$(TMPDIR)/$(PACKAGE)-$(PACKAGE_VERSION) + egg: $(top_srcdir)/gobject/gobject.la PKG-INFO +- rm -fr $(TMPDIR) ++ rm -fr $(EGG_TMPDIR) + echo $(EGG_NAME) +- mkdir -p $(TMPDIR) +- mkdir -p $(TMPDIR)/EGG-INFO +- make -C gobject install-pkgpyexecLTLIBRARIES pkgpyexecdir=$(TMPDIR) +- $(INSTALL) dsextras.py $(TMPDIR) +- rm -fr $(TMPDIR)/gobject.la +- $(INSTALL) PKG-INFO $(TMPDIR)/EGG-INFO +- echo "gobject.so" >> $(TMPDIR)/EGG-INFO/native_libs.txt +- echo "gobject" >> $(TMPDIR)/EGG-INFO/top_level.txt +- echo "dsextras.py" >> $(TMPDIR)/EGG-INFO/top_level.txt +- cd $(TMPDIR) && zip -rq $(EGG_NAME) . +- mv $(TMPDIR)/$(EGG_NAME) . +- rm -fr $(TMPDIR) ++ $(MKDIR_P) $(EGG_TMPDIR) ++ $(MKDIR_P) $(EGG_TMPDIR)/EGG-INFO ++ $(MAKE) -C gobject install-pkgpyexecLTLIBRARIES pkgpyexecdir=$(EGG_TMPDIR) ++ $(INSTALL) dsextras.py $(EGG_TMPDIR) ++ rm -fr $(EGG_TMPDIR)/gobject.la ++ $(INSTALL) PKG-INFO $(EGG_TMPDIR)/EGG-INFO ++ echo "gobject.so" >> $(EGG_TMPDIR)/EGG-INFO/native_libs.txt ++ ( echo "gobject" ; echo "dsextras.py" ) >> $(EGG_TMPDIR)/EGG-INFO/top_level.txt ++ cd $(EGG_TMPDIR) && zip -rq $(EGG_NAME) . ++ mv $(EGG_TMPDIR)/$(EGG_NAME) . ++ rm -fr $(EGG_TMPDIR) + + doc-dist: + mkdir pygobject +-- +cgit v0.8.3.1 |