From: oreo639 <oreo639@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Fix mutter rpath when cross compiling
Date: Fri, 08 Jul 2022 11:13:21 +0200 [thread overview]
Message-ID: <20220708091321.Zj2eBxucibSwsuIdV99XHalBxAT8DNFlLX87lBPeJCc@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-37924@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1253 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages mutter-rpath
https://github.com/void-linux/void-packages/pull/37924
Fix mutter rpath when cross compiling
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/37924.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mutter-rpath-37924.patch --]
[-- Type: text/x-diff, Size: 2745 bytes --]
From 1a7bffd81cd79d530ec9e4a6c35d4796f9d82ea4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 8 Jul 2022 01:37:08 -0700
Subject: [PATCH 1/3] mutter: fix typelibdir variable
Previously we were using pc_sysrootdir which is an issue since this is used for
the rpath.
---
srcpkgs/mutter/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 4064972076d9..81c906209616 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,7 +1,7 @@
# Template file for 'mutter'
pkgname=mutter
version=42.3
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Degl_device=true -Dudev=true -Dnative_backend=true
@@ -35,7 +35,6 @@ post_install() {
# modify the pkg-config files to respect ${pc_sysrootdir} for variables that are
# meant to be called with 'pkg-config --variable'
vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/mutter-10|g' \
- -e 's|^typelibdir.*|typelibdir=${pc_sysrootdir}/${libdir}/mutter-10|g' \
-i ${DESTDIR}/usr/lib/pkgconfig/libmutter-10.pc
}
From 6b835afba4726fa982216a938f3b26fe4bc9c57c Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 8 Jul 2022 01:38:37 -0700
Subject: [PATCH 2/3] gnome-shell: rebuild for mutter rpath
The typelibdir variable was including pc_sysrootdir, which breaks the rpath
when cross compiling.
---
srcpkgs/gnome-shell/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 3d2e3c5cd8ec..e0a73c48c1a5 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-shell'
pkgname=gnome-shell
version=42.3
-revision=1
+revision=2
build_style=meson
build_helper=gir
configure_args="-Dsystemd=false -Dtests=false"
From d13d58dbe5c8bb26b1b6f5db4b006f2a4bc57b09 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 8 Jul 2022 02:02:47 -0700
Subject: [PATCH 3/3] budgie-desktop: rebuild for mutter rpath
The typelibdir variable was including pc_sysrootdir, which breaks the rpath
when cross compiling.
---
srcpkgs/budgie-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index de5b3305ee9f..16052df13583 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'budgie-desktop'
pkgname=budgie-desktop
version=10.6.1
-revision=3
+revision=4
build_style=meson
build_helper=gir
configure_args="-Dwith-gtk-doc=false"
next prev parent reply other threads:[~2022-07-08 9:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-08 8:54 [PR PATCH] " oreo639
2022-07-08 9:13 ` oreo639 [this message]
2022-07-09 10:50 ` [PR PATCH] [Merged]: " paper42
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220708091321.Zj2eBxucibSwsuIdV99XHalBxAT8DNFlLX87lBPeJCc@z \
--to=oreo639@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).