glib2: update to 2.64.2 #11442
Merged
glib2: update to 2.64.2 #11442
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Despite adding meson/host and ninja/host to the build, it's still faster to compile with ninja. 1:55 vs 3:11 . Quite nice. I have no idea if this can be done for CMake projects as well. I know CMake supports ninja. |
|
I'm not familiar with glib's iconv implementation. |
|
Meh so patches it is. |
Not much yet, was merged for a few days and later removed again, since upstream wanted to review/test the patch more. No idea what the state on it is atm, but they seem busy fixing some smb1 + big endian stuff atm. So i need to switch to a dynamic glib2 again than it seems. |
|
Removed those host vars. I feel that that libiconv change would break several hosts. But I have no idea how to fix. |
|
A dirty workaround for static libs: define Build/Compile
$(call Build/Compile/Meson)
$(call Ninja,-C $(MESON_BUILD_DIR) install,DESTDIR="$(PKG_INSTALL_DIR)")
$(call Meson, \
--reconfigure \
--buildtype plain \
--native-file $(PKG_BUILD_DIR)/openwrt-native.txt \
--cross-file $(PKG_BUILD_DIR)/openwrt-cross.txt \
-Ddefault_library=static \
$(MESON_ARGS) \
$(MESON_BUILD_DIR) \
$(PKG_BUILD_DIR), \
$(MESON_VARS))
endef |
neheb
force-pushed
the
glb
branch
3 times, most recently
from
277454c
to
e79a10f
Compare
|
Updated to 2.64.0, which AFAIK is a stable version. I added the static build hack. Although I wonder how useful it is... Only ksmbd-tools really use it AFAIK. |
irqbalance as of a few days ago. |
|
So it stays. |
|
Updated to .1 |
|
Added back libffi/host . It seems to be needed by libgobject. |
|
I'm getting linking errors with uClibc-ng with this. cannot find libiconv_xxx. No real idea how to fix. |
Closed
neheb
force-pushed
the
glb
branch
2 times, most recently
from
32e1b5c
to
a436274
Compare
|
Got rid of nls.mk. It's totally broken. My understanding is that when meson builds a shared library, it expects to link to a libiconv.so instead of .a (the stub has only .a). I haven't been able to figure out a solution to get it to link. In other news: glib2 is using https://github.com/frida/proxy-libintl for gettext internally. Seems like a cool project. I assume it's less buggy than the current stub that is available, based on a quick look. |
neheb
force-pushed
the
glb
branch
3 times, most recently
from
a5a77a3
to
16b225f
Compare
|
Updated to 2.64.2 |
neheb
force-pushed
the
glb
branch
4 times, most recently
from
a4c98e9
to
cf98411
Compare
|
This is pretty much ready to go. No idea how to fix uClibc-ng, but that's marked as BROKEN. |
Modified to use meson as upstream has abandoned autotools. Added license information. Cleaned up Makefile for consistency between packages. Added hack to compile static libs. Removed old patches and add new ones. Removed BUILD_PARALLEL options. These are default with ninja/meson. Removed gettext build dependencies. glib2 now includes its own solution. Signed-off-by: Rosen Penev <rosenp@gmail.com>
|
Should this be reverted? Still fails after "make dirclean, Meson log: |
|
No. See my other comment. The buildbot should be fine as it builds libiconv before glib2. |
workaround: |
|
Reverted as well. |
|
just target build needs to depend on libiconv/host as well. |
nmeyerhans
pushed a commit
to nmeyerhans/packages
that referenced
this pull request
May 4, 2020
It is not ready and there are some issues described in openwrt#11442 This reverts commit b465ac3. Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
farmergreg
pushed a commit
to farmergreg/packages
that referenced
this pull request
Sep 8, 2020
It is not ready and there are some issues described in openwrt#11442 This reverts commit b465ac3. Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
farmergreg
pushed a commit
to farmergreg/packages
that referenced
this pull request
Sep 8, 2020
It is not ready and there are some issues described in openwrt#11442 This reverts commit b465ac3. Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Modified to use meson as upstream has abandoned autotools.
Added license information.
Cleaned up Makefile for consistency between packages.
Removed static builds. I have no idea how or if to enable them.
Removed old patches and add new ones.
Removed BUILD_PARALLEL options. These are default with ninja/meson.
Removed most build dependencies. They seem not to be needed with meson.
Signed-off-by: Rosen Penev rosenp@gmail.com
Maintainer: @tripolar
Compile tested: ath79
@dhewg I'm having some trouble with this.
I set the host iconv to the libc version as it errors when using -Diconv=external.
I also cannot figure out what MESON_VARS is for. They seem to be set, but they don't do anything. I ended up patching out the issues.
I also wonder what this external iconv is for. Both glibc and musl support iconv natively. Only uClibc-ng does not. It's marked as BROKEN and probably should not be used.
@Andy2244 this would impact cifsd-tools as static libraries are no longer generated. It seems meson demands that you choose between one or the other. No idea what happened with the no-glib stuff.