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
Model registry
Monitor
Service Desk
Analyze
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
alpine
aports
Commits
f4a24425
Commit
f4a24425
authored
5 years ago
by
Leo
Browse files
Options
Downloads
Patches
Plain Diff
testing/glog: install libglog.pc instead of glog.pc
parent
301f5816
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
testing/glog/APKBUILD
+2
-2
2 additions, 2 deletions
testing/glog/APKBUILD
testing/glog/pc-file.patch
+4
-4
4 additions, 4 deletions
testing/glog/pc-file.patch
with
6 additions
and
6 deletions
testing/glog/APKBUILD
+
2
−
2
View file @
f4a24425
...
...
@@ -2,7 +2,7 @@
# Maintainer: David Huffman <storedbox@outlook.com>
pkgname
=
glog
pkgver
=
0.4.0
pkgrel
=
1
pkgrel
=
2
pkgdesc
=
"C++ implementation of the Google logging module"
options
=
"!check"
# Tests fail to compile on aarch64 armhf and armv7
url
=
"https://github.com/google/glog"
...
...
@@ -35,4 +35,4 @@ package() {
make
-C
build
DESTDIR
=
"
$pkgdir
"
install
}
sha512sums
=
"b585f1819ade2075f6b61dc5aaca5c3f9d25601dba2bd08b6c49b96ac5f79db23c6b7f2042df003f7130497dd7241fcaa8b107d1f97385cb66ce52d3c554b176 glog-0.4.0.tar.gz
316de55003e4724427e7516bde98a70e7a0b75dbff91248e75fcc9c21d7b2a9d4c35b41fedd49ce4ba34f6480a31ba421948c750db17cd8ada299a2718673bd8
pc-file.patch"
fd58efd42b299bb2e7c38af9c900f3ae454a99fea2a9b7b20bea50347bde663127ab0c19b5f5b3fb69ed5e8e19a7b43eb173332fe993f7e1cba66bf99921a870
pc-file.patch"
This diff is collapsed.
Click to expand it.
testing/glog/pc-file.patch
+
4
−
4
View file @
f4a24425
...
...
@@ -13,18 +13,18 @@ index 808330e..0b5aaff 100644
+endif ()
+
+if (PKGCONFIG_INSTALL_DIR)
+ configure_file ("cmake/glog.pc.in" "${PROJECT_BINARY_DIR}/${CPACK_PACKAGE_NAME}.pc" @ONLY)
+ install (FILES "${PROJECT_BINARY_DIR}/${CPACK_PACKAGE_NAME}.pc" DESTINATION "${PKGCONFIG_INSTALL_DIR}")
+ configure_file ("cmake/
lib
glog.pc.in" "${PROJECT_BINARY_DIR}/
lib
${CPACK_PACKAGE_NAME}.pc" @ONLY)
+ install (FILES "${PROJECT_BINARY_DIR}/
lib
${CPACK_PACKAGE_NAME}.pc" DESTINATION "${PKGCONFIG_INSTALL_DIR}")
+endif ()
+
configure_package_config_file (glog-config.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/glog-config.cmake
INSTALL_DESTINATION ${_glog_CMake_INSTALLDIR}
diff --git a/cmake/glog.pc.in b/cmake/glog.pc.in
diff --git a/cmake/
lib
glog.pc.in b/cmake/
lib
glog.pc.in
new file mode 100644
index 0000000..98b54bb
--- /dev/null
+++ b/cmake/glog.pc.in
+++ b/cmake/
lib
glog.pc.in
@@ -0,0 +1,10 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
...
...
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