Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ophélie Gagnard
slapos
Commits
1628ff3c
Commit
1628ff3c
authored
Sep 02, 2015
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
python-ldap: remove hardcoded rpaths, that come before our specified rpaths.
parent
7e492a87
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
1 deletion
+14
-1
component/python-ldap-python/buildout.cfg
component/python-ldap-python/buildout.cfg
+3
-0
component/python-ldap-python/python-ldap-no_default_dirs.patch
...nent/python-ldap-python/python-ldap-no_default_dirs.patch
+10
-0
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+1
-1
No files found.
component/python-ldap-python/buildout.cfg
View file @
1628ff3c
...
@@ -9,6 +9,9 @@ extends =
...
@@ -9,6 +9,9 @@ extends =
[python-ldap-python]
[python-ldap-python]
recipe = zc.recipe.egg:custom
recipe = zc.recipe.egg:custom
egg = python-ldap
egg = python-ldap
patches =
${:_profile_base_location_}/python-ldap-no_default_dirs.patch#959115f13f1de5c63654c69b8dfacd69
patch-options = -p1
rpath =
rpath =
${openldap:location}/lib
${openldap:location}/lib
${cyrus-sasl:location}/lib
${cyrus-sasl:location}/lib
...
...
component/python-ldap-python/python-ldap-no_default_dirs.patch
0 → 100644
View file @
1628ff3c
diff -ur python-ldap-2.4.20.orig/setup.cfg python-ldap-2.4.20/setup.cfg
--- python-ldap-2.4.20.orig/setup.cfg 2015-07-07 15:25:42.000000000 +0200
+++ python-ldap-2.4.20/setup.cfg 2015-09-02 15:59:48.846802676 +0200
@@ -1,6 +1,4 @@
[_ldap]
-library_dirs = /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64
-include_dirs = /usr/include /usr/include/sasl /usr/local/include /usr/local/include/sasl
defines = HAVE_SASL HAVE_TLS HAVE_LIBLDAP_R
extra_compile_args =
extra_objects =
stack/erp5/buildout.cfg
View file @
1628ff3c
...
@@ -596,6 +596,7 @@ scripts =
...
@@ -596,6 +596,7 @@ scripts =
Acquisition = 2.13.8+SlapOSPatched001
Acquisition = 2.13.8+SlapOSPatched001
Products.DCWorkflow = 2.2.4+SlapOSPatched001
Products.DCWorkflow = 2.2.4+SlapOSPatched001
pysvn = 1.7.10+SlapOSPatched002
pysvn = 1.7.10+SlapOSPatched002
python-ldap = 2.4.20+SlapOSPatched001
# specify dev version to be sure that an old released version is not used
# specify dev version to be sure that an old released version is not used
cloudooo = 1.2.5-dev
cloudooo = 1.2.5-dev
...
@@ -680,7 +681,6 @@ pycountry = 1.14
...
@@ -680,7 +681,6 @@ pycountry = 1.14
pycrypto = 2.6.1
pycrypto = 2.6.1
pyflakes = 0.9.2
pyflakes = 0.9.2
pylint = 1.4.4
pylint = 1.4.4
python-ldap = 2.4.20
python-magic = 0.4.6
python-magic = 0.4.6
python-memcached = 1.57
python-memcached = 1.57
qrcode = 5.1
qrcode = 5.1
...
...
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