util/parse: Fix build error on ubuntu
PATCH 1/1 util/parse: Fix build error on ubuntu
Fix the below build error on ubuntu:../util/parse-configs.c:7:10: fatal error: iniparser.h: No such file or directory
7 | #include <iniparser.h>
| ^~~~~~~~~~~~~
The same error is not observed on other OS because they do create symlinks as below
lrwxrwxrwx. 1 root root 21 Jul 22 2021 /usr/include/iniparser.h -> iniparser/iniparser.h
the error can be avoided by using the correct include path. Also, catch the error during setup instead of the build by adding the check for meson.build
--- meson.build | 2 +- util/parse-configs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
meson.build +1 -1
@@ -160,7 +160,7 @@ cc = meson.get_compiler('c') # keyutils and iniparser lack pkgconfig keyutils = cc.find_library('keyutils', required : get_option('keyutils')) -iniparser = cc.find_library('iniparser', required : true) +iniparser = cc.find_library('iniparser', required : true, has_headers: 'iniparser/iniparser.h') conf = configuration_data() check_headers = [
util/parse-configs.c +1 -1
@@ -4,7 +4,7 @@#include <dirent.h> #include <errno.h> #include <fcntl.h> -#include <iniparser.h> +#include <iniparser/iniparser.h> #include <sys/stat.h> #include <util/parse-configs.h> #include <util/strbuf.h>
Signature · 1 line
2.35.1
Second hunk of this diff seems to be a revert of [1] which might break the ndctl build on Arch Linux.
AFAIS for Centos/Fedora/RHEL etc the iniparser.h file is present in the default include path('/usr/include') as a softlink to '/usr/include/iniparser/iniparser.h' . Ubuntu/Debian seems to an exception where path '/usr/include/iniparser.h' is not present.
I guess thats primarily due to no 'make install' target available in iniparser makefiles [1] that fixes a single include patch. This may have led to differences across distros where to place these header files.
I would suggest changing to this in meson.build to atleast catch if the iniparser.h is not present at the expected path during meson setup:
iniparser = cc.find_library('iniparser', required : true, has_headers: 'iniparser.h')
[1] addc5fd8511('Fix iniparser.h include')
[2] https://github.com/ndevilla/iniparser/blob/master/Makefile
Quoted 49 lines · Aneesh Kumar K.V
Fix the below build error on ubuntu:
../util/parse-configs.c:7:10: fatal error:iniparser.h: No such file or directory
7 | #include <iniparser.h>
| ^~~~~~~~~~~~~The same error is not observed on other OS because they do create symlinks as below
lrwxrwxrwx. 1 root root 21 Jul 22 2021
/usr/include/iniparser.h->iniparser/iniparser.hthe error can be avoided by using the correct include path. Also, catch the error during setup instead of the build by adding the check for meson.build
Signed-off-by Aneesh Kumar K.V <[email protected]>--- meson.build | 2 +- util/parse-configs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)meson.build +1
-1@@ -160,7 +160,7 @@ cc = meson.get_compiler('c') # keyutils and iniparser lack pkgconfig keyutils = cc.find_library('keyutils', required : get_option('keyutils')) -iniparser = cc.find_library('iniparser', required : true) +iniparser = cc.find_library('iniparser', required : true, has_headers: 'iniparser/iniparser.h') conf = configuration_data() check_headers = [util/parse-configs.c +1
-1@@ -4,7 +4,7 @@#include <dirent.h> #include <errno.h> #include <fcntl.h> -#include <iniparser.h> +#include <iniparser/iniparser.h> #include <sys/stat.h> #include <util/parse-configs.h> #include <util/strbuf.h> Signature · 1 line
2.35.1
Signature · 2 lines
Cheers ~ Vaibhav
Quoted 12 lines · Vaibhav Jain
Second hunk of this diff seems to be a revert of [1] which might break the ndctl build on Arch Linux.
AFAIS for Centos/Fedora/RHEL etc the
iniparser.hfile is present in the default include path('/usr/include') as a softlink to '/usr/include/iniparser/iniparser.h' . Ubuntu/Debian seems to an exception where path '/usr/include/iniparser.h' is not present.I guess thats primarily due to no 'make install' target available in iniparser makefiles [1] that fixes a single include patch. This may have led to differences across distros where to place these header files.
Quoted 7 lines
I would suggest changing to this in meson.build to atleast catch if the
iniparser.his not present at the expected path during meson setup:iniparser =
cc.find_library('iniparser', required : true, has_headers: 'iniparser.h')[1] addc5fd8511('Fix
iniparser.hinclude')
[2] https://github.com/ndevilla/iniparser/blob/master/Makefile
We can do this.
config.h.meson +3 -0
@@ -82,6 +82,9 @@ /* Define to 1 if you have the <unistd.h> header file. */ #mesondefine HAVE_UNISTD_H +/* Define to 1 if you have the <iniparser/iniparser.h> header file. */ +#mesondefine HAVE_INIPARSER_INCLUDE_H + /* Define to 1 if using libuuid */ #mesondefine HAVE_UUID
meson.build +1 -0
@@ -176,6 +176,7 @@ check_headers = [ ['HAVE_SYS_STAT_H', 'sys/stat.h'], ['HAVE_SYS_TYPES_H', 'sys/types.h'], ['HAVE_UNISTD_H', 'unistd.h'], + ['HAVE_INIPARSER_INCLUDE_H', 'iniparser/iniparser.h'], ] foreach h : check_headers
util/parse-configs.c +4 -0
@@ -4,7 +4,11 @@#include <dirent.h> #include <errno.h> #include <fcntl.h> +#ifdef HAVE_INIPARSER_INCLUDE_H +#include <iniparser/iniparser.h> +#else #include <iniparser.h> +#endif #include <sys/stat.h> #include <util/parse-configs.h> #include <util/strbuf.h>
Quoted 57 lines · Aneesh Kumar K.V
Quoted 12 lines · Vaibhav Jain
Second hunk of this diff seems to be a revert of [1] which might break the ndctl build on Arch Linux.
AFAIS for Centos/Fedora/RHEL etc the
iniparser.hfile is present in the default include path('/usr/include') as a softlink to '/usr/include/iniparser/iniparser.h' . Ubuntu/Debian seems to an exception where path '/usr/include/iniparser.h' is not present.I guess thats primarily due to no 'make install' target available in iniparser makefiles [1] that fixes a single include patch. This may have led to differences across distros where to place these header files.
Quoted 7 lines
I would suggest changing to this in meson.build to atleast catch if the
iniparser.his not present at the expected path during meson setup:iniparser =
cc.find_library('iniparser', required : true, has_headers: 'iniparser.h')[1] addc5fd8511('Fix
iniparser.hinclude')
[2] https://github.com/ndevilla/iniparser/blob/master/MakefileWe can do this.
config.h.meson +3
-0@@ -82,6 +82,9 @@ /* Define to 1 if you have the <unistd.h> header file. */ #mesondefine HAVE_UNISTD_H +/* Define to 1 if you have the <iniparser/iniparser.h> header file. */ +#mesondefine HAVE_INIPARSER_INCLUDE_H + /* Define to 1 if using libuuid */ #mesondefine HAVE_UUIDmeson.build +1
-0@@ -176,6 +176,7 @@ check_headers = [ ['HAVE_SYS_STAT_H', 'sys/stat.h'], ['HAVE_SYS_TYPES_H', 'sys/types.h'], ['HAVE_UNISTD_H', 'unistd.h'], + ['HAVE_INIPARSER_INCLUDE_H', 'iniparser/iniparser.h'], ] foreach h : check_headersutil/parse-configs.c +0
-0@@ -4,7 +4,11 @@#include <dirent.h>
util/parse-configs.c line 14
Quoted 10 lines
util/parse-configs.c +4
-0#include <errno.h> #include <fcntl.h> +#ifdef HAVE_INIPARSER_INCLUDE_H +#include <iniparser/iniparser.h> +#else #include <iniparser.h> +#endif #include <sys/stat.h> #include <util/parse-configs.h> #include <util/strbuf.h>
Agree, above patch can fix this issue. Though I really wanted to avoid trickling changes to the parse-configs.c since the real problem is with non consistent location for iniparser.h header across distros.
I gave it some thought and came up with this patch to meson.build that can pick up appropriate '/usr/include' or '/usr/include/iniparser' directory as include path to the compiler.
Also since there seems to be no standard location for this header file I have included a meson build option named 'iniparser-includedir' that can point to the dir where 'iniparser.h' can be found.
meson.build +20 -2
@@ -158,9 +158,27 @@ endif cc = meson.get_compiler('c') -# keyutils and iniparser lack pkgconfig +# keyutils lack pkgconfig keyutils = cc.find_library('keyutils', required : get_option('keyutils')) -iniparser = cc.find_library('iniparser', required : true) + +# iniparser lacks pkgconfig and its header files are either at '/usr/include' or '/usr/include/iniparser' +# First use the path provided by user via meson configure -Diniparser-includedir=<somepath> +# if thats not provided than try searching for 'iniparser.h' in default system include path +# and if that not found than as a last resort try looking at '/usr/include/iniparser' + +if get_option('iniparser-includedir') == '' + iniparser = cc.find_library('iniparser', required : false, has_headers : 'iniparser.h') + # if not available at the default path try '/usr/include/iniparser' + if not iniparser.found() + iniparser = cc.find_library('iniparser', required : true, has_headers : 'iniparser/iniparser.h') + iniparser = declare_dependency(include_directories:'/usr/include/iniparser', dependencies:iniparser) + endif +else + iniparser_incdir = include_directories(get_option('iniparser-includedir')) + iniparser = cc.find_library('iniparser', required : true, has_headers : 'iniparser.h', + header_include_directories:iniparser_incdir) + iniparser = declare_dependency(include_directories:iniparser_incdir, dependencies:iniparser) +endif conf = configuration_data() check_headers = [
meson_options.txt +2 -0
@@ -23,3 +23,5 @@ option('pkgconfiglibdir', type : 'string', value : '', description : 'directory for standard pkg-config files') option('bashcompletiondir', type : 'string', description : '''${datadir}/bash-completion/completions''') +option('iniparser-includedir', type : 'string', + description : '''Path containing the iniparser header files''')
Signature · 2 lines
Cheers ~ Vaibhav
Verma, Vishal L
maintainerQuoted 4 lines · Vaibhav Jain
Quoted 2 lines · Aneesh Kumar K.V
Vaibhav Jain <[email protected]> writes:
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
Second hunk of this diff seems to be a revert of [1] which might break the ndctl build on Arch Linux.
AFAIS for Centos/Fedora/RHEL etc the
iniparser.hfile is present in the default include path('/usr/include') as a softlink to '/usr/include/iniparser/iniparser.h' . Ubuntu/Debian seems to an exception where path '/usr/include/iniparser.h' is not present.
Sigh, yeah, that's an unfortunate situation.
Quoted 6 lines
Quoted 1 line
Agree, above patch can fix this issue. Though I really wanted to avoid trickling changes to the
parse-configs.csince the real problem is with non consistent location foriniparser.hheader across distros.
Quoted 7 lines
I gave it some thought and came up with this patch to meson.build that can pick up appropriate '
/usr/include' or '/usr/include/iniparser' directory as include path to the compiler.Also since there seems to be no standard location for this header file I have included a meson build option named 'iniparser-includedir' that can point to the dir where '
iniparser.h' can be found.
This approach sounds fine, do you want to send it as a proper patch.
meson.build endif · line 161
Quoted 11 lines
meson.build +0
-0@@ -158,9 +158,27 @@ endif
cc =meson.get_compiler('c')meson.build +1
-1-# keyutils and iniparser lack pkgconfig +# keyutils lack pkgconfig
s/lack/lacks/
Quoted 36 lines
keyutils =
cc.find_library('keyutils', required : get_option('keyutils'))meson.build +19
-1-iniparser = cc.find_library('iniparser', required : true) + +# iniparser lacks pkgconfig and its header files are either at '/usr/include' or '/usr/include/iniparser' +# First use the path provided by user via meson configure -Diniparser-includedir=<somepath> +# if thats not provided than try searching for 'iniparser.h' in default system include path +# and if that not found than as a last resort try looking at '/usr/include/iniparser' + +if get_option('iniparser-includedir') == '' + iniparser = cc.find_library('iniparser', required : false, has_headers : 'iniparser.h') + # if not available at the default path try '/usr/include/iniparser' + if not iniparser.found() + iniparser = cc.find_library('iniparser', required : true, has_headers : 'iniparser/iniparser.h') + iniparser = declare_dependency(include_directories:'/usr/include/iniparser', dependencies:iniparser) + endif +else + iniparser_incdir = include_directories(get_option('iniparser-includedir')) + iniparser = cc.find_library('iniparser', required : true, has_headers : 'iniparser.h', + header_include_directories:iniparser_incdir) + iniparser = declare_dependency(include_directories:iniparser_incdir, dependencies:iniparser) +endif
conf =configuration_data()
check_headers = [meson_options.txt +2
-0@@ -23,3 +23,5 @@ option('pkgconfiglibdir', type : 'string', value : '', description : 'directory for standard pkg-config files') option('bashcompletiondir', type : 'string', description : '''${datadir}/bash-completion/completions''') +option('iniparser-includedir', type : 'string', + description : '''Path containing the iniparser header files''')
Quoted 92 lines · Vaibhav Jain
Quoted 57 lines · Aneesh Kumar K.V
Quoted 12 lines · Vaibhav Jain
Second hunk of this diff seems to be a revert of [1] which might break the ndctl build on Arch Linux.
AFAIS for Centos/Fedora/RHEL etc the
iniparser.hfile is present in the default include path('/usr/include') as a softlink to '/usr/include/iniparser/iniparser.h' . Ubuntu/Debian seems to an exception where path '/usr/include/iniparser.h' is not present.I guess thats primarily due to no 'make install' target available in iniparser makefiles [1] that fixes a single include patch. This may have led to differences across distros where to place these header files.
Quoted 7 lines
I would suggest changing to this in meson.build to atleast catch if the
iniparser.his not present at the expected path during meson setup:iniparser =
cc.find_library('iniparser', required : true, has_headers: 'iniparser.h')[1] addc5fd8511('Fix
iniparser.hinclude')
[2] https://github.com/ndevilla/iniparser/blob/master/MakefileWe can do this.
config.h.meson +3
-0@@ -82,6 +82,9 @@ /* Define to 1 if you have the <unistd.h> header file. */ #mesondefine HAVE_UNISTD_H +/* Define to 1 if you have the <iniparser/iniparser.h> header file. */ +#mesondefine HAVE_INIPARSER_INCLUDE_H + /* Define to 1 if using libuuid */ #mesondefine HAVE_UUIDmeson.build +1
-0@@ -176,6 +176,7 @@ check_headers = [ ['HAVE_SYS_STAT_H', 'sys/stat.h'], ['HAVE_SYS_TYPES_H', 'sys/types.h'], ['HAVE_UNISTD_H', 'unistd.h'], + ['HAVE_INIPARSER_INCLUDE_H', 'iniparser/iniparser.h'], ] foreach h : check_headersutil/parse-configs.c +0
-0@@ -4,7 +4,11 @@#include <dirent.h> util/parse-configs.c line 14
Quoted 10 lines
util/parse-configs.c +4
-0#include <errno.h> #include <fcntl.h> +#ifdef HAVE_INIPARSER_INCLUDE_H +#include <iniparser/iniparser.h> +#else #include <iniparser.h> +#endif #include <sys/stat.h> #include <util/parse-configs.h> #include <util/strbuf.h> Agree, above patch can fix this issue. Though I really wanted to avoid trickling changes to the
parse-configs.csince the real problem is with non consistent location foriniparser.hheader across distros.I gave it some thought and came up with this patch to meson.build that can pick up appropriate '
/usr/include' or '/usr/include/iniparser' directory as include path to the compiler.Also since there seems to be no standard location for this header file I have included a meson build option named 'iniparser-includedir' that can point to the dir where '
iniparser.h' can be found.meson.build +0
-1@@ -158,9 +158,27 @@ endif cc = meson.get_compiler('c') -# keyutils and iniparser lack pkgconfig
meson.build endif · line 169
Quoted 10 lines
meson.build +8
-1+# keyutils lack pkgconfig keyutils = cc.find_library('keyutils', required : get_option('keyutils')) -iniparser = cc.find_library('iniparser', required : true) + +# iniparser lacks pkgconfig and its header files are either at '/usr/include' or '/usr/include/iniparser' +# First use the path provided by user via meson configure -Diniparser-includedir=<somepath> +# if thats not provided than try searching for 'iniparser.h' in default system include path +# and if that not found than as a last resort try looking at '/usr/include/iniparser' + +if get_option('iniparser-includedir') == ''
Approach looks good, but I think I would change this to be relative to includedir as in:
iniparserdir = get_option(iniparserdir)
iniparser = cc.find_library('iniparser', required : false, has_headers : 'iniparser.h', dirs : includedir / iniparserdir)
if not iniparser.found()
initparserdir = 'iniparser'
iniparser = cc.find_library('iniparser', required : true,has_headers : 'iniparser.h', dirs : includedir / iniparserdir) endif
iniparser = declare_dependency(include_directories : includedir / iniparserdir, dependencies:iniparser)
...just in case someone has already overridden @prefix and / or @includedir.
Quoted 123 lines · Vaibhav Jain
Quoted 57 lines · Aneesh Kumar K.V
Quoted 12 lines · Vaibhav Jain
Second hunk of this diff seems to be a revert of [1] which might break the ndctl build on Arch Linux.
AFAIS for Centos/Fedora/RHEL etc the
iniparser.hfile is present in the default include path('/usr/include') as a softlink to '/usr/include/iniparser/iniparser.h' . Ubuntu/Debian seems to an exception where path '/usr/include/iniparser.h' is not present.I guess thats primarily due to no 'make install' target available in iniparser makefiles [1] that fixes a single include patch. This may have led to differences across distros where to place these header files.
Quoted 7 lines
I would suggest changing to this in meson.build to atleast catch if the
iniparser.his not present at the expected path during meson setup:iniparser =
cc.find_library('iniparser', required : true, has_headers: 'iniparser.h')[1] addc5fd8511('Fix
iniparser.hinclude')
[2] https://github.com/ndevilla/iniparser/blob/master/MakefileWe can do this.
config.h.meson +3
-0@@ -82,6 +82,9 @@ /* Define to 1 if you have the <unistd.h> header file. */ #mesondefine HAVE_UNISTD_H +/* Define to 1 if you have the <iniparser/iniparser.h> header file. */ +#mesondefine HAVE_INIPARSER_INCLUDE_H + /* Define to 1 if using libuuid */ #mesondefine HAVE_UUIDmeson.build +1
-0@@ -176,6 +176,7 @@ check_headers = [ ['HAVE_SYS_STAT_H', 'sys/stat.h'], ['HAVE_SYS_TYPES_H', 'sys/types.h'], ['HAVE_UNISTD_H', 'unistd.h'], + ['HAVE_INIPARSER_INCLUDE_H', 'iniparser/iniparser.h'], ] foreach h : check_headersutil/parse-configs.c +0
-0@@ -4,7 +4,11 @@#include <dirent.h> util/parse-configs.c line 14
Quoted 10 lines
util/parse-configs.c +4
-0#include <errno.h> #include <fcntl.h> +#ifdef HAVE_INIPARSER_INCLUDE_H +#include <iniparser/iniparser.h> +#else #include <iniparser.h> +#endif #include <sys/stat.h> #include <util/parse-configs.h> #include <util/strbuf.h> Agree, above patch can fix this issue. Though I really wanted to avoid trickling changes to the
parse-configs.csince the real problem is with non consistent location foriniparser.hheader across distros.I gave it some thought and came up with this patch to meson.build that can pick up appropriate '
/usr/include' or '/usr/include/iniparser' directory as include path to the compiler.Also since there seems to be no standard location for this header file I have included a meson build option named 'iniparser-includedir' that can point to the dir where '
iniparser.h' can be found.meson.build +20
-2@@ -158,9 +158,27 @@ endif cc = meson.get_compiler('c') -# keyutils and iniparser lack pkgconfig +# keyutils lack pkgconfig keyutils = cc.find_library('keyutils', required : get_option('keyutils')) -iniparser = cc.find_library('iniparser', required : true) + +# iniparser lacks pkgconfig and its header files are either at '/usr/include' or '/usr/include/iniparser' +# First use the path provided by user via meson configure -Diniparser-includedir=<somepath> +# if thats not provided than try searching for 'iniparser.h' in default system include path +# and if that not found than as a last resort try looking at '/usr/include/iniparser' + +if get_option('iniparser-includedir') == '' + iniparser = cc.find_library('iniparser', required : false, has_headers : 'iniparser.h') + # if not available at the default path try '/usr/include/iniparser' + if not iniparser.found() + iniparser = cc.find_library('iniparser', required : true, has_headers : 'iniparser/iniparser.h') + iniparser = declare_dependency(include_directories:'/usr/include/iniparser', dependencies:iniparser) + endif +else + iniparser_incdir = include_directories(get_option('iniparser-includedir')) + iniparser = cc.find_library('iniparser', required : true, has_headers : 'iniparser.h', + header_include_directories:iniparser_incdir) + iniparser = declare_dependency(include_directories:iniparser_incdir, dependencies:iniparser) +endif conf = configuration_data() check_headers = [meson_options.txt +0
-0
meson_options.txt option('pkgconfiglibdir', type : 'string', value : '', · line 27
Quoted 5 lines
meson_options.txt +2
-0@@ -23,3 +23,5 @@ option('pkgconfiglibdir', type : 'string', value : '', description : 'directory for standard pkg-config files') option('bashcompletiondir', type : 'string', description : '''${datadir}/bash-completion/completions''') +option('iniparser-includedir', type : 'string', + description : '''Path containing the iniparser header files''')
Looks good. Can you send this as a patch?
-aneesh
Thanks for the feedback Vishal, Dan and Aneesh
I have sent out a patch based Dan's suggestion at
https://lore.kernel.org/nvdimm/[email protected]
Quoted 134 lines · Aneesh Kumar K V
Quoted 123 lines · Vaibhav Jain
Quoted 57 lines · Aneesh Kumar K.V
Quoted 12 lines · Vaibhav Jain
Second hunk of this diff seems to be a revert of [1] which might break the ndctl build on Arch Linux.
AFAIS for Centos/Fedora/RHEL etc the
iniparser.hfile is present in the default include path('/usr/include') as a softlink to '/usr/include/iniparser/iniparser.h' . Ubuntu/Debian seems to an exception where path '/usr/include/iniparser.h' is not present.I guess thats primarily due to no 'make install' target available in iniparser makefiles [1] that fixes a single include patch. This may have led to differences across distros where to place these header files.
Quoted 7 lines
I would suggest changing to this in meson.build to atleast catch if the
iniparser.his not present at the expected path during meson setup:iniparser =
cc.find_library('iniparser', required : true, has_headers: 'iniparser.h')[1] addc5fd8511('Fix
iniparser.hinclude')
[2] https://github.com/ndevilla/iniparser/blob/master/MakefileWe can do this.
config.h.meson +3
-0@@ -82,6 +82,9 @@ /* Define to 1 if you have the <unistd.h> header file. */ #mesondefine HAVE_UNISTD_H +/* Define to 1 if you have the <iniparser/iniparser.h> header file. */ +#mesondefine HAVE_INIPARSER_INCLUDE_H + /* Define to 1 if using libuuid */ #mesondefine HAVE_UUIDmeson.build +1
-0@@ -176,6 +176,7 @@ check_headers = [ ['HAVE_SYS_STAT_H', 'sys/stat.h'], ['HAVE_SYS_TYPES_H', 'sys/types.h'], ['HAVE_UNISTD_H', 'unistd.h'], + ['HAVE_INIPARSER_INCLUDE_H', 'iniparser/iniparser.h'], ] foreach h : check_headersutil/parse-configs.c +0
-0@@ -4,7 +4,11 @@#include <dirent.h> util/parse-configs.c line 14
Quoted 10 lines
util/parse-configs.c +4
-0#include <errno.h> #include <fcntl.h> +#ifdef HAVE_INIPARSER_INCLUDE_H +#include <iniparser/iniparser.h> +#else #include <iniparser.h> +#endif #include <sys/stat.h> #include <util/parse-configs.h> #include <util/strbuf.h> Agree, above patch can fix this issue. Though I really wanted to avoid trickling changes to the
parse-configs.csince the real problem is with non consistent location foriniparser.hheader across distros.I gave it some thought and came up with this patch to meson.build that can pick up appropriate '
/usr/include' or '/usr/include/iniparser' directory as include path to the compiler.Also since there seems to be no standard location for this header file I have included a meson build option named 'iniparser-includedir' that can point to the dir where '
iniparser.h' can be found.meson.build +20
-2@@ -158,9 +158,27 @@ endif cc = meson.get_compiler('c') -# keyutils and iniparser lack pkgconfig +# keyutils lack pkgconfig keyutils = cc.find_library('keyutils', required : get_option('keyutils')) -iniparser = cc.find_library('iniparser', required : true) + +# iniparser lacks pkgconfig and its header files are either at '/usr/include' or '/usr/include/iniparser' +# First use the path provided by user via meson configure -Diniparser-includedir=<somepath> +# if thats not provided than try searching for 'iniparser.h' in default system include path +# and if that not found than as a last resort try looking at '/usr/include/iniparser' + +if get_option('iniparser-includedir') == '' + iniparser = cc.find_library('iniparser', required : false, has_headers : 'iniparser.h') + # if not available at the default path try '/usr/include/iniparser' + if not iniparser.found() + iniparser = cc.find_library('iniparser', required : true, has_headers : 'iniparser/iniparser.h') + iniparser = declare_dependency(include_directories:'/usr/include/iniparser', dependencies:iniparser) + endif +else + iniparser_incdir = include_directories(get_option('iniparser-includedir')) + iniparser = cc.find_library('iniparser', required : true, has_headers : 'iniparser.h', + header_include_directories:iniparser_incdir) + iniparser = declare_dependency(include_directories:iniparser_incdir, dependencies:iniparser) +endif conf = configuration_data() check_headers = [meson_options.txt +0
-0meson_options.txt option('pkgconfiglibdir', type : 'string', value : '', · line 27
Quoted 5 lines
meson_options.txt +2
-0@@ -23,3 +23,5 @@ option('pkgconfiglibdir', type : 'string', value : '', description : 'directory for standard pkg-config files') option('bashcompletiondir', type : 'string', description : '''${datadir}/bash-completion/completions''') +option('iniparser-includedir', type : 'string', + description : '''Path containing the iniparser header files''')Looks good. Can you send this as a patch?
-aneesh
Signature · 2 lines
Cheers ~ Vaibhav