Generation of libkiwix.pc via meson's pkgconfig module #1133
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #1133 +/- ##
=======================================
Coverage 41.43% 41.43%
=======================================
Files 59 59
Lines 4245 4245
Branches 2323 2323
=======================================
Hits 1759 1759
Misses 990 990
Partials 1496 1496 ☔ View full report in Codecov by Sentry. |
veloman-yunkan
force-pushed
the
pkgconfig
branch
2 times, most recently
from
feaf651
to
ccfe0bd
Compare
|
@veloman-yunkan Great, will do my best to check this PR. I believe we probably need to have PR at kiwix-tools and kiwix-desktop tomsupport this new naming? |
kelson42
approved these changes
Sep 15, 2024
Generation of kiwix.pc using the previous approach still stays in place.
Also fixed capitalization in an error message
veloman-yunkan
force-pushed
the
pkgconfig
branch
from
ccfe0bd
to
15c5e15
Compare
This was referenced Sep 16, 2024
@kelson42 Here they are - kiwix/kiwix-tools#707, kiwix/kiwix-desktop#1213 |
The old version information appears to be a remnant of the initial setup of the build tree long ago with further utilization of a quick build procedure without using |
|
@veloman-yunkan Should we not remove |
Below are the contents of libkiwix.pc and kiwix.pc files generated using
the new and old approaches, respectively, for native_dyn and
native_static configurations:
```
$ cat BUILD_native_dyn/INSTALL/lib/x86_64-linux-gnu/pkgconfig/libkiwix.pc
prefix=<REDACTED>
includedir=${prefix}/include
libdir=${prefix}/lib/x86_64-linux-gnu
Name: libkiwix
Description: A library that contains useful primitives that Kiwix readers have in common
Version: 14.0.0
Requires.private: icu-i18n, libzim < 10.0.0, libzim >= 9.0.0, pugixml, libcurl, libmicrohttpd, zlib, xapian-core
Libs: -L${prefix}/lib/x86_64-linux-gnu -lkiwix
Libs.private: -pthread
Cflags: -I${includedir}
$ cat BUILD_native_dyn/INSTALL/lib/x86_64-linux-gnu/pkgconfig/kiwix.pc
prefix=<REDACTED>
libdir=${prefix}/lib64
includedir=${prefix}/include
Name: libkiwix
Description: A library that contains a lot of things used by used by other kiwix programs
Version: 14.0.0
Requires: libzim icu-i18n pugixml libcurl libmicrohttpd xapian-core
Libs: -L${libdir} -lkiwix
Cflags: -I${includedir}/
$ cat BUILD_native_static/INSTALL/lib/x86_64-linux-gnu/pkgconfig/libkiwix.pc
prefix=<REDACTED>
includedir=${prefix}/include
libdir=${prefix}/lib/x86_64-linux-gnu
Name: libkiwix
Description: A library that contains useful primitives that Kiwix readers have in common
Version: 14.0.0
Requires: icu-i18n, libzim < 10.0.0, libzim >= 9.0.0, pugixml, libcurl, libmicrohttpd, zlib, xapian-core
Libs: -L${prefix}/lib/x86_64-linux-gnu -lkiwix -pthread
Cflags: -I${includedir} -pthread
$ cat BUILD_native_static/INSTALL/lib/x86_64-linux-gnu/pkgconfig/kiwix.pc
prefix=<REDACTED>
libdir=${prefix}/lib64
includedir=${prefix}/include
Name: libkiwix
Description: A library that contains a lot of things used by used by other kiwix programs
Version: 14.0.0
Requires: libzim icu-i18n pugixml libcurl libmicrohttpd xapian-core
Libs: -L${libdir} -lkiwix
Cflags: -I${includedir}/
```
The notable differences are:
- libdir changed from `${prefix}/lib64` to `${prefix}/lib/x86_64-linux-gnu`
- for native_dyn configuration Requires.private is used
- pthread has appeared in Libs/Libs.private and/or Cflags
- version information was added to the libzim requirement
veloman-yunkan
force-pushed
the
pkgconfig
branch
from
15c5e15
to
cbfd3ec
Compare
@kelson42 Thanks for catching this. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1117
The name of the
libkiwixpkgconfig file has changed fromkiwix.pctolibkiwix.pc.Below are the contents of libkiwix.pc and kiwix.pc files generated using the new and old approaches, respectively, for
native_dynandnative_staticconfigurations:The notable differences are:
libdirchanged from${prefix}/lib64to${prefix}/lib/x86_64-linux-gnufor
native_dynconfigurationRequires.privateis usedpthreadhas appeared inLibs/Libs.privateand/orCflags(likely inherited fromlibzim)version information was added to the
libzimrequirement.