rpms/iaxclient/devel iaxclient-2.1beta3-implicit-DSO-libm.patch, NONE, 1.1 iaxclient.spec, 1.2, 1.3
Tom Callaway
spot at fedoraproject.org
Wed Feb 10 20:35:39 UTC 2010
Author: spot
Update of /cvs/pkgs/rpms/iaxclient/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11577
Modified Files:
iaxclient.spec
Added Files:
iaxclient-2.1beta3-implicit-DSO-libm.patch
Log Message:
fix implicit DSO linking
iaxclient-2.1beta3-implicit-DSO-libm.patch:
configure.ac | 3 +++
1 file changed, 3 insertions(+)
--- NEW FILE iaxclient-2.1beta3-implicit-DSO-libm.patch ---
diff -up iaxclient-2.1beta3/configure.ac.DSO iaxclient-2.1beta3/configure.ac
--- iaxclient-2.1beta3/configure.ac.DSO 2010-02-10 14:59:13.713769339 -0500
+++ iaxclient-2.1beta3/configure.ac 2010-02-10 14:59:13.720763386 -0500
@@ -49,6 +49,9 @@ AC_CHECK_FUNCS([vsnprintf _vsnprintf])
AC_CHECK_FUNCS([srandomdev srandom srand48 random lrand48])
AC_CHECK_FUNCS(gettimeofday)
+# Implicit DSO linking fix
+AC_CHECK_LIB(m, sincos)
+
ACX_PTHREAD
AC_CHECK_PROG(have_pkg_config, pkg-config, yes, no)
Index: iaxclient.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iaxclient/devel/iaxclient.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- iaxclient.spec 25 Jul 2009 02:59:42 -0000 1.2
+++ iaxclient.spec 10 Feb 2010 20:35:38 -0000 1.3
@@ -11,7 +11,7 @@
Name: iaxclient
Version: %{mainver}
-Release: 0.4.%{betaver}%{?dist}
+Release: 0.5.%{betaver}%{?dist}
Summary: Library for creating telephony solutions that interoperate with Asterisk
Group: System Environment/Libraries
License: LGPLv2+
@@ -27,10 +27,11 @@ Patch2: iaxclient-2.1beta3-tcl-included
Patch3: iaxclient-2.1beta3-tcl-libdir.patch
Patch4: iaxclient-2.1beta3-tcl-nodoc.patch
Patch5: iaxclient-2.1beta3-theora-detection.patch
+Patch6: iaxclient-2.1beta3-implicit-DSO-libm.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: speex-devel, libtheora-devel, gsm-devel, portaudio-devel, iax-devel
BuildRequires: tk-devel, gtk2-devel, SDL-devel, libogg-devel, liboggz-devel
-BuildRequires: wxGTK-devel, libvidcap-devel, desktop-file-utils
+BuildRequires: wxGTK-devel, libvidcap-devel, desktop-file-utils, libtool
%description
Iaxclient is an open source, multiplatform library for creating telephony
@@ -93,27 +94,30 @@ wx IAX Phone Client.
%patch3 -p1 -b .libdir
%patch4 -p1 -b .nodoc
%patch5 -p1 -b .theoradetect
+%patch6 -p1 -b .DSO
+autoreconf
chmod -x contrib/tcl/README.txt
sed -i 's|/usr/lib|%{_libdir}|g' lib/libiax2/iax-config.in
%build
%configure --disable-static
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-make %{?_smp_mflags}
+# sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+# sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+make %{?_smp_mflags} LIBTOOL="%{_bindir}/libtool"
cd contrib/tcl/
%configure
-make %{?_smp_mflags}
+make %{?_smp_mflags} LIBTOOL="%{_bindir}/libtool"
%install
rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} LIBTOOL="%{_bindir}/libtool"
find %{buildroot} -name '*.la' -exec rm -f {} ';'
+find %{buildroot} -name '*.a' -exec rm -f {} ';'
install -d %{buildroot}%{tcl_sitearch}
mv %{buildroot}%{_libdir}/iaxclient %{buildroot}%{tcl_sitearch}/
cd contrib/tcl
-make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} LIBTOOL="%{_bindir}/libtool"
mv %{buildroot}%{_libdir}/tcliaxclient0.2 %{buildroot}%{tcl_sitearch}/tcliaxclient0.2
chmod +x %{buildroot}%{tcl_sitearch}/iaxclient/tkphone/phone.ui.tcl
chmod +x %{buildroot}%{tcl_sitearch}/iaxclient/tkphone/pref.ui.tcl
@@ -180,6 +184,9 @@ rm -rf %{buildroot}
%{_datadir}/pixmaps/wxiax.png
%changelog
+* Wed Feb 10 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 2.1-0.5.beta3
+- fix implicit DSO linking issue with libm
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-0.4.beta3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
More information about the scm-commits
mailing list