1
0
forked from pool/libzrtpcpp

Accepting request 112707 from network:telephony

- better libdir handling (forwarded request 112706 from k0da)

OBS-URL: https://build.opensuse.org/request/show/112707
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libzrtpcpp?expand=0&rev=19
This commit is contained in:
Stephan Kulow 2012-04-12 07:39:20 +00:00 committed by Git OBS Bridge
commit b47fe031a3
3 changed files with 31 additions and 0 deletions

16
libzrtpcpp-libdir.patch Normal file
View File

@ -0,0 +1,16 @@
--- libzrtpcpp-2.0.0/CMakeLists.txt.orig 2012-04-05 15:26:17.231590000 +0200
+++ libzrtpcpp-2.0.0/CMakeLists.txt 2012-04-05 15:26:37.471769000 +0200
@@ -50,12 +50,7 @@
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)

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Apr 5 13:28:26 UTC 2012 - dvaleev@suse.com
- better libdir handling
-------------------------------------------------------------------
Thu Apr 5 11:59:40 UTC 2012 - dvaleev@suse.com
- fix libdir for ppc64
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 27 08:02:08 UTC 2011 - coolo@suse.com Tue Sep 27 08:02:08 UTC 2011 - coolo@suse.com

View File

@ -31,6 +31,7 @@ BuildRequires: gcc-c++
BuildRequires: ccrtp-devel >= 2.0.0 BuildRequires: ccrtp-devel >= 2.0.0
BuildRequires: libopenssl-devel >= 0.9.8 BuildRequires: libopenssl-devel >= 0.9.8
BuildRequires: pkgconfig BuildRequires: pkgconfig
Patch0: libzrtpcpp-libdir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -61,6 +62,7 @@ documentation for building applications that use libzrtpcpp.
%prep %prep
%setup -q %setup -q
%patch0 -p1
%build %build
mkdir build mkdir build
@ -72,6 +74,9 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DCMAKE_VERBOSE_MAKEFILE=TRUE \ -DCMAKE_VERBOSE_MAKEFILE=TRUE \
-DCMAKE_C_FLAGS_RELEASE:STRING="%{optflags}" \ -DCMAKE_C_FLAGS_RELEASE:STRING="%{optflags}" \
-DCMAKE_CXX_FLAGS_RELEASE:STRING="%{optflags}" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="%{optflags}" \
%ifarch x86_64 ppc64 s390x
-DLIB_SUFFIX=64 \
%endif
.. ..
make %{?_smp_mflags} V=1 make %{?_smp_mflags} V=1