Accepting request 257898 from devel:ARM:Factory
- add link-gcc-shared.diff: link -lgcc_s to fix undefined symbols on various ARM architectures OBS-URL: https://build.opensuse.org/request/show/257898 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/graphite2?expand=0&rev=17
This commit is contained in:
@@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Oct 21 18:51:12 UTC 2014 - dmueller@suse.com
|
||||||
|
|
||||||
|
- add link-gcc-shared.diff: link -lgcc_s to fix undefined symbols
|
||||||
|
on various ARM architectures
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Jan 29 17:57:37 UTC 2014 - tchvatal@suse.com
|
Wed Jan 29 17:57:37 UTC 2014 - tchvatal@suse.com
|
||||||
|
|
||||||
|
@@ -28,6 +28,7 @@ Source0: http://downloads.sourceforge.net/silgraphite/graphite2-%{version
|
|||||||
Source1: baselibs.conf
|
Source1: baselibs.conf
|
||||||
Patch0: no-specific-nunit-version.diff
|
Patch0: no-specific-nunit-version.diff
|
||||||
Patch1: soname.diff
|
Patch1: soname.diff
|
||||||
|
Patch2: link-gcc-shared.diff
|
||||||
BuildRequires: asciidoc
|
BuildRequires: asciidoc
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: fontconfig-devel
|
BuildRequires: fontconfig-devel
|
||||||
@@ -78,6 +79,7 @@ This package contains the libexttextcat development files.
|
|||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
%patch2
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%cmake \
|
%cmake \
|
||||||
|
11
link-gcc-shared.diff
Normal file
11
link-gcc-shared.diff
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
--- src/CMakeLists.txt
|
||||||
|
+++ src/CMakeLists.txt
|
||||||
|
@@ -121,7 +121,7 @@
|
||||||
|
if (GRAPHITE2_ASAN)
|
||||||
|
target_link_libraries(graphite2 c gcc_s)
|
||||||
|
else (GRAPHITE2_ASAN)
|
||||||
|
- target_link_libraries(graphite2 c gcc)
|
||||||
|
+ target_link_libraries(graphite2 c gcc_s)
|
||||||
|
endif (GRAPHITE2_ASAN)
|
||||||
|
include(Graphite)
|
||||||
|
nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
|
Reference in New Issue
Block a user