diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/RPMTools.py | 8 | ||||
| -rwxr-xr-x | cpp/makebindist.py | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/cpp/RPMTools.py b/cpp/RPMTools.py index f9b3a830078..0d1432d6a5c 100644 --- a/cpp/RPMTools.py +++ b/cpp/RPMTools.py @@ -692,7 +692,13 @@ export LD_LIBRARY_PATH=$RPM_BUILD_DIR/Ice-%{version}/lib:$LD_LIBRARY_PATH gmake OPTIMIZE=yes ICE_HOME=$RPM_BUILD_DIR/Ice-%{version} RPM_BUILD_ROOT=$RPM_BUILD_ROOT cd $RPM_BUILD_DIR/php-5.1.4 ./configure --with-ice=shared,$RPM_BUILD_DIR/Ice-%{version} -sed -i -e 's/^EXTRA_CXXFLAGS.*$/EXTRA_CXXFLAGS = -DCOMPILE_DL_ICE/' $RPM_BUILD_DIR/php-5.1.4/Makefile +cp Makefile Makefile.tmp +echo "EXTRA_CXXFLAGS= -DCOMPILE_DL_ICE" > Makefile +cat Makefile.tmp >> Makefile +if test "$RPM_ARCH" == "x86_64"; +then + sed -i -e 's/Ice-%{version}\/lib/Ice-%{version}\/lib64/g' Makefile ; +fi gmake """) diff --git a/cpp/makebindist.py b/cpp/makebindist.py index 1f477c4bf28..bf07b67288e 100755 --- a/cpp/makebindist.py +++ b/cpp/makebindist.py @@ -1188,7 +1188,7 @@ def main(): ssl = os.environ['OPENSSL_HOME'] shutil.copy('%s/bin/openssl' % ssl, 'Ice-%s/bin' % version) # runprog('cp -R ' + ssl + '/include Ice-' + version) - runprog('cp ' + ssl + '/lib/lib*.sl.* Ice-' + version) + runprog('cp ' + ssl + '/lib/lib*.sl.* Ice-' + version + '/lib') runprog('rm -rf Ice-' + version + '/lib/libfips*') runprog('rm -rf Ice-' + version + '/lib/engines') runprog('rm -rf Ice-' + version + '/lib/pkgconfig') |