-
-
Notifications
You must be signed in to change notification settings - Fork 78
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Meson fixes #1087
Meson fixes #1087
Conversation
meson.build
Outdated
@@ -360,6 +358,11 @@ endif | |||
# Hard-coded | |||
non_configurable_ops = [ | |||
'FMiniIconsSupported', | |||
'FORK_CREATES_CHILD', | |||
'HAVE_MKSTEMP', # POSIX 2001; safer since 2008; no real need to check for this on a modern system. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can drop this commit; it's covered on Linux by _DEFAULT_SOURCE
which we define.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have removed HAVE_MKSTEMP
however kept the tidyup and still define HAVE_SAFETY_MKSTEMP
- As far as I can tell if we're relying on _DEFAULT_SOURCE
we're POSIX 2008 which is safer (at least based on the man
) down the line we may be able to drop the 'host does not have safe mkstemp' path.
I am happy to copy the code check from autotools if you would prefer that we properly check for all platforms :)
I'm OK with this. Drop the commit Re: making xent a default dependency, you'll need to update README.md as well. The wait3 change -- I had this in a previous commit; looks like it was never cherry-picked over when we were reviewing this. That's frustrating. As for SETPGRP -- what don't you understand? We're currently not checking for it in meson.build, and we should be. It's currently not setting the process group when we call I'm not sure why we can drop I don't see anything in here about LIB_ICONV-- what was your question? |
@ThomasAdam, |
I'll check later on, but FreeBSD needed this. |
645f5e6
to
ff8c92c
Compare
Reported-by: Jaimos Skriletz <jaimosskriletz@gmail.com> Signed-off-by: Matt Jolly <kangie@gentoo.org>
Done. I made it into its own PR, but no need to merge that in the short term (or at all).
Sorry, I ended up clobbering a bunch of my commits when I thought I'd been working on my laptop but had actually been on my dev desktop. Thought I'd fixed all the changes but obviously missed that one.
We do check for Lines 146 to 147 in 1067a72
I don't see where Lines 34 to 36 in 1067a72
This is currently based on the CI PR's branch; if that gets merged the diff should get down to only the changes we are about here. |
16b9b00
to
f317e61
Compare
I think SETPGRP_VOID comes from Solaris -- so something we can ignore. It's never going to be defined on most platforms that are currently being used. |
Reported-by: Jaimos Skriletz <jaimosskriletz@gmail.com> Signed-off-by: Matt Jolly <kangie@gentoo.org>
This has been safe since 2008 so we don't need to check for it. Tidyup: Add `true` values to `non_configurable_ops` Reported-by: Jaimos Skriletz <jaimosskriletz@gmail.com> Signed-off-by: Matt Jolly <kangie@gentoo.org>
We don't actually guard this anywhere in the codebase. Reported-by: Jaimos Skriletz <jaimosskriletz@gmail.com> Signed-off-by: Matt Jolly <kangie@gentoo.org>
As XSHM is mandatory we can no longer build without Xext, so tidy up the build code. Signed-off-by: Matt Jolly <kangie@gentoo.org>
The X Network Transport layer has been shipped with X11 for some time now. We no longer need to support configurations without this feature. Reported-by: Jaimos Skriletz <jaimosskriletz@gmail.com> Signed-off-by: Matt Jolly <kangie@gentoo.org>
All remotely modern and supported platforms allow this. Reported-by: Jaimos Skriletz <jaimosskriletz@gmail.com> Signed-off-by: Matt Jolly <kangie@gentoo.org>
Reported-by: Jaimos Skriletz <jaimosskriletz@gmail.com> Signed-off-by: Matt Jolly <kangie@gentoo.org>
Ack. Dropped the CI commit. If you're happy with If we need to get closer to current behaviour for BSD we could do something a bit like this: if get_option('iconv').allowed() #set to auto or enabled
iconv = dependency('iconv', required: false, method: 'builtin')
if iconv.found()
conf.set10('HAVE_ICONV', true)
else
iconv = dependency('iconv', required: true, method: 'system')
conf.set10('HAVE_ICONV', true)
conf.set10('USE_LIBICONV', true)
endif
# add to deps as usual here
endif |
Looks like it's the other way around; from the autoconf manual:
I'll just define it always if SETPGRP is found? |
All current systems have a setpgrp whose signature conforms to Posix. We need to set this to use the correct implementation internally but we don't need to check for it. Signed-off-by: Matt Jolly <kangie@gentoo.org>
@Kangie -- Riiiight. All makes sense now, re: SETPGRP. This looks good to go. Will merge. |
A collection of fixes for differences to the autotools build as noted by @somiaj.
Happy to drop, amend, squash, or split off any of these commits as directed.
libs/asprintf.c
SETPGRP_VOID
is supposed to come from?USE_LIBICONV
?