zyppe/sagemath
1
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/sagemath.git synced 2025-04-22 19:55:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

Rebuild for ntl 6.1.0.

Browse source 
Fix ld ignoring __global_ldflags due to embedded trailing space.
Fix Singular paths in the build environment.
This commit is contained in:
Jerry James 2014-04-02 22:19:50 -06:00
parent 572bc96e88
commit 52d9e04212
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
sagemath.spec
View file

@ -62,7 +62,7 @@ Name: sagemath
Group: Applications/Engineering Group: Applications/Engineering
Summary: A free open-source mathematics software system Summary: A free open-source mathematics software system
Version: 6.1.1 Version: 6.1.1
Release: 4%{?dist} Release: 5%{?dist}
# The file ${SAGE_ROOT}/COPYING.txt is the upstream license breakdown file # The file ${SAGE_ROOT}/COPYING.txt is the upstream license breakdown file
# Additionally, every $files section has a comment with the license name # Additionally, every $files section has a comment with the license name
# before files with that license # before files with that license
@ -683,6 +683,11 @@ rm build/pkgs/sagenb/src/%{sagenb_pkg}/sagenb/data/sage3d/lib/sage3d.jar
# remove binary egg # remove binary egg
rm -r build/pkgs/sagenb/src/%{sagenb_pkg}/sagenb.egg-info rm -r build/pkgs/sagenb/src/%{sagenb_pkg}/sagenb.egg-info
# fix Singular paths
sed -e "s,SINGULARPATH=\",&%{_libdir}/Singular/LIB:," \
-e "s,\(SINGULAR_EXECUTABLE=\"\).*\",\1%{_libdir}/Singular/Singular\"," \
-i src/bin/sage-env
######################################################################## ########################################################################
%build %build
export CC=%{__cc} export CC=%{__cc}
@ -712,10 +717,11 @@ export PYTHONPATH=%{buildroot}%{python_sitearch}:$PYTHONPATH
pushd src/c_lib pushd src/c_lib
# scons ignores most environment variables # scons ignores most environment variables
# and does not have soname support # and does not have soname support
ldflags=$(sed 's/[[:blank:]]*$//' <<< "%{__global_ldflags}")
sed -e 's|@@includedir@@|%{_includedir}|g' \ sed -e 's|@@includedir@@|%{_includedir}|g' \
-e 's|@@libdir@@|%{_libdir}|g' \ -e 's|@@libdir@@|%{_libdir}|g' \
-e 's|@@optflags@@|%{optflags}|g' \ -e 's|@@optflags@@|%{optflags}|g' \
-e 's|@@__global_ldflags@@|%{__global_ldflags}|g' \ -e "s|@@__global_ldflags@@|$ldflags|g" \
-i SConstruct -i SConstruct
CXX=g++ UNAME=Linux SAGE64=auto scons CXX=g++ UNAME=Linux SAGE64=auto scons
ln -s libcsage.so.0 libcsage.so ln -s libcsage.so.0 libcsage.so
@ -1365,6 +1371,11 @@ exit 0
######################################################################## ########################################################################
%changelog %changelog
* Wed Apr 2 2014 Jerry James <loganjerry@gmail.com> - 6.1.1-5
- Rebuild for ntl 6.1.0
- Fix ld ignoring __global_ldflags due to embedded trailing space
- Fix Singular paths in the build environment
* Wed Mar 19 2014 Jerry James <loganjerry@gmail.com> - 6.1.1-4 * Wed Mar 19 2014 Jerry James <loganjerry@gmail.com> - 6.1.1-4
- Rebuild for libgap 4.7.4 and cryptominisat 2.9.9 - Rebuild for libgap 4.7.4 and cryptominisat 2.9.9