Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.buildout
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
6
Merge Requests
6
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
slapos.buildout
Commits
fcd1dd40
Commit
fcd1dd40
authored
Jan 07, 2015
by
Tres Seaver
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Avoid prefixing buildout dir to 'special' rpath elements.
Fixes #225.
parent
f4dad6b6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
1 deletion
+20
-1
zc.recipe.egg_/src/zc/recipe/egg/custom.py
zc.recipe.egg_/src/zc/recipe/egg/custom.py
+20
-1
No files found.
zc.recipe.egg_/src/zc/recipe/egg/custom.py
View file @
fcd1dd40
...
@@ -130,7 +130,7 @@ class Develop(Base):
...
@@ -130,7 +130,7 @@ class Develop(Base):
def
build_ext
(
buildout
,
options
):
def
build_ext
(
buildout
,
options
):
result
=
{}
result
=
{}
for
be_option
in
(
'include-dirs'
,
'library-dirs'
,
'rpath'
):
for
be_option
in
(
'include-dirs'
,
'library-dirs'
):
value
=
options
.
get
(
be_option
)
value
=
options
.
get
(
be_option
)
if
value
is
None
:
if
value
is
None
:
continue
continue
...
@@ -145,6 +145,25 @@ def build_ext(buildout, options):
...
@@ -145,6 +145,25 @@ def build_ext(buildout, options):
result
[
be_option
]
=
os
.
pathsep
.
join
(
value
)
result
[
be_option
]
=
os
.
pathsep
.
join
(
value
)
options
[
be_option
]
=
os
.
pathsep
.
join
(
value
)
options
[
be_option
]
=
os
.
pathsep
.
join
(
value
)
# rpath has special symbolic dirnames which must not be prefixed
# with the buildout dir. See:
# http://man7.org/linux/man-pages/man8/ld.so.8.html
RPATH_SPECIAL
=
[
'$ORIGIN'
,
'$LIB'
,
'$PLATFORM'
,
'${ORIGIN}'
,
'${LIB}'
,
'${PLATFORM}'
]
def
_prefix_non_special
(
x
):
x
=
x
.
strip
()
for
special
in
RPATH_SPECIAL
:
if
x
.
startswith
(
special
):
return
x
return
os
.
path
.
join
(
buildout
[
'buildout'
][
'directory'
],
x
)
value
=
options
.
get
(
'rpath'
)
if
value
is
not
None
:
values
=
[
_prefix_non_special
(
v
)
for
v
in
value
.
strip
().
split
(
'
\
n
'
)
if
v
.
strip
()]
result
[
'rpath'
]
=
os
.
pathsep
.
join
(
value
)
options
[
'rpath'
]
=
os
.
pathsep
.
join
(
value
)
swig
=
options
.
get
(
'swig'
)
swig
=
options
.
get
(
'swig'
)
if
swig
:
if
swig
:
options
[
'swig'
]
=
result
[
'swig'
]
=
os
.
path
.
join
(
options
[
'swig'
]
=
result
[
'swig'
]
=
os
.
path
.
join
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment