mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-01-20 19:07:28 -08:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
From c4072ed7bc923039e544319f52d0761b7a4600a4 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
|
|
Date: Mon, 22 Apr 2013 18:02:37 +0200
|
|
Subject: [PATCH] Trigger 'EGGing' mode only by 'bdist_egg' and not 'egg_info'.
|
|
|
|
We use the 'egg_info' command to explicitly enforce temporary EGG file
|
|
location outside the source tree on Gentoo. As a result, our build
|
|
command activates the 'EGGing' mode and wxPython is not installed
|
|
properly.
|
|
|
|
I believe that the 'EGGing' mode should be activated only by an explicit
|
|
call to 'bdist_egg' command where the expected files are actually
|
|
created. The 'egg_info' command is a more broad one and is often used
|
|
implicitly, e.g. by the 'install' command.
|
|
---
|
|
config.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/config.py b/config.py
|
|
index 4fbd83f..b45707d 100644
|
|
--- a/config.py
|
|
+++ b/config.py
|
|
@@ -23,7 +23,7 @@
|
|
import sys, os, glob, fnmatch, tempfile
|
|
import subprocess
|
|
|
|
-EGGing = 'bdist_egg' in sys.argv or 'egg_info' in sys.argv
|
|
+EGGing = 'bdist_egg' in sys.argv
|
|
if not EGGing:
|
|
from distutils.core import setup, Extension
|
|
else:
|
|
--
|
|
1.8.1.5
|
|
|