diff options
Diffstat (limited to 'cpp/makebindist.py')
| -rwxr-xr-x | cpp/makebindist.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cpp/makebindist.py b/cpp/makebindist.py index f138d096a08..e56e7854de6 100755 --- a/cpp/makebindist.py +++ b/cpp/makebindist.py @@ -709,11 +709,11 @@ def makePHPbinary(sources, buildDir, installDir, version, clean): if platform == 'hpux': runprog('gzip -dc ' + buildDir + '/IcePHP-' + version + '/configure-hpux.gz > configure', False) - elif platform.startswith('linux'): - runprog('gzip -dc ' + buildDir + '/ice/install/thirdparty/php/configure*.gz > configure', False) +# elif platform.startswith('linux'): +# runprog('gzip -dc ' + buildDir + '/ice/install/thirdparty/php/configure*.gz > configure', False) else: - runprog('gzip -dc ' + buildDir + '/IcePHP-' + version + '/configure.gz > configure', False) + runprog('gzip -dc ' + buildDir + '/IcePHP-' + version + '/configure-5.1.2.gz > configure', False) if platform == 'hpux': # @@ -724,7 +724,7 @@ def makePHPbinary(sources, buildDir, installDir, version, clean): # # Everything else should be dynamic and pretty much basic. # - runprog('./configure --with-ice=shared,' + installDir + '/Ice-' + version) + runprog('./configure-5.1.2 --without-pcre-regex --without-pear --with-ice=shared,' + installDir + '/Ice-' + version) # # Need to make some changes to the PHP distribution. @@ -1238,10 +1238,10 @@ def main(): RPMTools.createRPMSFromBinaries64(buildDir, installDir, version, soVersion) else: shutil.copy(installDir + '/Ice-' + version + '-demos.tar.gz', '/usr/src/redhat/SOURCES') - shutil.copy(sources + '/php-5.0.4.tar.bz2', '/usr/src/redhat/SOURCES') + shutil.copy(sources + '/php-5.1.4.tar.bz2', '/usr/src/redhat/SOURCES') shutil.copy(installFiles + '/thirdparty/php/ice.ini', '/usr/src/redhat/SOURCES') - shutil.copy(installFiles + '/thirdparty/php/configure.5.0.4.gz', - '/usr/src/redhat/SOURCES') +# shutil.copy(installFiles + '/thirdparty/php/configure.5.0.4.gz', +# '/usr/src/redhat/SOURCES') shutil.copy(installFiles + '/common/iceproject.xml', '/usr/src/redhat/SOURCES') iceArchives = glob.glob(sources + '/Ice*' + version + '*.gz') for f in iceArchives: |