From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] common/00-libdir: only create lib{32,64} symlink if not exists
Date: Mon, 08 Feb 2021 14:02:11 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-28582@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1627 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages pre-install-libdir
https://github.com/void-linux/void-packages/pull/28582
common/00-libdir: only create lib{32,64} symlink if not exists
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/28582.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pre-install-libdir-28582.patch --]
[-- Type: text/x-diff, Size: 933 bytes --]
From c8fa6860168b46d1b54451bd876eb21573abd3f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 8 Feb 2021 06:47:45 +0700
Subject: [PATCH] common/00-libdir: only create lib{32,64} symlink if not
exists
---
common/hooks/pre-install/00-libdir.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/common/hooks/pre-install/00-libdir.sh b/common/hooks/pre-install/00-libdir.sh
index f19f68088ff..4c57fbcb1e0 100644
--- a/common/hooks/pre-install/00-libdir.sh
+++ b/common/hooks/pre-install/00-libdir.sh
@@ -1,7 +1,9 @@
# This hook creates the wordsize specific libdir symlink.
hook() {
- if [ "${pkgname}" != "base-files" ]; then
+ if [ -L ${PKGDESTDIR}/usr/lib${XBPS_TARGET_WORDSIZE} ]; then
+ return 0
+ elif [ "${pkgname}" != "base-files" ]; then
vmkdir usr/lib
ln -sf lib ${PKGDESTDIR}/usr/lib${XBPS_TARGET_WORDSIZE}
fi
next reply other threads:[~2021-02-08 13:02 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-08 13:02 sgn [this message]
2021-02-08 13:15 ` [PR REVIEW] " ericonr
2021-02-08 13:30 ` sgn
2021-02-08 13:31 ` sgn
2021-02-08 15:14 ` ericonr
2021-02-09 1:37 ` sgn
2021-02-09 9:47 ` q66
2021-02-10 7:35 ` sgn
2021-02-10 11:19 ` q66
2021-02-10 12:38 ` ericonr
2021-02-10 12:41 ` sgn
2021-02-10 12:43 ` sgn
2021-02-10 13:38 ` q66
2021-02-10 13:39 ` [PR PATCH] [Merged]: " q66
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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-28582@inbox.vuxu.org \
--to=sgn@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).