+
Skip to content

meson: do a link test for locale_charset() #1203

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

Merged
merged 1 commit into from
May 29, 2025

Conversation

Kangie
Copy link
Contributor

@Kangie Kangie commented May 23, 2025

We can't just check for locale_charset as some (very silly) distributions ship, or allow end users to install, GNU libiconv on GNU libc systems.

  • Move HAVE_CODESET and HAVE_LIBCHARSET checks into iconv dep conditional
  • perform link test against libcharset to see if it is usable
  • add a visible warning that GNU libiconv should not be installed on a GNU libc system, if libcharset (libiconv) linking fails due to apparent conflicts with glibc iconv.

See Also: #1186

We can't just check for `locale_charset` as some (very silly)
distributions ship, or allow end users to install, GNU libiconv
on GNU libc systems.

- Move `HAVE_CODESET` and `HAVE_LIBCHARSET` checks into `iconv` dep
  conditional
- perform link test against libcharset to see if it is usable
- add a visible warning that GNU libiconv should not be installed on a
  GNU libc system, if libcharset (libiconv) linking fails due to apparent
  conflicts with glibc iconv.

See Also: fvwmorg#1186
Signed-off-by: Matt Jolly <kangie@gentoo.org>
@ThomasAdam ThomasAdam self-assigned this May 23, 2025
@ThomasAdam ThomasAdam added the area:build Relates to compiling/buildsystem of fvwm label May 23, 2025
@ThomasAdam ThomasAdam added this to FVWM3 May 23, 2025
@ThomasAdam ThomasAdam added this to the 1.1.3 milestone May 23, 2025
@github-project-automation github-project-automation bot moved this to PRs in FVWM3 May 23, 2025
@Kangie
Copy link
Contributor Author

Kangie commented May 24, 2025

Still a little concerned about whether it should be possible to use HAVE_CODESET and HAVE_LIBCHARSET at the same time.

fvwm3/meson.build

Lines 270 to 272 in 6dbc601

if cc.has_function('nl_langinfo')
conf.set10('HAVE_CODESET', true)
endif

musl, for example, "has" nl_langinfo but libcharset will likely work there and maybe should be preferred?

@ThomasAdam
Copy link
Member

Well, having checked this on Alpine (which I use on my Thinkpad), this check as you've got it doesn't break anything.

However, the behaviour of libcharset seems to be the it might be preferred if it's installed.

I'm guessing other must variants (Gentoo, Void) would also favour that?

@ThomasAdam ThomasAdam merged commit d1a215c into fvwmorg:main May 29, 2025
8 checks passed
@github-project-automation github-project-automation bot moved this from PRs to Done in FVWM3 May 29, 2025
netbsd-srcmastr pushed a commit to NetBSD/pkgsrc that referenced this pull request Jun 7, 2025
# changes

### Enhancements
* FvwmRearrange: Use -on_screen to tile/cascade all windows on the monitor. by @pghvlaans in fvwmorg/fvwm3#1170
* FvwmRearrange: Add -win_cmd COMMAND option. by @somiaj in fvwmorg/fvwm3#1179
* expand.c: Add "maximum" and "minimum" to math. by @pghvlaans in fvwmorg/fvwm3#1176

### Other Changes
* build: macos: fix path to fribidi by @ThomasAdam in fvwmorg/fvwm3#1174
* fvwm-convert-2.6: fix syntax error by @ThomasAdam in fvwmorg/fvwm3#1177
* style: remove superfluous debug by @ThomasAdam in fvwmorg/fvwm3#1181
* Remove autotools & modernise build CI/CD by @ThomasAdam in fvwmorg/fvwm3#1191
* build: remove go-1.14.0 check by @ThomasAdam in fvwmorg/fvwm3#1195
* Fix crash in FvwmPager and clarify Balloons option. by @somiaj in fvwmorg/fvwm3#1197
* build: modify release version script by @ThomasAdam in fvwmorg/fvwm3#1201
* meson: do a link test for `locale_charset()` by @Kangie in fvwmorg/fvwm3#1203
* Small RandR fixes by @ThomasAdam in fvwmorg/fvwm3#1207
* setup_visible_names: don't ignore when both set by @ThomasAdam in fvwmorg/fvwm3#1208
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area:build Relates to compiling/buildsystem of fvwm
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants
点击 这是indexloc提供的php浏览器服务,不要输入任何密码和下载