[ISSUE] 98-fixup-gir-path: ugly hack that needs to be fixed

[ISSUE] 98-fixup-gir-path: ugly hack that needs to be fixed

[pullmoll]

[-- Attachment #1: Type: text/plain, Size: 811 bytes --]

New issue by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/issues/27437

Description:
With @q66 working on cleaning up the lib32/lib64 issues with our cross toolchains and me trying them on my [`musl-1.2.1`](https://github.com/pullmoll/void-packages/commits/musl-1.2.1) branch this old and ugly hack started to fail because the `cp -a` would try to copy a directory over a symbolic link.

I managed to make this hack even uglier, i.e. hacked the ill conceived hack to look even uglier, while really the underlying issue needs to be solved.

See https://github.com/pullmoll/void-packages/commit/b52e90e61300559c45a3e0efee0a10d96097f7fc for the gory details.

I hope someone finds time and is sufficiently skilled to see where the original issue stems from.
/me am not.

Re: 98-fixup-gir-path: ugly hack that needs to be fixed

[newbluemoon]

[-- Attachment #1: Type: text/plain, Size: 1307 bytes --]

New comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/issues/27437#issuecomment-751384475

Comment:
The culprit seems to be the `INTROSPECTION_GIRDIR` and `INTROSPECTION_TYPELIBDIR` variables in every `Makefile` which are set using the pkg-config-wrapper in `configure` via:
```
INTROSPECTION_GIRDIR=`$PKG_CONFIG --define-variable=datadir="${_GI_EXP_DATADIR}" --variable=girdir gobject-introspection-1.0`
INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --define-variable=libdir="${_GI_EXP_LIBDIR}" --variable=typelibdir gobject-introspection-1.0)"
```
which adds `$XBPS_CROSS_BASE`.

I don’t really have a solution, just a different hack: run
```
sed -e "s,^\(INTROSPECTION_GIRDIR\s*=\s*\)${XBPS_CROSS_BASE}\(.*\),\1\2," -i $(find . -name Makefile)
sed -e "s,^\(INTROSPECTION_TYPELIBDIR\s*=\s*\)${XBPS_CROSS_BASE}\(.*\),\1\2," -i $(find . -name Makefile)
```
between the `build` and `install` phase; either by replacing the hack in the `98-fixup-gir-path.sh`-hook or e.g. in a custom `pre_install()` (and removing the hook).

I haven’t tested if these variables are relevant for building the package, yet; if not then a clean solution could be adjusting the pkg-config-wrapper to not add `$XBPS_CROSS_BASE` to `girdir` and `typelibdir` queries.

Re: 98-fixup-gir-path: ugly hack that needs to be fixed

[pullmoll]

[-- Attachment #1: Type: text/plain, Size: 256 bytes --]

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/issues/27437#issuecomment-751386078

Comment:
Thank you @newbluemoon for looking into it. Your stream edits work better than my hack and I'll use the for now.

Re: 98-fixup-gir-path: ugly hack that needs to be fixed

[pullmoll]

[-- Attachment #1: Type: text/plain, Size: 281 bytes --]

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/issues/27437#issuecomment-751386078

Comment:
Thank you @newbluemoon for looking into it. Your stream edits work better than my hack and I'll use that in 98-fixup-gir-path.sh for now.

Re: 98-fixup-gir-path: ugly hack that needs to be fixed

[pullmoll]

[-- Attachment #1: Type: text/plain, Size: 416 bytes --]

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/issues/27437#issuecomment-751386078

Comment:
Thank you @newbluemoon for looking into it. Your stream edits work better than my hack and I'll use that in 98-fixup-gir-path.sh for now.

Slightly modified to only stream edit if any files contain the `INTROSPECTION_{GIR,TYPLIB}DIR`, or otherwise `sed` would error out.

Re: 98-fixup-gir-path: ugly hack that needs to be fixed

[pullmoll]

[-- Attachment #1: Type: text/plain, Size: 407 bytes --]

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/issues/27437#issuecomment-751470664

Comment:
And still need to move (other) files which are installed to this wrong path.
The latest patch in [my branch](https://github.com/pullmoll/void-packages/commits/musl-1.2.1) now seems to be working. I can cross build packages which were failing e.g. qscintilla-qt5.

Re: 98-fixup-gir-path: ugly hack that needs to be fixed

[pullmoll]

[-- Attachment #1: Type: text/plain, Size: 863 bytes --]

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/issues/27437#issuecomment-752260795

Comment:
After seeing many problems arise when the `98-fixup-gir-path` script modified the Makefiles, I went back to copying the wrong path to the correct one.

When I modify the Makefiles this (for some packages) leads to them detecting the modification time being greater than that the configure script and want to re-run autoconf. I already did add `automake` to a few packages but even that sometimes isn't sufficient, and it sometimes leads to the **whole packge** being rebuilt - without `${makejobs}` because it happens in the `do_install()` where there usually is no `${makejobs}` in the make command.

So to make a long story short: there is still no good solution for the problem, just inherently poor workarounds.

Re: 98-fixup-gir-path: ugly hack that needs to be fixed

[pullmoll]

[-- Attachment #1: Type: text/plain, Size: 873 bytes --]

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/issues/27437#issuecomment-752260795

Comment:
After seeing many problems arise when the `98-fixup-gir-path` script modified the Makefiles, I went back to copying the wrong path to the correct one.

When I modify the Makefiles this (for some packages) leads to them detecting the modification time being greater than that of the `configure` script and they want to re-run autoconf. I already did add `automake` to a few packages but even that sometimes isn't sufficient, and it sometimes leads to the **whole packge** being rebuilt - without `${makejobs}` because it happens in the `do_install()` where there usually is no `${makejobs}` in the make command.

So to make a long story short: there is still no good solution for the problem, just inherently poor workarounds.

Re: 98-fixup-gir-path: ugly hack that needs to be fixed

[newbluemoon]

[-- Attachment #1: Type: text/plain, Size: 1284 bytes --]

New comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/issues/27437#issuecomment-752364348

Comment:
What about preventing that `$XBPS_CROSS_BASE` ends up in `INTROSPECTION_GIRDIR` and `INTROSPECTION_TYPELIBDIR` in the first place; i.e. not setting `PKG_CONFIG_SYSROOT_DIR` in the pkg-config wrapper when these variables are queried, like e.g. below and removing `98-fixup-gir-path.sh`?

```
diff --git a/common/hooks/pre-configure/02-script-wrapper.sh b/common/hooks/pre-configure/02-script-wrapper.sh
index fe2000af11..2c978c4977 100644
--- a/common/hooks/pre-configure/02-script-wrapper.sh
+++ b/common/hooks/pre-configure/02-script-wrapper.sh
@@ -87,7 +87,10 @@ pkgconfig_wrapper() {
 	cat >>${XBPS_WRAPPERDIR}/${XBPS_CROSS_TRIPLET}-pkg-config<<_EOF
 #!/bin/sh
 
-export PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE"
+case \$@ in
+	*--variable=gir*|*--variable=typelib*) ;;
+	*) export PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE" ;;
+esac
 export PKG_CONFIG_PATH="$XBPS_CROSS_BASE/usr/lib/pkgconfig:$XBPS_CROSS_BASE/usr/share/pkgconfig\${PKG_CONFIG_PATH:+:\${PKG_CONFIG_PATH}}"
 export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/usr/lib/pkgconfig\${PKG_CONFIG_LIBDIR:+:\${PKG_CONFIG_LIBDIR}}"
 exec /usr/bin/pkg-config "\$@"
```

Re: 98-fixup-gir-path: ugly hack that needs to be fixed

[sgn]

[-- Attachment #1: Type: text/plain, Size: 286 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/issues/27437#issuecomment-752666163

Comment:
Can I see a list of problematic packages? I tried to build those packages that have `automake` added (reverted, of course) but all of them works :(

Re: 98-fixup-gir-path: ugly hack that needs to be fixed

[newbluemoon]

[-- Attachment #1: Type: text/plain, Size: 237 bytes --]

New comment by newbluemoon on void-packages repository

https://github.com/void-linux/void-packages/issues/27437#issuecomment-752667386

Comment:
I used polkit as example. But all packages using gobject-introspection should be affected.

Re: 98-fixup-gir-path: ugly hack that needs to be fixed

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 196 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/issues/27437#issuecomment-752685621

Comment:
@sgn nemo in cinnamon (#26965 ) is getting errors now

Re: 98-fixup-gir-path: ugly hack that needs to be fixed

[pullmoll]

[-- Attachment #1: Type: text/plain, Size: 449 bytes --]

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/issues/27437#issuecomment-752689442

Comment:
@ericonr @sgn yes, that's the type of error I have been seeing in my musl-1.2.1 branch.
It obviously starts to appear in master now, too. The latest `98-fixup-gir-path.sh` I have works around this but is still hacky.

I'll try @newbluemoon  's suggestion as soon as I find some time, perhaps tonight.

Re: 98-fixup-gir-path: ugly hack that needs to be fixed

[pullmoll]

[-- Attachment #1: Type: text/plain, Size: 542 bytes --]

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/issues/27437#issuecomment-752689442

Comment:
@ericonr @sgn yes, that's the type of error I have been seeing in my musl-1.2.1 branch.
It obviously starts to appear in master now, too. The latest [`98-fixup-gir-path.sh`](https://github.com/pullmoll/void-packages/commit/47d19bc9dcaea06ca2c76aee1575b1aa5434f21f) I have works around this but is still hacky.

I'll try @newbluemoon  's suggestion as soon as I find some time, perhaps tonight.

Re: 98-fixup-gir-path: ugly hack that needs to be fixed

[sgn]

[-- Attachment #1: Type: text/plain, Size: 301 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/issues/27437#issuecomment-752791247

Comment:
I think we can replace this hack by another hack, e.g. symlink `$DESTDIR//usr/$XBPS_CROSS_TRIPLET/usr` to `/usr` in `pre_install` and remove it in `post_install`.

Re: 98-fixup-gir-path: ugly hack that needs to be fixed

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 209 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/issues/27437#issuecomment-762872747

Comment:
@sgn's solution seems to work, I will try some more packages here.

Re: [ISSUE] [CLOSED] 98-fixup-gir-path: ugly hack that needs to be fixed

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 876 bytes --]

Closed issue by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/issues/27437

Description:
With @q66 working on cleaning up the lib32/lib64 issues with our cross toolchains and me trying them on my [`musl-1.2.1`](https://github.com/pullmoll/void-packages/commits/musl-1.2.1) branch this old and ugly hack started to fail because the `cp -a` would try to copy a directory over a symbolic link.

I managed to make this hack even uglier, i.e. hacked the ill conceived hack to somehow work again, while really the underlying issue needs to be solved.

See https://github.com/pullmoll/void-packages/commit/b52e90e61300559c45a3e0efee0a10d96097f7fc for the gory details.

I hope someone finds time and is sufficiently skilled to see where the original issue stems from.
/me am not.

Edit: WTF upload MP4 and MOV? Where is github moving to?