m/ptouch-print
1
0
Fork 0
mirror of https://git.familie-radermacher.ch/linux/ptouch-print.git synced 2026-09-15 22:27:34 +00:00
Code Issues Releases Activity

cmake: let the argp probe pass where argp-standalone needs strchrnul

Browse Source 
On macOS with Homebrew's argp-standalone, Findargp's link test for
argp_parse fails with an undefined strchrnul, because libargp.a itself
references that GNU extension and the platform has none. The module then
stops with "does not have a symbol named argp_parse", which is not what
is wrong.

Probe for strchrnul first (with _GNU_SOURCE, so glibc answers correctly).
Where it exists, the test is unchanged. Where it is missing, run the same
argp_parse test with a local definition of strchrnul, and have ptouch-print
supply that definition for the real build.

On glibc nothing changes: the probe finds strchrnul and the original test
runs. Checked on Debian stable in the same session.
This commit is contained in:
Kevin Bradenstein
2026-09-08 07:16:31 +02:00
committed by Dominic Radermacher
parent 97a9576c6e
commit ef6e6f4925
3 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+5
View File
@@ -15,6 +15,11 @@ find_package(Git REQUIRED)
find_package(PkgConfig REQUIRED)
find_package(Intl REQUIRED)
find_package(argp REQUIRED)
if(NOT ARGP_IN_LIBC AND NOT HAVE_STRCHRNUL)
# See cmake/Findargp.cmake: argp-standalone needs a strchrnul() the
# platform does not have, so ptouch-print.c defines one.
add_compile_definitions(NEED_STRCHRNUL=1)
endif()
pkg_check_modules(LIBUSB REQUIRED libusb-1.0)