mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-01-12 04:17:26 -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
60 lines
2.2 KiB
Diff
60 lines
2.2 KiB
Diff
From 7824fd5291f570de3c2c64185035d1a6a0a3445a Mon Sep 17 00:00:00 2001
|
|
From: Alexandre Rostovtsev <tetromino@gentoo.org>
|
|
Date: Mon, 13 Aug 2012 04:42:47 -0400
|
|
Subject: [PATCH] Replace horrible slow python libs search
|
|
|
|
---
|
|
acinclude.m4 | 36 ++----------------------------------
|
|
1 files changed, 2 insertions(+), 34 deletions(-)
|
|
|
|
diff --git a/acinclude.m4 b/acinclude.m4
|
|
index 8694a65..f5373eb 100644
|
|
--- a/acinclude.m4
|
|
+++ b/acinclude.m4
|
|
@@ -59,40 +59,8 @@ $1],dnl
|
|
[AC_MSG_RESULT(not found)
|
|
$2])
|
|
CPPFLAGS="$save_CPPFLAGS"
|
|
-
|
|
- # This bit is copied from Planner. murrayc.
|
|
- # Check for Python library path
|
|
- AC_MSG_CHECKING([for Python library path])
|
|
-
|
|
- # Win32 has libpython25.a instead of libpython2.5.a, so we look
|
|
- # for both. TODO: Only look for libpython25.a on Windows, and for
|
|
- # libpython2.5.a on unix.
|
|
- WIN32_PYTHON_VERSION=`echo $PYTHON_VERSION | sed "s,\.,,"`
|
|
-
|
|
- python_path=`dirname $PYTHON | sed "s,/bin.*$,,"`
|
|
- for i in "$python_path/lib/python$PYTHON_VERSION/config/" "$python_path/lib/python$PYTHON_VERSION/" "$python_path/lib/python/config/" "$python_path/lib/python/" "$python_path/" ; do
|
|
- if test -e "$i"; then
|
|
- python_path=`find $i -type f -name libpython$PYTHON_VERSION.* -print | sed "1q"`
|
|
- if test -n "$python_path" ; then
|
|
- python_lib="python$PYTHON_VERSION"
|
|
- break
|
|
- fi
|
|
-
|
|
- # Additionally test WIN32_PYTHON_VERSION
|
|
- python_path=`find $i -type f -name libpython$WIN32_PYTHON_VERSION.* -print | sed "1q"`
|
|
- if test -n "$python_path" ; then
|
|
- python_lib="python$WIN32_PYTHON_VERSION"
|
|
- break
|
|
- fi
|
|
- fi
|
|
- done
|
|
-
|
|
- python_path=`echo $python_path | sed "s,/libpython.*$,,"`
|
|
- AC_MSG_RESULT([$python_path])
|
|
- if test -z "$python_path" ; then
|
|
- AC_MSG_ERROR([cannot find Python library path])
|
|
- fi
|
|
- AC_SUBST([PYTHON_LDFLAGS],["-L$python_path -l$python_lib"])
|
|
+PYTHON_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; print('-L%s -lpython${PYTHON_VERSION}' % distutils.sysconfig.get_config_var('LIBDIR'))"`
|
|
+AC_SUBST([PYTHON_LDFLAGS],["$PYTHON_LDFLAGS"])
|
|
])
|
|
|
|
dnl
|
|
--
|
|
1.7.8.6
|
|
|