Back to 2.7.8

Author: Arnon Yaari

buildout-build-aix.cfg

@@ -21,9 +21,10 @@ 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} --openssldir=/var/ssl/ --shared --libdir=lib gcc:"gcc -static-libgcc -fPIC"
+configure-options = --prefix=${options:prefix} --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
@@ -67,7 +68,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/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/python2.7 -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-osx.cfg

@@ -16,8 +16,9 @@ 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 --openssldir=/etc/openssl/
+configure-options = darwin64-x86_64-cc --prefix=${:prefix} --shared --libdir=lib
 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
@@ -30,7 +31,8 @@ pre-configure-hook = ${buildout:directory}/src/hooks/osx.py:patch_cyrus_sasl
 
 [python]
 environment-section = environment-python-osx
-configure-options= --without-gcc --with-system-ffi
+configure-options=
+    LDFLAGS=-L${options:prefix}/lib --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
@@ -43,7 +45,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/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/python2.7 -L${options:prefix}/lib/sasl2
 
 [gettext]
 patches = ${:patches-dir}/${:name}-${:version}-osx-gettext-tools.patch

buildout-build-redhat-32bit.cfg

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

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

@@ -8,6 +8,7 @@ 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 =

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

@@ -1,5 +1,15 @@
 [buildout]
-extends = buildout-build-ubuntu.cfg
+extends = buildout-build.cfg
+
+[python]
+patches = ${:patches-dir}/${:name}-${:version}-sysconfig.py.patch
+    ${:patches-dir}/${:name}-${:version}-disutils-sysconfig.py.patch
+    ${:patches-dir}/${:name}-${:version}-pythonhome-pythonrun.c.patch
+    ${:patches-dir}/${:name}-${:version}-ubuntu-platform.patch
+    ${:patches-dir}/${:name}-${:version}-linux-symlink.patch
+
+[openssl]
+make-targets = all install_sw
 
 [ncurses]
 patches = ${:patches-dir}/${:name}-${:version}-ncurses-base-MKlib_gen.sh.patch

buildout-build-redhat-64bit.cfg

@@ -7,3 +7,6 @@ patches = ${:patches-dir}/${:name}-${:version}-sysconfig.py.patch
     ${:patches-dir}/${:name}-${:version}-pythonhome-pythonrun.c.patch
     ${:patches-dir}/${:name}-${:version}-ubuntu-platform.patch
     ${:patches-dir}/${:name}-${:version}-linux-symlink.patch
+
+[openssl]
+make-targets = all install_sw

buildout-build-redhat-ppc64le.cfg

@@ -3,36 +3,26 @@ extends = buildout-build-windows.cfg
 
 [environment-windows]
 FrameworkDir = ${:WinDir}\Microsoft.NET\Framework64
-VSINSTALLDIR = ${:ProgramFiles64}\Microsoft Visual Studio 10.0
+VSINSTALLDIR = ${:ProgramFiles64}\Microsoft Visual Studio 9.0
 ProgramFiles64 = ${:SystemDrive}\Program Files (x86)
 VSBIN = ${:VCRoot}\BIN\amd64
 ATLMFC_LIB = ${:VCRoot}\ATLMFC\LIB\amd64
 VSLIB = ${:VCRoot}\LIB\amd64
-VC100CRT = ${:VCRoot}\redist\x64\Microsoft.VC100.CRT\msvcr100.dll
+VC90CRT = ${:VCRoot}\redist\amd64\Microsoft.VC90.CRT
 SDKLIB = ${:WindowsSdkDir}\lib\x64
 SDKLIB32 = ${:WindowsSdkDir}\lib
 SDKBIN = ${:WindowsSdkDir}\bin\x64
 PerlExe = ${:SystemDrive}\Perl64\bin\perl.exe
-MSBuildExtensionsPath32 = ${:ProgramFiles64}\MSBuild
-
-[visual-studio-2008-environment]
-<= environment-windows
-VSINSTALLDIR = ${:ProgramFiles64}\Microsoft Visual Studio 9.0
 
 [openssl]
-configure-options = Configure VC-WIN64A enable-zlib enable-static-engine enable-zlib-dynamic enable-capieng no-asm no-shared --prefix=${options:prefix}
+configure-options = Configure VC-WIN64A enable-zlib enable-static-engine enable-zlib-dynamic no-asm no-shared --prefix=${options:prefix}
 pre-make-hook = ${options:hooks-dir}\windows.py:openssl_pre_make64
 
 [db]
-<= options
-environment-section = visual-studio-2008-environment
 make-binary = devenv
 make-options = build_windows\Berkeley_DB.sln /build "Release|x64"
 post-make-hook = ${options:hooks-dir}\windows.py:db_post_make64
 
-[python-win-instrumentation]
-make-options = pcbuild.sln /p:Configuration=PGInstrument;Platform=x64
-
 [python-win]
-make-options = pcbuild.sln /p:Configuration=PGUpdate;Platform=x64
+make-options = pcbuild.sln /useenv /build "Release|x64"
 post-make-hook = ${options:hooks-dir}\windows.py:python_post_make64