mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2026-05-05 04:16:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

main/graphite2: rebase old cmake patch

Browse Source 
The patch is neeed to fix build on x86 and to fix install directory for
cmake files so they are included in -dev subpackage.
This commit is contained in:
Natanael Copa 2018-08-24 08:59:02 +00:00
parent 2617aebe4b
commit aeb65ff53e
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main/graphite2/APKBUILD
View File

@ -3,7 +3,7 @@
pkgname=graphite2
_realname=${pkgname/2/}
pkgver=1.3.12
pkgrel=0
pkgrel=1
pkgdesc="reimplementation of the SIL Graphite text processing engine"
url="http://graphite.sil.org/"
arch="all"
@ -15,6 +15,7 @@ makedepends="$depends_dev cmake"
install=""
subpackages="$pkgname-static $pkgname-dev"
source="$pkgname-$pkgver.tar.gz::https://github.com/silnrsi/$_realname/archive/$pkgver.tar.gz
cmake.patch
"
builddir="$srcdir"/$_realname-$pkgver
@ -67,4 +68,5 @@ package() {
make DESTDIR="$pkgdir/" install
}
sha512sums="d0aed05b54445a9664435d5aef9d78fc07a89be23d18b7b1339d37412b09faca6da3dc1e72524e4b114724b76aa6f36934e8ab1a01bd0752e353efa075c9e643 graphite2-1.3.12.tar.gz"
sha512sums="d0aed05b54445a9664435d5aef9d78fc07a89be23d18b7b1339d37412b09faca6da3dc1e72524e4b114724b76aa6f36934e8ab1a01bd0752e353efa075c9e643 graphite2-1.3.12.tar.gz
ed1edb48adcaf29fd630d039b9436510cd7116a1a2d976a17912068e5446b17c33c099d0a3ac890f138126d80c2e0f3b56b8a4a28999486705e77f519a16adb3 cmake.patch"

23
main/graphite2/cmake.patch Normal file
View File

@ -0,0 +1,23 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 89a59af..b69e244 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -120,11 +120,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
if (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
target_link_libraries(graphite2 kernel32 msvcr90 mingw32 gcc user32)
else (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
- if (GRAPHITE2_SANITIZERS)
- target_link_libraries(graphite2 c gcc_s)
- else ()
- target_link_libraries(graphite2 c gcc)
- endif ()
+ target_link_libraries(graphite2 c gcc_s -lssp_nonshared)
endif (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
include(Graphite)
if (BUILD_SHARED_LIBS)
@@ -153,4 +149,4 @@ endif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
install(TARGETS graphite2 EXPORT graphite2 LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX} PUBLIC_HEADER DESTINATION include/graphite2 RUNTIME DESTINATION bin)
-install(EXPORT graphite2 DESTINATION share/graphite2 NAMESPACE gr2_)
+install(EXPORT graphite2 DESTINATION lib${LIB_SUFFIX}/cmake/graphite2 NAMESPACE gr2_)