mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-02-09 01:27:34 -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
70 lines
2.5 KiB
Diff
70 lines
2.5 KiB
Diff
From 0f2c82f097cf6d3722b7793fe1159160f3f52725 Mon Sep 17 00:00:00 2001
|
|
From: Mike Gilbert <floppym@gentoo.org>
|
|
Date: Mon, 25 May 2015 12:08:47 -0400
|
|
Subject: [PATCH] Gentoo-specific packaging fixes
|
|
|
|
Fix cross-compiles
|
|
EPREFIX support
|
|
---
|
|
setup.py | 20 ++++----------------
|
|
1 file changed, 4 insertions(+), 16 deletions(-)
|
|
|
|
diff --git a/setup.py b/setup.py
|
|
index fc89513..8360e7e 100644
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -32,7 +32,7 @@ class CustomBuild(build):
|
|
class CustomInstall(install):
|
|
def run(self):
|
|
self.run_command('build_ext')
|
|
- self.do_egg_install()
|
|
+ install.run(self)
|
|
|
|
class _M2CryptoBuildExt(build_ext.build_ext):
|
|
'''Specialization of build_ext to enable swig_opts to inherit any
|
|
@@ -81,29 +81,19 @@ class _M2CryptoBuildExt(build_ext.build_ext):
|
|
|
|
build_ext.build_ext.finalize_options(self)
|
|
|
|
- self.add_multiarch_paths()
|
|
-
|
|
includeDir = os.path.join(self.openssl, 'include')
|
|
opensslIncludeDir = os.path.join(self.openssl, 'include', 'openssl')
|
|
opensslLibraryDir = os.path.join(self.openssl, 'lib')
|
|
|
|
- self.swig_opts = ['-I%s' % i for i in self.include_dirs + \
|
|
- [opensslIncludeDir, includeDir]]
|
|
+ eprefix = os.getenv('EPREFIX', '')
|
|
+ self.swig_opts = ['-I' + eprefix + '/usr/include']
|
|
self.swig_opts.append('-includeall')
|
|
self.swig_opts.append('-modern')
|
|
|
|
- # Fedora does hat tricks.
|
|
- if platform.linux_distribution()[0] in ['Fedora', 'CentOS']:
|
|
- if platform.architecture()[0] == '64bit':
|
|
- self.swig_opts.append('-D__x86_64__')
|
|
- elif platform.architecture()[0] == '32bit':
|
|
- self.swig_opts.append('-D__i386__')
|
|
-
|
|
self.swig_opts.append('-outdir')
|
|
self.swig_opts.append(os.path.join(os.getcwd(),'M2Crypto'))
|
|
|
|
- self.include_dirs += [os.path.join(self.openssl, opensslIncludeDir),
|
|
- os.path.join(os.getcwd(), 'SWIG')]
|
|
+ self.include_dirs += [os.path.join(os.getcwd(), 'SWIG')]
|
|
|
|
if sys.platform == 'cygwin':
|
|
# Cygwin SHOULD work (there's code in distutils), but
|
|
@@ -113,8 +103,6 @@ class _M2CryptoBuildExt(build_ext.build_ext):
|
|
# Someday distutils will be fixed and this won't be needed.
|
|
self.library_dirs += [os.path.join(self.openssl, 'bin')]
|
|
|
|
- self.library_dirs += [os.path.join(self.openssl, opensslLibraryDir)]
|
|
-
|
|
if sys.platform == 'darwin':
|
|
my_extra_compile_args = ["-Wno-deprecated-declarations"]
|
|
else:
|
|
--
|
|
2.4.1
|
|
|