Skip to content

Commit d72563b

Browse files
author
Arnon Yaari
committed
Back to 2.7.8 but with changes from 2.7.12
1 parent 6bec8ff commit d72563b

18 files changed

Lines changed: 95 additions & 42 deletions

‎buildout-build-aix.cfg‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,9 @@ 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} --shared --libdir=lib gcc:"gcc -static-libgcc -fPIC"
24+
configure-options = --prefix=${options:prefix} --openssldir=/var/ssl/ --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/
2827

2928
[openssh-environment]
3029
<= environment
@@ -68,7 +67,7 @@ post-make-hook = ${options:hooks-dir}/aix.py:python_post_make
6867
[python-environment]
6968
<= environment
7069
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
71-
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
70+
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
7271
OPT = -DNDEBUG -g -fwrapv -O3 -Wall -Wstrict-prototypes
7372
# 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
7473
# In the global 'environment' section it's defined differently, because some modules use it for ld flags

‎buildout-build-osx.cfg‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ 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
19+
configure-options = darwin64-x86_64-cc --prefix=${:prefix} --shared --libdir=lib --openssldir=/etc/openssl/
2020
pre-make-hook = ${buildout:directory}/src/hooks/osx.py:patch_openssl
21-
openssldir = /System/Library/OpenSSL/
2221

2322
[openssh]
2423
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
3130

3231
[python]
3332
environment-section = environment-python-osx
34-
configure-options=
35-
LDFLAGS=-L${options:prefix}/lib --without-gcc --with-system-ffi
33+
configure-options= --without-gcc --with-system-ffi
3634
pre-make-hook = ${buildout:directory}/src/hooks/osx.py:patch_python_Makefile_after_configure
3735
pre-configure-hook = ${buildout:directory}/src/hooks/osx.py:patch_python
3836
patches = ${:patches-dir}/${:name}-${:version}-osx-Makefile.patch
@@ -45,7 +43,7 @@ patches = ${:patches-dir}/${:name}-${:version}-osx-Makefile.patch
4543
<= environment
4644
CC = cc -fPIC
4745
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
48-
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
46+
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
4947

5048
[gettext]
5149
patches = ${:patches-dir}/${:name}-${:version}-osx-gettext-tools.patch

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[buildout]
2+
extends = buildout-build.cfg
3+
4+
[openssl]
5+
openssldir = /etc/pki/tls/

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[buildout]
2+
extends = buildout-build.cfg
3+
4+
[openssl]
5+
openssldir = /usr/share/ssl/

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[buildout]
2+
extends = buildout-build-redhat-64bit.cfg
3+
4+
[openssl]
5+
openssldir = /usr/share/ssl/

‎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} --shared --libdir=lib64
19+
configure-options = --prefix=${options:prefix} --openssldir=${:openssldir} --shared --libdir=lib64 -fPIC -Wl,-rpath,\\\$\$\$\$\\\$\$\$\$ORIGIN/../lib
2020
openssldir = /etc/pki/tls/
2121

2222
[openssh]

‎buildout-build-redhat-ppc64le.cfg‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ configure-options = ppc64le-linux-gnu --prefix=${options:prefix} --disable-rpath
88
configure-options = ppc64le-linux-gnu --prefix=${options:prefix} --libdir=${options:prefix}/lib64
99

1010
[openssl]
11-
version = 1.0.2h
1211
configure-command = ./Configure
1312
configure-options = linux-ppc64le --prefix=${:prefix} --shared --libdir=lib64 --openssldir=/etc/pki/tls/
1413
patches =

‎buildout-build-ubuntu-16.04.cfg‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
11
[buildout]
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
2+
extends = buildout-build-ubuntu.cfg
133

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

‎buildout-build-ubuntu.cfg‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,3 @@ 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.cfg‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,14 @@ LDFLAGS = ${environment:LDFLAGS} -lncurses
7575
<= options
7676
recipe = hexagonit.recipe.cmmi
7777
name = openssl
78-
version = 1.0.1t
78+
version = 1.0.2h
7979
url = ${urls:source}/${:name}-${:version}.tar.gz
8080
openssldir = /etc/ssl/
8181
configure-command = ./config
8282
configure-options = --prefix=${options:prefix} --openssldir=${:openssldir} --shared --libdir=lib -fPIC -Wl,-rpath,\\\$\$\$\$\\\$\$\$\$ORIGIN/../lib
83-
patches = ${:patches-dir}/${:name}-${:version}-linux-ldflags.patch
83+
make-targets = all install_sw
84+
patches = ${:patches-dir}/${:name}-${:version}-Makefile.patch
85+
${:patches-dir}/${:name}-${:version}-linux-ldflags.patch
8486
${:patches-dir}/${:name}-${:version}-apps-Makefile.patch
8587
${:patches-dir}/${:name}-${:version}-tools-Makefile.patch
8688

@@ -255,7 +257,7 @@ post-make-hook = ${options:hooks-dir}/posix.py:fix_sysconfigdata
255257
[python-environment]
256258
<= environment
257259
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
258-
LDFLAGS = ${environment:LDFLAGS} -Wl,-rpath,\$$ORIGIN/../.. -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
260+
LDFLAGS = ${environment:LDFLAGS} -Wl,-rpath,\$$ORIGIN/../.. -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
259261

260262
[zeromq]
261263
<= options

0 commit comments

Comments
 (0)