Enable multithreading support

epel9
Sergio Pascual 13 years ago
parent da57eccd76
commit 29bdddbf8c

@ -0,0 +1,9 @@
diff -ur cfitsio/cfitsio.pc.in cfitsio.new/cfitsio.pc.in
--- cfitsio/cfitsio.pc.in 2011-10-29 16:54:43.081132723 +0200
+++ cfitsio.new/cfitsio.pc.in 2011-10-29 16:56:49.933619756 +0200
@@ -8,4 +8,4 @@
Version: 3.280
Libs: -L${libdir} -lcfitsio @LIBS@
Libs.private: -lm
-Cflags: -I${includedir}
+Cflags: -D_REENTRANT -I${includedir}

@ -32,5 +32,3 @@ diff -ur cfitsio/Makefile.in cfitsio-fixed/Makefile.in
+CFITSIO_LIB = $(DESTDIR)$(exec_prefix)/$(LIBDIR) +CFITSIO_LIB = $(DESTDIR)$(exec_prefix)/$(LIBDIR)
+CFITSIO_INCLUDE = $(DESTDIR)$(prefix)/$(INCLUDEDIR) +CFITSIO_INCLUDE = $(DESTDIR)$(prefix)/$(INCLUDEDIR)
INSTALL_DIRS = $(DESTDIR)@INSTALL_ROOT@ ${CFITSIO_LIB} ${CFITSIO_LIB}/pkgconfig ${CFITSIO_INCLUDE} INSTALL_DIRS = $(DESTDIR)@INSTALL_ROOT@ ${CFITSIO_LIB} ${CFITSIO_LIB}/pkgconfig ${CFITSIO_INCLUDE}

@ -1,6 +1,6 @@
Name: cfitsio Name: cfitsio
Version: 3.280 Version: 3.280
Release: 1%{?dist} Release: 2%{?dist}
Summary: Library for manipulating FITS data files Summary: Library for manipulating FITS data files
Group: Development/Libraries Group: Development/Libraries
@ -11,6 +11,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: cfitsio.patch Patch0: cfitsio.patch
Patch1: cfitsio-pkgconfig.patch Patch1: cfitsio-pkgconfig.patch
Patch2: cfitsio-s390.patch Patch2: cfitsio-s390.patch
Patch3: makefile.patch
Patch4: cfitsio-pkgconfig-reentrant.patch
BuildRequires: gcc-gfortran BuildRequires: gcc-gfortran
Requires(post): /sbin/ldconfig Requires(post): /sbin/ldconfig
@ -30,7 +32,7 @@ community.
Group: Development/Libraries Group: Development/Libraries
Summary: Headers required when building programs against cfitsio Summary: Headers required when building programs against cfitsio
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: pkgconfig Requires: pkgconfig glibc-headers
%description devel %description devel
Headers required when building a program against the cfitsio library. Headers required when building a program against the cfitsio library.
@ -78,12 +80,14 @@ compression algorithm.
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
%patch4 -p1
%build %build
FC=f95 FC=f95
export FC export FC
export CC=gcc # fixes -O*, -g export CC=gcc # fixes -O*, -g
%configure %configure --enable-reentrant
make shared %{?_smp_mflags} make shared %{?_smp_mflags}
ln -s libcfitsio.so.0 libcfitsio.so ln -s libcfitsio.so.0 libcfitsio.so
make fpack %{?_smp_mflags} make fpack %{?_smp_mflags}
@ -146,6 +150,9 @@ rm -rf %{buildroot}
%{_bindir}/funpack %{_bindir}/funpack
%changelog %changelog
* Sat Oct 29 2011 Sergio Pascual <sergiopr@fedoraproject.org> - 3.280-2
- Enable multithreading support
* Thu Jun 09 2011 Sergio Pascual <sergiopr@fedoraproject.org> - 3.280-1 * Thu Jun 09 2011 Sergio Pascual <sergiopr@fedoraproject.org> - 3.280-1
- New upstream version, with improved image compression floating-point FITS - New upstream version, with improved image compression floating-point FITS

@ -0,0 +1,12 @@
diff -ur cfitsio/Makefile.in cfitsio.new/Makefile.in
--- cfitsio/Makefile.in 2011-10-29 16:54:43.077132582 +0200
+++ cfitsio.new/Makefile.in 2011-10-29 16:55:38.648098260 +0200
@@ -90,7 +90,7 @@
shared: libcfitsio${SHLIB_SUFFIX}
libcfitsio${SHLIB_SUFFIX}: ${OBJECTS}
- ${SHLIB_LD} ${LDFLAGS} -o $@ ${OBJECTS}
+ ${SHLIB_LD} ${LDFLAGS} ${LIBS} -lm -o $@ ${OBJECTS}
install: libcfitsio.a $(INSTALL_DIRS)
@if [ -f libcfitsio.a ]; then \
Loading…
Cancel
Save