[libzrtpcpp] fix build on 64-bit arches

Dan Horák sharkcz at fedoraproject.org
Tue Feb 21 21:16:27 UTC 2012


commit 21c5c97307ef1e4685c8f3ff83a1bb4e26fecc66
Author: Dan Horák <dan at danny.cz>
Date:   Tue Feb 21 22:16:25 2012 +0100

    fix build on 64-bit arches

 libzrtpcpp-2.0.0-64bit.patch |   18 ++++++++++++++++++
 libzrtpcpp.spec              |    8 +++++++-
 2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/libzrtpcpp-2.0.0-64bit.patch b/libzrtpcpp-2.0.0-64bit.patch
new file mode 100644
index 0000000..d0da10e
--- /dev/null
+++ b/libzrtpcpp-2.0.0-64bit.patch
@@ -0,0 +1,18 @@
+diff -up libzrtpcpp-2.0.0/CMakeLists.txt.64bit libzrtpcpp-2.0.0/CMakeLists.txt
+--- libzrtpcpp-2.0.0/CMakeLists.txt.64bit	2012-02-21 22:04:55.000000000 +0100
++++ libzrtpcpp-2.0.0/CMakeLists.txt	2012-02-21 22:09:14.000000000 +0100
+@@ -49,13 +49,7 @@ endif()
+ enable_arg(ccrtp true "Enable GNU ccRTP support for GNU ZRTP")
+ args_help()
+ 
+-# this caused problems in debian where it has to always be lib....
+-set(LIBDIRNAME "lib")
+-if (NOT EXISTS /etc/debian_version)
+-    if ( "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" )
+-        set(LIBDIRNAME "lib64")
+-    endif()
+-endif()
++set(LIBDIRNAME "lib${LIB_SUFFIX}")
+ 
+ # setup the Thread include and lib
+ find_package(Threads)
diff --git a/libzrtpcpp.spec b/libzrtpcpp.spec
index 6bc76a4..3d229df 100644
--- a/libzrtpcpp.spec
+++ b/libzrtpcpp.spec
@@ -1,6 +1,6 @@
 Name:           libzrtpcpp
 Version:        2.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        ZRTP support library for the GNU ccRTP stack
 
 Group:          System Environment/Libraries
@@ -9,6 +9,8 @@ URL:            http://www.gnu.org/software/ccrtp/
 Source0:        ftp://ftp.gnu.org/gnu/ccrtp/libzrtpcpp-%{version}.tar.gz
 # remove ec ecryption, our ssl doesn't ship with it. 
 Patch0:         libzrtpcpp-2.0.0-remove-ec.patch
+# fix build on 64-bit arches
+Patch1:         libzrtpcpp-2.0.0-64bit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	ccrtp-devel 
@@ -40,6 +42,7 @@ developing applications that use %{name}.
 %setup -q
 
 %patch0 -p1
+%patch1 -p1
 
 
 %build
@@ -76,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Feb 21 2012 Dan Horák <dan[at]danny.cz> - 2.0.0-2
+- fix build on 64-bit arches
+
 * Sun Jan 22 2012 Kevin Fenzi <kevin at scrye.com> - 2.0.0-1
 - Update to 2.0.0
 


More information about the scm-commits mailing list