Skip to content

Commit 43c785b

Browse files
committed
Finished Release v2.7.8.10
2 parents 1c89c0c + 4a73112 commit 43c785b

39 files changed

Lines changed: 605 additions & 806 deletions

buildout-build-aix.cfg

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ configure-options = ${options:configure-options} --with-gpg-error-prefix=${:pref
2121
# 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).
2222
# we pass the compiler and flags in the configure options instead, this overwrites any env var
2323
# note that --shared doesn't actually work on aix
24-
configure-options = --prefix=${options:prefix} --openssldir=/var/ssl/ --shared --libdir=lib gcc:"gcc -static-libgcc -fPIC"
24+
configure-options = --prefix=${options:prefix} --shared --libdir=lib gcc:"gcc -static-libgcc -fPIC"
2525
# run "slibclean" before "make install", otherwise make install fails due to "files already in use"
2626
make-binary = slibclean; make
27+
openssldir = /var/ssl/
2728

2829
[openssh-environment]
2930
<= environment

buildout-build-osx.cfg

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ pre-make-hook = ${buildout:directory}/src/hooks/osx.py:patch_ncurses
1616
[openssl]
1717
# openssl-1.0.0.d/config script doesn't check for 64bit compiler on OSX
1818
configure-command = ./Configure
19-
configure-options = darwin64-x86_64-cc --prefix=${:prefix} --shared --libdir=lib --openssldir=/etc/openssl/
19+
configure-options = darwin64-x86_64-cc --prefix=${:prefix} --shared --libdir=lib
2020
pre-make-hook = ${buildout:directory}/src/hooks/osx.py:patch_openssl
21+
openssldir = /System/Library/OpenSSL/
2122

2223
[openssh]
2324
pre-configure-hook = ${buildout:directory}/src/hooks/osx.py:add_ld_library_path_to_configure

buildout-build-redhat-32bit.cfg

Lines changed: 0 additions & 5 deletions
This file was deleted.

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

Lines changed: 0 additions & 5 deletions
This file was deleted.

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

Lines changed: 0 additions & 5 deletions
This file was deleted.

buildout-build-redhat-64bit.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ DYLD_LIBRARY_PATH = ${options:prefix}/lib64
1616
LD_LIBRARY_PATH = ${:DYLD_LIBRARY_PATH}
1717

1818
[openssl]
19-
configure-options = --prefix=${options:prefix} --openssldir=${:openssldir} --shared --libdir=lib64 -fPIC -Wl,-rpath,\\\$\$\$\$\\\$\$\$\$ORIGIN/../lib
19+
configure-options = --prefix=${options:prefix} --shared --libdir=lib64
2020
openssldir = /etc/pki/tls/
2121

2222
[openssh]

buildout-build-redhat-ppc64le.cfg

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,39 @@
22
extends = buildout-build-redhat-ppc64.cfg
33

44
[options]
5-
configure-options = ppc64le --prefix=${options:prefix} --disable-rpath --libdir=${options:prefix}/lib64 --openssldir=/etc/pki/tls/
5+
configure-options = ppc64le-linux-gnu --prefix=${options:prefix} --disable-rpath --libdir=${options:prefix}/lib64
6+
7+
[options-no-rpath]
8+
configure-options = ppc64le-linux-gnu --prefix=${options:prefix} --libdir=${options:prefix}/lib64
69

710
[openssl]
11+
version = 1.0.2h
812
configure-command = ./Configure
9-
configure-options = linux-ppc64le --prefix=${:prefix} --shared --libdir=lib64
10-
patches =
13+
configure-options = linux-ppc64le --prefix=${:prefix} --shared --libdir=lib64 --openssldir=/etc/pki/tls/
14+
patches =
1115

1216
[openssh]
1317
version = 7.3p1
14-
configure-options = ppc64le --prefix=${options:prefix} --without-rpath --without-openssl-header-check --with-ssl-dir=${options:prefix} --libdir=${options:prefix}/lib64
18+
configure-options = ppc64le-linux-gnu --prefix=${options:prefix} --without-rpath --without-openssl-header-check --with-ssl-dir=${options:prefix} --libdir=${options:prefix}/lib64
1519
patches =
1620

1721
[ncurses]
1822
version = 6.0
19-
configure-options = --prefix=${options:prefix} --disable-rpath --with-gpg-error-prefix=${:prefix} --disable-big-core --disable-root-environ --disable-macros --disable-rpath --with-shared --disable-largefile --without-ada --without-cxx-binding --with-terminfo-dirs=/etc/terminfo:/lib/terminfo:/usr/share/terminfo
20-
21-
[readline]
22-
configure-options = ppc64le --prefix=${options:prefix} --libdir=${options:prefix}/lib64
23-
environment-section = environment
23+
configure-options = ${options:configure-options} --with-gpg-error-prefix=${:prefix} --disable-big-core --disable-root-environ --disable-macros --disable-rpath --with-shared --disable-largefile --without-ada --without-cxx-binding --with-terminfo-dirs=/etc/terminfo:/lib/terminfo:/usr/share/terminfo
2424

2525
[libgpg-error]
26-
configure-options = ppc64le --prefix=${options:prefix} --enable-static
26+
configure-options = ppc64le-linux-gnu --prefix=${options:prefix} --enable-static
2727

2828
[libffi]
2929
configure-options = --prefix=${options:prefix} --disable-rpath --libdir=${options:prefix}/lib64
3030

31+
[gettext]
32+
configure-options = ${options:configure-options} --without-git --without-cvs
33+
3134
[zeromq]
3235
version = 4.1.5
33-
configure-options = ppc64le-linux --prefix=${options:prefix} --disable-rpath --disable-dependency-tracking --libdir=${options:prefix}/lib64
34-
patches =
36+
configure-options = ppc64le-linux-gnu --prefix=${options:prefix} --disable-rpath --disable-dependency-tracking --libdir=${options:prefix}/lib64
37+
patches =
38+
39+
[zlib]
40+
configure-options = --prefix=${options:prefix} --libdir=${options:prefix}/lib64

buildout-build-ubuntu-16.04.cfg

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
[buildout]
2-
extends = buildout-build-ubuntu.cfg
2+
extends = buildout-build.cfg
3+
4+
[python]
5+
patches = ${:patches-dir}/${:name}-${:version}-sysconfig.py.patch
6+
${:patches-dir}/${:name}-${:version}-disutils-sysconfig.py.patch
7+
${:patches-dir}/${:name}-${:version}-pythonhome-pythonrun.c.patch
8+
${:patches-dir}/${:name}-${:version}-ubuntu-platform.patch
9+
${:patches-dir}/${:name}-${:version}-linux-symlink.patch
10+
11+
[openssl]
12+
make-targets = all install_sw
313

414
[ncurses]
515
patches = ${:patches-dir}/${:name}-${:version}-ncurses-base-MKlib_gen.sh.patch

buildout-build-ubuntu.cfg

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@ patches = ${:patches-dir}/${:name}-${:version}-sysconfig.py.patch
77
${:patches-dir}/${:name}-${:version}-pythonhome-pythonrun.c.patch
88
${:patches-dir}/${:name}-${:version}-ubuntu-platform.patch
99
${:patches-dir}/${:name}-${:version}-linux-symlink.patch
10+
11+
[openssl]
12+
make-targets = all install_sw

buildout-build-windows-64bit.cfg

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,26 @@ extends = buildout-build-windows.cfg
33

44
[environment-windows]
55
FrameworkDir = ${:WinDir}\Microsoft.NET\Framework64
6-
VSINSTALLDIR = ${:ProgramFiles64}\Microsoft Visual Studio 10.0
6+
VSINSTALLDIR = ${:ProgramFiles64}\Microsoft Visual Studio 9.0
77
ProgramFiles64 = ${:SystemDrive}\Program Files (x86)
88
VSBIN = ${:VCRoot}\BIN\amd64
99
ATLMFC_LIB = ${:VCRoot}\ATLMFC\LIB\amd64
1010
VSLIB = ${:VCRoot}\LIB\amd64
11-
VC100CRT = ${:VCRoot}\redist\x64\Microsoft.VC100.CRT\msvcr100.dll
11+
VC90CRT = ${:VCRoot}\redist\amd64\Microsoft.VC90.CRT
1212
SDKLIB = ${:WindowsSdkDir}\lib\x64
1313
SDKLIB32 = ${:WindowsSdkDir}\lib
1414
SDKBIN = ${:WindowsSdkDir}\bin\x64
1515
PerlExe = ${:SystemDrive}\Perl64\bin\perl.exe
16-
MSBuildExtensionsPath32 = ${:ProgramFiles64}\MSBuild
17-
18-
[visual-studio-2008-environment]
19-
<= environment-windows
20-
VSINSTALLDIR = ${:ProgramFiles64}\Microsoft Visual Studio 9.0
2116

2217
[openssl]
23-
configure-options = Configure VC-WIN64A enable-zlib enable-static-engine enable-zlib-dynamic enable-capieng no-asm no-shared --prefix=${options:prefix}
18+
configure-options = Configure VC-WIN64A enable-zlib enable-static-engine enable-zlib-dynamic no-asm no-shared --prefix=${options:prefix}
2419
pre-make-hook = ${options:hooks-dir}\windows.py:openssl_pre_make64
2520

2621
[db]
27-
<= options
28-
environment-section = visual-studio-2008-environment
2922
make-binary = devenv
3023
make-options = build_windows\Berkeley_DB.sln /build "Release|x64"
3124
post-make-hook = ${options:hooks-dir}\windows.py:db_post_make64
3225

33-
[python-win-instrumentation]
34-
make-options = pcbuild.sln /p:Configuration=PGInstrument;Platform=x64
35-
3626
[python-win]
37-
make-options = pcbuild.sln /p:Configuration=PGUpdate;Platform=x64
27+
make-options = pcbuild.sln /useenv /build "Release|x64"
3828
post-make-hook = ${options:hooks-dir}\windows.py:python_post_make64

0 commit comments

Comments
 (0)