mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-02-01 10:57: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
46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
https://bitbucket.org/lgautier/rpy2/commits/bf38fa9960aa
|
|
# HG changeset patch
|
|
# User Laurent Gautier <lgautier@gmail.com>
|
|
# Date 1415656651 18000
|
|
# Node ID bf38fa9960aacf7ba24a20cfae631aa695fea986
|
|
# Parent 9c1212066f5c980a211b21943f62fd69743ca4bd
|
|
Should fix issue #234
|
|
|
|
diff --git a/setup.py b/setup.py
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -136,8 +136,6 @@
|
|
return output
|
|
|
|
def getRinterface_ext():
|
|
- #r_libs = [os.path.join(RHOME, 'lib'), os.path.join(RHOME, 'modules')]
|
|
- r_libs = []
|
|
extra_link_args = []
|
|
extra_compile_args = []
|
|
include_dirs = []
|
|
@@ -250,9 +248,9 @@
|
|
include_dirs = [os.path.join(package_prefix,
|
|
'rpy', 'rinterface'),] + include_dirs,
|
|
libraries = libraries,
|
|
- library_dirs = r_libs,
|
|
+ library_dirs = library_dirs,
|
|
define_macros = define_macros,
|
|
- runtime_library_dirs = r_libs,
|
|
+ runtime_library_dirs = library_dirs,
|
|
extra_compile_args=extra_compile_args,
|
|
extra_link_args = extra_link_args
|
|
)
|
|
@@ -266,9 +264,9 @@
|
|
include_dirs = include_dirs +
|
|
[os.path.join('rpy', 'rinterface'), ],
|
|
libraries = libraries,
|
|
- library_dirs = r_libs,
|
|
+ library_dirs = library_dirs,
|
|
define_macros = define_macros,
|
|
- runtime_library_dirs = r_libs,
|
|
+ runtime_library_dirs = library_dirs,
|
|
extra_compile_args=extra_compile_args,
|
|
extra_link_args = extra_link_args
|
|
)
|
|
|