Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
aports
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dominika Liberda
aports
Commits
988c3763
Commit
988c3763
authored
6 years ago
by
Natanael Copa
Browse files
Options
Downloads
Patches
Plain Diff
main/graphite2: build fix for x86
we need -lssp_nonshared on alpine x86
parent
02c5be04
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
main/graphite2/APKBUILD
+4
-2
4 additions, 2 deletions
main/graphite2/APKBUILD
main/graphite2/cmake.patch
+16
-13
16 additions, 13 deletions
main/graphite2/cmake.patch
with
20 additions
and
15 deletions
main/graphite2/APKBUILD
+
4
−
2
View file @
988c3763
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
pkgname
=
graphite2
pkgname
=
graphite2
_realname
=
${
pkgname
/2/
}
_realname
=
${
pkgname
/2/
}
pkgver
=
1.3.11
pkgver
=
1.3.11
pkgrel
=
0
pkgrel
=
1
pkgdesc
=
"reimplementation of the SIL Graphite text processing engine"
pkgdesc
=
"reimplementation of the SIL Graphite text processing engine"
url
=
"http://graphite.sil.org/"
url
=
"http://graphite.sil.org/"
arch
=
"all"
arch
=
"all"
...
@@ -16,6 +16,7 @@ install=""
...
@@ -16,6 +16,7 @@ install=""
subpackages
=
"
$pkgname
-static
$pkgname
-dev"
subpackages
=
"
$pkgname
-static
$pkgname
-dev"
source
=
"
$pkgname
-
$pkgver
.tar.gz::https://github.com/silnrsi/
$_realname
/archive/
$pkgver
.tar.gz
source
=
"
$pkgname
-
$pkgver
.tar.gz::https://github.com/silnrsi/
$_realname
/archive/
$pkgver
.tar.gz
graphite2-1.2.0-cmakepath.patch
graphite2-1.2.0-cmakepath.patch
cmake.patch
"
"
builddir
=
"
$srcdir
"
/
$_realname
-
$pkgver
builddir
=
"
$srcdir
"
/
$_realname
-
$pkgver
...
@@ -69,4 +70,5 @@ package() {
...
@@ -69,4 +70,5 @@ package() {
}
}
sha512sums
=
"53c5e9442900bc4d8a1b45be5198c25a82e34b077d62ff11036f5f4bfc69906891a16dbc17d521fafe8738ef9363cbacd201e1848221cdd70c5c40a59c4ab03f graphite2-1.3.11.tar.gz
sha512sums
=
"53c5e9442900bc4d8a1b45be5198c25a82e34b077d62ff11036f5f4bfc69906891a16dbc17d521fafe8738ef9363cbacd201e1848221cdd70c5c40a59c4ab03f graphite2-1.3.11.tar.gz
4ef5414e6d554bb8d6ead435e38d061a073f350c313b7141158bb68332f5f57ca5250385875a387b828bb657964588e974143b96b5e11c2cd314871e7baddb88 graphite2-1.2.0-cmakepath.patch"
4ef5414e6d554bb8d6ead435e38d061a073f350c313b7141158bb68332f5f57ca5250385875a387b828bb657964588e974143b96b5e11c2cd314871e7baddb88 graphite2-1.2.0-cmakepath.patch
f6630138d67764b8240819125810544cf5ad89554b298de9762e5e05e85f9df719d957ac3f2e7a2c4e201cc6d58544f196d742b93fc2c5754db3c3ffe663492d cmake.patch"
This diff is collapsed.
Click to expand it.
main/graphite2/cmake.patch
+
16
−
13
View file @
988c3763
--- ./tests/CMakeLists.txt.orig
--- graphite2-1.2.0/src/CMakeLists.txt.orig 2012-11-09 17:48:04.908391335 +0800
+++ ./tests/CMakeLists.txt
+++ graphite2-1.2.0/src/CMakeLists.txt 2012-11-09 17:48:48.647102280 +0800
@@ -58,7 +58,9 @@
@@ -118,11 +118,7 @@
LINKER_LANGUAGE C)
if (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
endif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
target_link_libraries(graphite2 kernel32 msvcr90 mingw32 gcc user32)
else (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
-add_subdirectory(comparerenderer)
- if (GRAPHITE2_ASAN)
+if (GRAPHITE2_COMPARE_RENDERER)
- target_link_libraries(graphite2 c gcc_s)
+ add_subdirectory(comparerenderer)
- else (GRAPHITE2_ASAN)
+endif (GRAPHITE2_COMPARE_RENDERER)
- target_link_libraries(graphite2 c gcc)
add_subdirectory(endian)
- endif (GRAPHITE2_ASAN)
add_subdirectory(bittwiddling)
+ target_link_libraries(graphite2 c gcc_s -lssp_nonshared)
if (NOT GRAPHITE2_NFILEFACE)
include(Graphite)
nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
endif (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment