Skip to content

Commit c348741

Browse files
author
Arnon Yaari
committed
drop support for redhat 4
1 parent d7e3764 commit c348741

4 files changed

Lines changed: 9 additions & 27 deletions

File tree

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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[buildout]
2-
extends = buildout-build.cfg
2+
extends = buildout-build-redhat-32bit.cfg
33

44
[options]
55
configure-options = --prefix=${options:prefix} --disable-rpath --libdir=${options:prefix}/lib64
@@ -17,7 +17,6 @@ LD_LIBRARY_PATH = ${:DYLD_LIBRARY_PATH}
1717

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

2221
[openssh]
2322
configure-options = --prefix=${options:prefix} --without-rpath --without-openssl-header-check --with-ssl-dir=${options:prefix} --libdir=${options:prefix}/lib64

src/scripts/__init__.py

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -43,22 +43,15 @@ def build():
4343
else:
4444
buildout_file = 'buildout-build-ubuntu.cfg'
4545
if dist_name in ['redhat', 'centos']:
46-
if maxsize > 2**32:
47-
arch = execute_assert_success(["uname", "-i"]).get_stdout().lower()
48-
if 'ppc64le' in arch:
49-
buildout_file = 'buildout-build-redhat-ppc64le.cfg'
50-
elif 'ppc64' in arch:
51-
buildout_file = 'buildout-build-redhat-ppc64.cfg'
52-
else:
53-
if version.startswith('4.'):
54-
buildout_file = 'buildout-build-redhat-4-64bit.cfg'
55-
else:
56-
buildout_file = 'buildout-build-redhat-64bit.cfg'
46+
arch = execute_assert_success(["uname", "-i"]).get_stdout().lower()
47+
if 'ppc64le' in arch:
48+
buildout_file = 'buildout-build-redhat-ppc64le.cfg'
49+
elif 'ppc64' in arch:
50+
buildout_file = 'buildout-build-redhat-ppc64.cfg'
51+
elif 'i386' in arch:
52+
buildout_file = 'buildout-build-redhat-32bit.cfg'
5753
else:
58-
if version.startswith('4.'):
59-
buildout_file = 'buildout-build-redhat-4-32bit.cfg'
60-
else:
61-
buildout_file = 'buildout-build-redhat-32bit.cfg'
54+
buildout_file = 'buildout-build-redhat-64bit.cfg'
6255
if dist_name in ['suse']:
6356
if version in ['10']:
6457
buildout_file = 'buildout-build-suse-10.cfg'

0 commit comments

Comments
 (0)