Github messages for voidlinux
 help / color / mirror / Atom feed
From: tornaria <tornaria@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: python3-matplotlib: update to 3.8.0, also update deps
Date: Sat, 23 Sep 2023 19:32:55 +0200	[thread overview]
Message-ID: <20230923173255.5LnKqIOv8r5f6asa9XqFQVSMmHDZslKw5mZVeKPoiqg@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46109@inbox.vuxu.org>

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

New comment by tornaria on void-packages repository

https://github.com/void-linux/void-packages/pull/46109#issuecomment-1732371437

Comment:
> > Rebasing should allow you to drop everything outside of the original scope of this PR. Thanks for your participation in improving the build helpers to make mesonpy builds less painful.
> > Whereas your pybind11 change put cmake and pkg-config files in `/usr/lib`, I kept them in `/usr/share` simply because they are in `share/` in the python package hierarchy. Hopefully this doesn't cause any problems with contourpy. (Most packages favor `/usr/lib` over `/usr/share` for these files, but there are some that stick to `/usr/share`.) We can move them if it causes a problem.
> 
> I think you missed the `--follow-symlinks` in `common/hooks/post-install/13-pkg-config-clean-xbps-cross-base-ref.sh`. Aren't you getting a non-symlink file at `/usr/share/pkgconfig/pybind11.pc`?

In case it's useful, this is what I mean:
```diff
--- a/common/hooks/post-install/13-pkg-config-clean-xbps-cross-base-ref.sh
+++ b/common/hooks/post-install/13-pkg-config-clean-xbps-cross-base-ref.sh
@@ -16,7 +16,8 @@ hook() {
                        # s,/usr/armv7l-linux-musleabihf/usr,/usr,g
                        # trailing /usr to avoid clashing with
                        # other $XBPS_CROSS_BASE and $XBPS_CROSS_TRIPLET.
-                       sed -i -e "s,$XBPS_CROSS_BASE/usr,/usr,g" "$f"
+                       sed -i --follow-symlinks \
+                               -e "s,$XBPS_CROSS_BASE/usr,/usr,g" "$f"
                fi
        done
 }
```

I don't think the `/usr/share` vs `/usr/lib` causes any issue. I went with `/usr/lib` since it seemed more common, but it's reasonable to follow upstream choice.

  parent reply	other threads:[~2023-09-23 17:32 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-17 23:39 [PR PATCH] " tornaria
2023-09-17 23:41 ` tornaria
2023-09-17 23:43 ` tornaria
2023-09-18  0:09 ` tornaria
2023-09-20  3:03 ` [PR PATCH] [Updated] " tornaria
2023-09-20  3:09 ` tornaria
2023-09-20  3:11 ` tornaria
2023-09-20  3:34 ` [PR PATCH] [Updated] " tornaria
2023-09-20  4:22 ` tornaria
2023-09-20  4:40 ` [PR PATCH] [Updated] " tornaria
2023-09-20  4:42 ` tornaria
2023-09-20 15:07 ` ahesford
2023-09-20 15:14 ` ahesford
2023-09-20 23:47 ` [PR PATCH] [Updated] " tornaria
2023-09-20 23:49 ` tornaria
2023-09-23 11:59 ` [PR PATCH] [Updated] " tornaria
2023-09-23 12:01 ` tornaria
2023-09-23 17:00 ` ahesford
2023-09-23 17:26 ` tornaria
2023-09-23 17:29 ` [PR PATCH] [Updated] " tornaria
2023-09-23 17:30 ` tornaria
2023-09-23 17:32 ` tornaria [this message]
2023-09-23 17:33 ` ahesford
2023-09-23 17:37 ` tornaria
2023-09-23 17:47 ` ahesford
2023-09-23 17:54 ` tornaria
2023-09-23 17:54 ` ahesford
2023-09-23 17:55 ` [PR PATCH] [Merged]: " ahesford

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=20230923173255.5LnKqIOv8r5f6asa9XqFQVSMmHDZslKw5mZVeKPoiqg@z \
    --to=tornaria@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).