* [PR PATCH] common/hooks/{pre,post}-install: generalized libdir hook
@ 2020-12-21 18:23 q66
2020-12-21 18:23 ` q66
2020-12-22 0:03 ` [PR PATCH] [Merged]: " ericonr
0 siblings, 2 replies; 3+ messages in thread
From: q66 @ 2020-12-21 18:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 620 bytes --]
There is a new pull request by q66 against master on the void-packages repository
https://github.com/void-ppc/void-packages libdir
https://github.com/void-linux/void-packages/pull/27328
common/hooks/{pre,post}-install: generalized libdir hook
this makes sure we don't have to worry about packages installing stuff in lib32/lib64, it will be automagically symlinked
if something is still left over for whatever reason, or if the opposite wordsize directory exists, that will be caught by pkglint
@Duncaen @ericonr @st3r4g
A patch file from https://github.com/void-linux/void-packages/pull/27328.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libdir-27328.patch --]
[-- Type: text/x-diff, Size: 2658 bytes --]
From 0933c2df2da1c4910599a86b7364887f6758a2e0 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 21 Dec 2020 19:16:05 +0100
Subject: [PATCH] common/hooks/{pre,post}-install: generalized libdir hook
this makes sure we don't have to worry about packages installing
stuff in lib32/lib64, it will be automagically symlinked
if something is still left over for whatever reason, or if the
opposite wordsize directory exists, that will be caught by pkglint
---
common/hooks/post-install/00-lib32.sh | 8 --------
common/hooks/post-install/00-libdir.sh | 7 +++++++
common/hooks/pre-install/00-lib32.sh | 9 ---------
common/hooks/pre-install/00-libdir.sh | 8 ++++++++
4 files changed, 15 insertions(+), 17 deletions(-)
delete mode 100644 common/hooks/post-install/00-lib32.sh
create mode 100644 common/hooks/post-install/00-libdir.sh
delete mode 100644 common/hooks/pre-install/00-lib32.sh
create mode 100644 common/hooks/pre-install/00-libdir.sh
diff --git a/common/hooks/post-install/00-lib32.sh b/common/hooks/post-install/00-lib32.sh
deleted file mode 100644
index f5c4fa259ec..00000000000
--- a/common/hooks/post-install/00-lib32.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-# This hook removes the /usr/lib32 symlink on 32-bit systems.
-
-hook() {
- if [ "$XBPS_TARGET_WORDSIZE" = "32" ] && \
- [ "${pkgname}" != "base-files" ]; then
- rm -f ${PKGDESTDIR}/usr/lib32
- fi
-}
diff --git a/common/hooks/post-install/00-libdir.sh b/common/hooks/post-install/00-libdir.sh
new file mode 100644
index 00000000000..21c7e35ea95
--- /dev/null
+++ b/common/hooks/post-install/00-libdir.sh
@@ -0,0 +1,7 @@
+# This hook removes the wordsize specific libdir symlink.
+
+hook() {
+ if [ "${pkgname}" != "base-files" ]; then
+ rm -f ${PKGDESTDIR}/usr/lib${XBPS_TARGET_WORDSIZE}
+ fi
+}
diff --git a/common/hooks/pre-install/00-lib32.sh b/common/hooks/pre-install/00-lib32.sh
deleted file mode 100644
index 0d97a825758..00000000000
--- a/common/hooks/pre-install/00-lib32.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-# This hook creates the /usr/lib32 symlink for 32-bit systems.
-
-hook() {
- if [ "$XBPS_TARGET_WORDSIZE" = "32" ] && \
- [ "${pkgname}" != "base-files" ]; then
- vmkdir usr/lib
- ln -sf lib ${PKGDESTDIR}/usr/lib32
- fi
-}
diff --git a/common/hooks/pre-install/00-libdir.sh b/common/hooks/pre-install/00-libdir.sh
new file mode 100644
index 00000000000..f19f68088ff
--- /dev/null
+++ b/common/hooks/pre-install/00-libdir.sh
@@ -0,0 +1,8 @@
+# This hook creates the wordsize specific libdir symlink.
+
+hook() {
+ if [ "${pkgname}" != "base-files" ]; then
+ vmkdir usr/lib
+ ln -sf lib ${PKGDESTDIR}/usr/lib${XBPS_TARGET_WORDSIZE}
+ fi
+}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: common/hooks/{pre,post}-install: generalized libdir hook
2020-12-21 18:23 [PR PATCH] common/hooks/{pre,post}-install: generalized libdir hook q66
@ 2020-12-21 18:23 ` q66
2020-12-22 0:03 ` [PR PATCH] [Merged]: " ericonr
1 sibling, 0 replies; 3+ messages in thread
From: q66 @ 2020-12-21 18:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 202 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/27328#issuecomment-749123782
Comment:
needed for https://github.com/void-linux/void-packages/pull/27291
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: common/hooks/{pre,post}-install: generalized libdir hook
2020-12-21 18:23 [PR PATCH] common/hooks/{pre,post}-install: generalized libdir hook q66
2020-12-21 18:23 ` q66
@ 2020-12-22 0:03 ` ericonr
1 sibling, 0 replies; 3+ messages in thread
From: ericonr @ 2020-12-22 0:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 473 bytes --]
There's a merged pull request on the void-packages repository
common/hooks/{pre,post}-install: generalized libdir hook
https://github.com/void-linux/void-packages/pull/27328
Description:
this makes sure we don't have to worry about packages installing stuff in lib32/lib64, it will be automagically symlinked
if something is still left over for whatever reason, or if the opposite wordsize directory exists, that will be caught by pkglint
@Duncaen @ericonr @st3r4g
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-12-22 0:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-21 18:23 [PR PATCH] common/hooks/{pre,post}-install: generalized libdir hook q66
2020-12-21 18:23 ` q66
2020-12-22 0:03 ` [PR PATCH] [Merged]: " ericonr
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).