SHA256
8
0
forked from pool/cpprest

Accepting request 314256 from devel:libraries:c_c++

build fixes

OBS-URL: https://build.opensuse.org/request/show/314256
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cpprest?expand=0&rev=3
This commit is contained in:
2015-06-30 08:18:53 +00:00
committed by Git OBS Bridge
4 changed files with 37 additions and 1 deletions

8
_constraints Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0"?>
<constraints>
<hardware>
<memory>
<size unit="M">4000</size>
</memory>
</hardware>
</constraints>

11
cpprest-pthread.patch Normal file
View File

@@ -0,0 +1,11 @@
Index: x/Release/tests/common/UnitTestpp/CMakeLists.txt
===================================================================
--- x.orig/Release/tests/common/UnitTestpp/CMakeLists.txt
+++ x/Release/tests/common/UnitTestpp/CMakeLists.txt
@@ -49,4 +49,4 @@ elseif(WIN32)
endif()
add_library(${LIB}unittestpp ${UT_SOURCES})
-target_link_libraries(${LIB}unittestpp ${ANDROID_STL_FLAGS})
\ No newline at end of file
+target_link_libraries(${LIB}unittestpp ${ANDROID_STL_FLAGS} pthread)

View File

@@ -1,3 +1,13 @@
-------------------------------------------------------------------
Sun Jun 28 13:11:08 UTC 2015 - astieger@suse.com
- fix architecture builds
-------------------------------------------------------------------
Wed Jun 24 10:04:53 UTC 2015 - idonmez@suse.com
- Add cpprest-pthread.patch to fix unit test linking
-------------------------------------------------------------------
Fri Jun 12 09:00:49 UTC 2015 - astieger@suse.com

View File

@@ -26,6 +26,7 @@ License: Apache-2.0
Group: Devlopment/Libraries/C and C++
Url: https://casablanca.codeplex.com/
Source: http://download-codeplex.sec.s-msft.com/Download/SourceControlFileDownload.ashx?ProjectName=casablanca&changeSetId=c7d85ee385c6#/%{name}-%{version}.zip
Patch1: cpprest-pthread.patch
BuildRequires: boost-devel
BuildRequires: cmake >= 2.6
BuildRequires: gcc-c++
@@ -63,9 +64,15 @@ Development files.
%prep
%setup -q -c
%patch1 -p1
%build
%cmake -DCMAKE_BUILD_TYPE=Release ../Release
%cmake \
-DCMAKE_BUILD_TYPE=Release \
%ifarch ppc ppc64 ppc64le aarch64 armv7l
-DCMAKE_CXX_FLAGS:STRING="%{optflags} -Wno-error=attributes -Wno-error=type-limits -Wno-error=cast-align -Wno-error=deprecated-declarations" \
%endif
../Release
make %{?_smp_mflags}
%install