Merge branch 'develop'

Author: Arnon Yaari

README.md

@@ -11,9 +11,10 @@ The current supported platforms are: Linux, OS X, Windows, Solaris and AIX.
 
 In order to build python, execute:
 
-    python bootstrap.py
-    ./bin/buildout
-    ./bin/build
+    pip install zc.buildout
+    buildout bootstrap
+    bin/buildout
+    bin/build
 
 **For Python 3.x, see [relocatable-python3](https://github.com/Infinidat/relocatable-python3)**
 

bootstrap.py

@@ -21,10 +21,9 @@ configure-options = ${options:configure-options} --with-gpg-error-prefix=${:pref
 # OpenSSL's configure doesn't respect CC/GCC env vars properly (it only decides which compiler to use according to which is defined, but doesn't use the flags).
 # we pass the compiler and flags in the configure options instead, this overwrites any env var
 # note that --shared doesn't actually work on aix
-configure-options = --prefix=${options:prefix} --shared --libdir=lib gcc:"gcc -static-libgcc -fPIC"
+configure-options = --prefix=${options:prefix} --openssldir=/var/ssl/ --shared --libdir=lib gcc:"gcc -static-libgcc -fPIC"
 # run "slibclean" before "make install", otherwise make install fails due to "files already in use"
 make-binary = slibclean; make
-openssldir = /var/ssl/
 
 [openssh-environment]
 <= environment
@@ -68,7 +67,7 @@ post-make-hook = ${options:hooks-dir}/aix.py:python_post_make
 [python-environment]
 <= environment
 CFLAGS = ${environment:CFLAGS} -I${options:prefix}/include/gnutls -I${options:prefix}/include/graphviz -I${options:prefix}/include/libexslt -I${options:prefix}/include/libxml2 -I${options:prefix}/include/libxslt -I${options:prefix}/include/ncurses -I${options:prefix}/include/openssl -I${options:prefix}/include/readline -I${options:prefix}/include/sasl -I${options:prefix}/lib/libffi-${libffi:version}/include
-LDFLAGS =  ${environment:LDFLAGS} -L${options:prefix}/lib/engines -L${options:prefix}/lib/gettext -L${options:prefix}/lib/graphviz -L${options:prefix}/lib/libxslt-plugins -L${options:prefix}/lib/pkgconfig -L${options:prefix}/lib/python2.7 -L${options:prefix}/lib/sasl2 -Wl,-blibpath:.:../lib:/usr/lib
+LDFLAGS =  ${environment:LDFLAGS} -L${options:prefix}/lib/engines -L${options:prefix}/lib/gettext -L${options:prefix}/lib/graphviz -L${options:prefix}/lib/libxslt-plugins -L${options:prefix}/lib/pkgconfig -L${options:prefix}/lib/sasl2 -Wl,-blibpath:.:../lib:/usr/lib
 OPT = -DNDEBUG -g -fwrapv -O3 -Wall -Wstrict-prototypes
 # LIBPATH is used as a runtime search path environment variable, and we define it so that the lib-dynload so's won't fail to load
 # In the global 'environment' section it's defined differently, because some modules use it for ld flags

buildout-build-aix.cfg

@@ -16,9 +16,8 @@ pre-make-hook = ${buildout:directory}/src/hooks/osx.py:patch_ncurses
 [openssl]
 # openssl-1.0.0.d/config script doesn't check for 64bit compiler on OSX
 configure-command = ./Configure
-configure-options = darwin64-x86_64-cc --prefix=${:prefix} --shared --libdir=lib
+configure-options = darwin64-x86_64-cc --prefix=${:prefix} --shared --libdir=lib --openssldir=/etc/openssl/
 pre-make-hook = ${buildout:directory}/src/hooks/osx.py:patch_openssl
-openssldir = /System/Library/OpenSSL/
 
 [openssh]
 pre-configure-hook = ${buildout:directory}/src/hooks/osx.py:add_ld_library_path_to_configure
@@ -31,8 +30,7 @@ pre-configure-hook = ${buildout:directory}/src/hooks/osx.py:patch_cyrus_sasl
 
 [python]
 environment-section = environment-python-osx
-configure-options=
-    LDFLAGS=-L${options:prefix}/lib --without-gcc --with-system-ffi
+configure-options= --without-gcc --with-system-ffi
 pre-make-hook = ${buildout:directory}/src/hooks/osx.py:patch_python_Makefile_after_configure
 pre-configure-hook = ${buildout:directory}/src/hooks/osx.py:patch_python
 patches = ${:patches-dir}/${:name}-${:version}-osx-Makefile.patch
@@ -45,7 +43,7 @@ patches = ${:patches-dir}/${:name}-${:version}-osx-Makefile.patch
 <= environment
 CC = cc -fPIC
 CFLAGS = ${environment:CFLAGS} -I${options:prefix}/include/sasl -I${options:prefix}/include/gnutls -I${options:prefix}/include/graphviz -I${options:prefix}/include/libexslt -I${options:prefix}/include/libxml2 -I${options:prefix}/include/libxslt -I${options:prefix}/include/ncurses -I${options:prefix}/include/openssl -I${options:prefix}/include/readline -I${options:prefix}/lib/libffi-${libffi:version}/include
-LDFLAGS = ${environment:LDFLAGS} -L${options:prefix}/lib/engines -L${options:prefix}/lib/gettext -L${options:prefix}/lib/graphviz -L${options:prefix}/lib/libxslt-plugins -L${options:prefix}/lib/pkgconfig -L${options:prefix}/lib/python2.7 -L${options:prefix}/lib/sasl2
+LDFLAGS = ${environment:LDFLAGS} -L${options:prefix}/lib/engines -L${options:prefix}/lib/gettext -L${options:prefix}/lib/graphviz -L${options:prefix}/lib/libxslt-plugins -L${options:prefix}/lib/pkgconfig -L${options:prefix}/lib/sasl2
 
 [gettext]
 patches = ${:patches-dir}/${:name}-${:version}-osx-gettext-tools.patch

buildout-build-osx.cfg

@@ -0,0 +1,5 @@
+[buildout]
+extends = buildout-build.cfg
+
+[openssl]
+openssldir = /etc/pki/tls/

buildout-build-redhat-32bit.cfg

@@ -0,0 +1,5 @@
+[buildout]
+extends = buildout-build.cfg
+
+[openssl]
+openssldir = /usr/share/ssl/

buildout-build-redhat-4-32bit.cfg

@@ -0,0 +1,5 @@
+[buildout]
+extends = buildout-build-redhat-64bit.cfg
+
+[openssl]
+openssldir = /usr/share/ssl/

buildout-build-redhat-4-64bit.cfg

@@ -16,7 +16,7 @@ DYLD_LIBRARY_PATH = ${options:prefix}/lib64
 LD_LIBRARY_PATH = ${:DYLD_LIBRARY_PATH}
 
 [openssl]
-configure-options = --prefix=${options:prefix} --shared --libdir=lib64
+configure-options = --prefix=${options:prefix} --openssldir=${:openssldir} --shared --libdir=lib64 -fPIC -Wl,-rpath,\\\$\$\$\$\\\$\$\$\$ORIGIN/../lib
 openssldir = /etc/pki/tls/
 
 [openssh]

buildout-build-redhat-64bit.cfg

@@ -8,7 +8,6 @@ configure-options = ppc64le-linux-gnu --prefix=${options:prefix} --disable-rpath
 configure-options = ppc64le-linux-gnu --prefix=${options:prefix} --libdir=${options:prefix}/lib64
 
 [openssl]
-version = 1.0.2h
 configure-command = ./Configure
 configure-options = linux-ppc64le --prefix=${:prefix} --shared --libdir=lib64 --openssldir=/etc/pki/tls/
 patches =