Conversation
|
hmmm maybe second and third commit should be merged. thoughts? |
|
So it turns out CMake's find_package(Iconv REQUIRED) is completely broken and doesn't work with nls.mk at all. It needs to be overridden. meson's dependency('iconv') works perfectly. I think the best way forward is to remove nls.mk for those packages. |
|
Going to mark this as ready. I've fixed most packages currently. Others will be dealt with when libiconv-stub is gone. |
|
If I'm not completely wrong, then this PR makes |
|
@neheb do you want me to run this under the github actions and check if we have additional package not compiled? |
|
@Ansuel wouldn’t hurt. |
|
@mhei useless how? musl has iconv |
|
@neheb: "useless" is maybe wrong wording, but when looking at the help description of
I mean: previously we removed iconv/gettext functionality mostly completely when this option was not selected, right? The stubs however allowed to compile packages which did not offer selecting iconv/gettext usage during configure/compile time. Now that musl brings "strong for its size, but not comprehensive like glibc’s" iconv support, we don't have such a large impact of this switch anymore as previously. |
|
Sure I can update the description. |
|
@mhei updated. |
|
Thnx. Just removing the wrong part is ok, but wouldn't it be even better to describe the behavior with musl gettext/iconv implementation? For example:
What do you think? |
gettext (libintl-stub) was removed in commit [1], so the libintl-stub lib and include directories aren't existing anymore. This commit cleans up the INTL flags for the BUILD_NLS=n case. [1] e6f5694 Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net> Reviewed-by: Rosen Penev <rosenp@gmail.com>
This was previously needed for uClibc-ng. Now that it's gone, it can go away in nls.mk too. Signed-off-by: Rosen Penev <rosenp@gmail.com>
No longer used. Signed-off-by: Rosen Penev <rosenp@gmail.com>
|
I don't like it. OpenWrt also supports glibc, which has builtin iconv as well. |
|
Good point. But if I was an ordinary OpenWrt user, not deeply involved in programming stuff etc., what is the benefit/gain of enabling this option for glibc? Can you describe it? |
No longer relevant. Signed-off-by: Rosen Penev <rosenp@gmail.com>
|
According to https://lists.gnu.org/archive/html/bug-gnu-libiconv/2010-05/msg00010.html , seems to be a difference in locale dependence. Ordinary OpenWrt users don't use the SDK or build their own packages. Anyway, I made a small change. |
Since the OpenWrt's stub libiconv implementation is now gone, and PHP does not build against e.g. musl's internal one, we need to always switch to the external libiconv implementation. Signed-off-by: Michael Heimpold <mhei@heimpold.de>
Since the OpenWrt's stub libiconv implementation is now gone, and PHP does not build against e.g. musl's internal one, we need to always switch to the external libiconv implementation. Signed-off-by: Michael Heimpold <mhei@heimpold.de>
Since the OpenWrt's stub libiconv implementation is now gone, and PHP does not build against e.g. musl's internal one, we need to always switch to the external libiconv implementation. Signed-off-by: Michael Heimpold <mhei@heimpold.de>
|
This is ready for inclusion. ping @Ansuel |
Since the OpenWrt's stub libiconv implementation is now gone, and PHP does not build against e.g. musl's internal one, we need to always switch to the external libiconv implementation. Signed-off-by: Michael Heimpold <mhei@heimpold.de>
Since the OpenWrt's stub libiconv implementation is now gone, and PHP does not build against e.g. musl's internal one, we need to always switch to the external libiconv implementation. Signed-off-by: Michael Heimpold <mhei@heimpold.de>
Since the OpenWrt's stub libiconv implementation is now gone, and PHP does not build against e.g. musl's internal one, we need to always switch to the external libiconv implementation. Signed-off-by: Michael Heimpold <mhei@heimpold.de>
Since the OpenWrt's stub libiconv implementation is now gone, and PHP does not build against e.g. musl's internal one, we need to always switch to the external libiconv implementation. Signed-off-by: Michael Heimpold <mhei@heimpold.de>
Since the OpenWrt's stub libiconv implementation is now gone, and PHP does not build against e.g. musl's internal one, we need to always switch to the external libiconv implementation. Signed-off-by: Michael Heimpold <mhei@heimpold.de>
|
Merged. Thanks. I'm curious what will show up. I tried running some targets and SDK builds in my cases it all worked fine. |
|
This shows up here: |
|
@dhewg true, I think it is also interesting to see what the package builds looks like. so far: a few base packages (strace, binutils, gdb,wolfssl,iproute2,perf,xdp-tools,secilc,qosify,elfutils) show up as well. I've seen those disappear when nls.mk gets updated. hmm, this should have happend, or are the phase2 sticking to a particular sdk? |
|
Those should go away when tmp gets wiped. |
|
I got those too at first, but it went away from a clean build tree. |
|
Not quite. Once that patch is merged, I'll merge neheb/packages@c447510 . edit: actually I wonder if the one on glib2 is even needed... |
Since the OpenWrt's stub libiconv implementation is now gone, we can build against musl's internal one or the external libiconv implementation. This needs minor adjustements in the makefile to allow PHPs build to choose the right path when cross-compiling. Signed-off-by: Michael Heimpold <mhei@heimpold.de>
Since the OpenWrt's stub libiconv implementation is now gone, and PHP does not build against e.g. musl's internal one, we need to always switch to the external libiconv implementation. Signed-off-by: Michael Heimpold <mhei@heimpold.de>
php8: fixup libiconv usage (refs openwrt/openwrt#10024)
a24a76783 php8: fixup libiconv usage (refs openwrt/openwrt#10024) 45d7e4f6f open-vm-tools: fix compilation without libiconv e702a6605 unbound: update to 1.16.1 59cadc7c6 irqbalance: add meson 61b31a315 Merge pull request #18919 from mhei/php8-full-libiconv
* 'master' of https://github.com/immortalwrt/packages: ruby: refresh patch ruby: fix build with LibreSSL over v3.5 crelay: update to 0.14.1 docker-compose: Update to version 2.7.0 dawn: update to 2022-07-21 usteer: update to latest HEAD mutt: add PKG_CONFIG_DEPENDS opusfile: add autoreconf geth: update to 1.10.20 libulfius: update to 2.7.10 glib2: disable fortify source wifidog: fix compilation with more recent wolfssl curl: fix compilation with wolfSSL irqbalance: add meson django: bump to version 4.0.6 php8: fixup libiconv usage (refs openwrt/openwrt#10024)
Since the OpenWrt's stub libiconv implementation is now gone, we can build against musl's internal one or the external libiconv implementation. This needs minor adjustements in the makefile to allow PHPs build to choose the right path when cross-compiling. Signed-off-by: Michael Heimpold <mhei@heimpold.de>
* php8: fixup libiconv usage (refs openwrt/openwrt#10024) Since the OpenWrt's stub libiconv implementation is now gone, we can build against musl's internal one or the external libiconv implementation. This needs minor adjustements in the makefile to allow PHPs build to choose the right path when cross-compiling. Signed-off-by: Michael Heimpold <mhei@heimpold.de> * php8: update to 8.1.8 This fixes: - CVE-2022-31627 Signed-off-by: Michael Heimpold <mhei@heimpold.de> Co-authored-by: Michael Heimpold <mhei@heimpold.de>
Since the OpenWrt's stub libiconv implementation is now gone, we can build against musl's internal one or the external libiconv implementation. This needs minor adjustements in the makefile to allow PHPs build to choose the right path when cross-compiling. Signed-off-by: Michael Heimpold <mhei@heimpold.de>
* php8: fixup libiconv usage (refs openwrt/openwrt#10024) Since the OpenWrt's stub libiconv implementation is now gone, we can build against musl's internal one or the external libiconv implementation. This needs minor adjustements in the makefile to allow PHPs build to choose the right path when cross-compiling. Signed-off-by: Michael Heimpold <mhei@heimpold.de> * php8: update to 8.1.8 This fixes: - CVE-2022-31627 Signed-off-by: Michael Heimpold <mhei@heimpold.de> Co-authored-by: Michael Heimpold <mhei@heimpold.de>
Setting as draft until I make sure all packages compile.