From e906c2e13d91b381779d2a877871eccb2d9d0446 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 5 Jan 2016 11:22:35 -0700 Subject: [PATCH] Use %{?__global_ldflags} when linking --- suitesparse.spec | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/suitesparse.spec b/suitesparse.spec index e367a87..60fd50b 100644 --- a/suitesparse.spec +++ b/suitesparse.spec @@ -12,7 +12,7 @@ Name: suitesparse Version: 4.4.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A collection of sparse matrix libraries Group: System Environment/Libraries @@ -139,7 +139,7 @@ pushd SuiteSparse_config make CFLAGS="$RPM_OPT_FLAGS -fPIC" ar x libsuitesparseconfig.a pushd ../Lib - gcc -shared -Wl,-soname,libsuitesparseconfig.so.%{SuiteSparse_config_major} -o \ + gcc -shared %{?__global_ldflags} -Wl,-soname,libsuitesparseconfig.so.%{SuiteSparse_config_major} -o \ libsuitesparseconfig.so.%{SuiteSparse_config_ver} ../SuiteSparse_config/*.o -lm ln -sf libsuitesparseconfig.so.%{SuiteSparse_config_ver} libsuitesparseconfig.so.%{SuiteSparse_config_major} ln -sf libsuitesparseconfig.so.%{SuiteSparse_config_ver} libsuitesparseconfig.so @@ -153,7 +153,7 @@ pushd AMD make CFLAGS="$RPM_OPT_FLAGS -fPIC" popd pushd ../Lib - gcc -shared -Wl,-soname,libamd.so.%{amd_version_major} -o \ + gcc -shared %{?__global_ldflags} -Wl,-soname,libamd.so.%{amd_version_major} -o \ libamd.so.%{amd_version} ../AMD/Lib/*.o \ libsuitesparseconfig.so.%{SuiteSparse_config_major} -lm ln -sf libamd.so.%{amd_version} libamd.so.%{amd_version_major} @@ -169,7 +169,7 @@ pushd BTF make CFLAGS="$RPM_OPT_FLAGS -fPIC" popd pushd ../Lib - gcc -shared -Wl,-soname,libbtf.so.%{btf_version_major} -o \ + gcc -shared %{?__global_ldflags} -Wl,-soname,libbtf.so.%{btf_version_major} -o \ libbtf.so.%{btf_version} ../BTF/Lib/*.o ln -sf libbtf.so.%{btf_version} libbtf.so.%{btf_version_major} ln -sf libbtf.so.%{btf_version} libbtf.so @@ -184,7 +184,7 @@ pushd CAMD make CFLAGS="$RPM_OPT_FLAGS -fPIC" popd pushd ../Lib - gcc -shared -Wl,-soname,libcamd.so.%{camd_version_major} -o \ + gcc -shared %{?__global_ldflags} -Wl,-soname,libcamd.so.%{camd_version_major} -o \ libcamd.so.%{camd_version} ../CAMD/Lib/*.o \ libsuitesparseconfig.so.%{SuiteSparse_config_major} -lm ln -sf libcamd.so.%{camd_version} libcamd.so.%{camd_version_major} @@ -200,7 +200,7 @@ pushd CCOLAMD make CFLAGS="$RPM_OPT_FLAGS -fPIC" popd pushd ../Lib - gcc -shared -Wl,-soname,libccolamd.so.%{ccolamd_version_major} -o \ + gcc -shared %{?__global_ldflags} -Wl,-soname,libccolamd.so.%{ccolamd_version_major} -o \ libccolamd.so.%{ccolamd_version} ../CCOLAMD/Lib/*.o \ libsuitesparseconfig.so.%{SuiteSparse_config_major} -lm ln -sf libccolamd.so.%{ccolamd_version} libccolamd.so.%{ccolamd_version_major} @@ -216,7 +216,7 @@ pushd COLAMD make CFLAGS="$RPM_OPT_FLAGS -fPIC" popd pushd ../Lib - gcc -shared -Wl,-soname,libcolamd.so.%{colamd_version_major} -o \ + gcc -shared %{?__global_ldflags} -Wl,-soname,libcolamd.so.%{colamd_version_major} -o \ libcolamd.so.%{colamd_version} ../COLAMD/Lib/*.o \ libsuitesparseconfig.so.%{SuiteSparse_config_major} -lm ln -sf libcolamd.so.%{colamd_version} libcolamd.so.%{colamd_version_major} @@ -237,7 +237,7 @@ pushd CHOLMOD make CFLAGS="$CHOLMOD_FLAGS" popd pushd ../Lib - gcc -shared -Wl,-soname,libcholmod.so.%{cholmod_version_major} -o \ + gcc -shared %{?__global_ldflags} -Wl,-soname,libcholmod.so.%{cholmod_version_major} -o \ libcholmod.so.%{cholmod_version} ../CHOLMOD/Lib/*.o \ -L%{_libdir}/atlas %{atlaslibs} \ libamd.so.%{amd_version_major} \ @@ -264,7 +264,7 @@ pushd CSparse cp -p cs.h ../../Include popd pushd ../Lib - gcc -shared -Wl,-soname,libcsparse.so.%{csparse_version_major} -o \ + gcc -shared %{?__global_ldflags} -Wl,-soname,libcsparse.so.%{csparse_version_major} -o \ libcsparse.so.%{csparse_version} ../CSparse/Source/*.o -lm ln -sf libcsparse.so.%{csparse_version} libcsparse.so.%{csparse_version_major} ln -sf libcsparse.so.%{csparse_version} libcsparse.so @@ -280,7 +280,7 @@ pushd CXSparse make CFLAGS="$RPM_OPT_FLAGS -fPIC" popd pushd ../Lib - gcc -shared -Wl,-soname,libcxsparse.so.%{cxsparse_version_major} -o \ + gcc -shared %{?__global_ldflags} -Wl,-soname,libcxsparse.so.%{cxsparse_version_major} -o \ libcxsparse.so.%{cxsparse_version} ../CXSparse/Lib/*.o -lm ln -sf libcxsparse.so.%{cxsparse_version} libcxsparse.so.%{cxsparse_version_major} ln -sf libcxsparse.so.%{cxsparse_version} libcxsparse.so @@ -297,7 +297,7 @@ pushd KLU make CFLAGS="$RPM_OPT_FLAGS -fPIC" popd pushd ../Lib - gcc -shared -Wl,-soname,libklu.so.%{klu_version_major} -o \ + gcc -shared %{?__global_ldflags} -Wl,-soname,libklu.so.%{klu_version_major} -o \ libklu.so.%{klu_version} ../KLU/Lib/*.o \ libamd.so.%{amd_version_major} libcolamd.so.%{colamd_version_major} \ libbtf.so.%{btf_version_major} \ @@ -315,7 +315,7 @@ pushd LDL make CFLAGS="$RPM_OPT_FLAGS -fPIC" popd pushd ../Lib - gcc -shared -Wl,-soname,libldl.so.%{ldl_version_major} -o \ + gcc -shared %{?__global_ldflags} -Wl,-soname,libldl.so.%{ldl_version_major} -o \ libldl.so.%{ldl_version} ../LDL/Lib/*.o ln -sf libldl.so.%{ldl_version} libldl.so.%{ldl_version_major} ln -sf libldl.so.%{ldl_version} libldl.so @@ -330,7 +330,7 @@ pushd UMFPACK make CFLAGS="$RPM_OPT_FLAGS -fPIC" popd pushd ../Lib - gcc -shared -Wl,-soname,libumfpack.so.%{umfpack_version_major} -o \ + gcc -shared %{?__global_ldflags} -Wl,-soname,libumfpack.so.%{umfpack_version_major} -o \ libumfpack.so.%{umfpack_version} ../UMFPACK/Lib/*.o \ -L%{_libdir}/atlas %{atlaslibs} \ libamd.so.%{amd_version_major} \ @@ -349,7 +349,7 @@ pushd SPQR make CFLAGS="$RPM_OPT_FLAGS %{?with_tbb:-DHAVE_TBB} -DNPARTITION -fPIC" popd pushd ../Lib - g++ -shared -Wl,-soname,libspqr.so.%{spqr_version_major} -o \ + g++ -shared %{?__global_ldflags} -Wl,-soname,libspqr.so.%{spqr_version_major} -o \ libspqr.so.%{spqr_version} ../SPQR/Lib/*.o \ -L%{_libdir}/atlas -L%{_libdir} %{atlaslibs} \ %{?with_tbb:-ltbb} \ @@ -369,7 +369,7 @@ pushd RBio make CFLAGS="$RPM_OPT_FLAGS -fPIC" popd pushd ../Lib - gcc -shared -Wl,-soname,librbio.so.%{rbio_version_major} -o \ + gcc -shared %{?__global_ldflags} -Wl,-soname,librbio.so.%{rbio_version_major} -o \ librbio.so.%{rbio_version} ../RBio/Lib/*.o \ libsuitesparseconfig.so.%{SuiteSparse_config_major} ln -sf librbio.so.%{rbio_version} librbio.so.%{rbio_version_major} @@ -429,7 +429,10 @@ hardlink -cv Docs/ Licenses/ %doc Doc/* %changelog -* Mon Jan 4 2016 Orion Poplawski - 4.4.6-1 +* Mon Jan 4 2016 Orion Poplawski - 4.4.6-3 +- Use %%{?__global_ldflags} when linking + +* Mon Jan 4 2016 Orion Poplawski - 4.4.6-2 - Update to 4.4.6 * Wed Aug 26 2015 Nils Philippsen - 4.4.5-2