mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-02-11 14:17:27 -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
37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
use pkg-config to find libxml2/libxslt details rather than xxx-config scripts
|
|
|
|
--- a/setupinfo.py
|
|
+++ b/setupinfo.py
|
|
@@ -87,19 +87,6 @@ def ext_modules(static_include_dirs, static_library_dirs,
|
|
source_extension = ".c"
|
|
print("Building without Cython.")
|
|
|
|
- lib_versions = get_library_versions()
|
|
- versions_ok = True
|
|
- if lib_versions[0]:
|
|
- print("Using build configuration of libxml2 %s and libxslt %s" %
|
|
- lib_versions)
|
|
- versions_ok = check_min_version(lib_versions[0], (2, 7, 0), 'libxml2')
|
|
- else:
|
|
- print("Using build configuration of libxslt %s" %
|
|
- lib_versions[1])
|
|
- versions_ok |= check_min_version(lib_versions[1], (1, 1, 23), 'libxslt')
|
|
- if not versions_ok:
|
|
- raise RuntimeError("Dependency missing")
|
|
-
|
|
_include_dirs = include_dirs(static_include_dirs)
|
|
_library_dirs = library_dirs(static_library_dirs)
|
|
_cflags = cflags(static_cflags)
|
|
@@ -310,8 +297,9 @@ def get_library_versions():
|
|
|
|
|
|
def flags(option):
|
|
- xml2_flags = run_command(find_xml2_config(), "--%s" % option)
|
|
- xslt_flags = run_command(find_xslt_config(), "--%s" % option)
|
|
+ pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config')
|
|
+ xml2_flags = run_command(pkg_config, 'libxml-2.0', '--%s' % option)
|
|
+ xslt_flags = run_command(pkg_config, 'libxxlt', '--%s' % option)
|
|
|
|
flag_list = xml2_flags.split()
|
|
for flag in xslt_flags.split():
|