Github messages for voidlinux
 help / color / mirror / Atom feed
From: ArsenArsen <ArsenArsen@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] glibc: generate gconv cache when possible
Date: Sat, 06 Mar 2021 13:21:57 +0100	[thread overview]
Message-ID: <20210306122157.eh4mNgI-1B06R9VBt-HmpWe_Oio8-OzeNg-W1a3YG7A@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29103@inbox.vuxu.org>

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

There is an updated pull request by ArsenArsen against master on the void-packages repository

https://github.com/ArsenArsen/void-packages master
https://github.com/void-linux/void-packages/pull/29103

glibc: generate gconv cache when possible
<!-- 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
- [x] 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.)
- [x] I built this PR locally for my native architecture, (amd64-glibc)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64

I have not tested this on more machines, if someone is able to test a cross install, that would be greatly appreciated.

A patch file from https://github.com/void-linux/void-packages/pull/29103.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-29103.patch --]
[-- Type: text/x-diff, Size: 2740 bytes --]

From 426a1400b393d50f49d044775c16f4f4edf40927 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
Date: Sat, 27 Feb 2021 22:34:12 +0100
Subject: [PATCH 1/2] glibc: add INSTALL hook to make gconv module cache

---
 srcpkgs/glibc/INSTALL  | 8 ++++++++
 srcpkgs/glibc/template | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/glibc/INSTALL

diff --git a/srcpkgs/glibc/INSTALL b/srcpkgs/glibc/INSTALL
new file mode 100644
index 00000000000..c6b459be99c
--- /dev/null
+++ b/srcpkgs/glibc/INSTALL
@@ -0,0 +1,8 @@
+# Build iconv module cache
+#
+case "${ACTION}" in
+post)
+	echo "Generating iconv module cache..."
+	iconvconfig --nostdlib --prefix="$(pwd)" usr/lib/gconv
+	;;
+esac
diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index 9202e414545..7a487594da9 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -1,7 +1,7 @@
 # Template file for 'glibc'
 pkgname=glibc
 version=2.32
-revision=1
+revision=2
 bootstrap=yes
 short_desc="GNU C library"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 243504ade70d6efba8097fb4c6fdedd21c5c2825 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
Date: Sat, 6 Mar 2021 13:21:23 +0100
Subject: [PATCH 2/2] glibc: break out glibc-gconv

---
 srcpkgs/glibc-gconv                            |  1 +
 srcpkgs/glibc/{INSTALL => glibc-gconv.INSTALL} |  0
 srcpkgs/glibc/template                         | 11 +++++++++++
 3 files changed, 12 insertions(+)
 create mode 120000 srcpkgs/glibc-gconv
 rename srcpkgs/glibc/{INSTALL => glibc-gconv.INSTALL} (100%)

diff --git a/srcpkgs/glibc-gconv b/srcpkgs/glibc-gconv
new file mode 120000
index 00000000000..0c4c137d7ca
--- /dev/null
+++ b/srcpkgs/glibc-gconv
@@ -0,0 +1 @@
+glibc
\ No newline at end of file
diff --git a/srcpkgs/glibc/INSTALL b/srcpkgs/glibc/glibc-gconv.INSTALL
similarity index 100%
rename from srcpkgs/glibc/INSTALL
rename to srcpkgs/glibc/glibc-gconv.INSTALL
diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index 7a487594da9..95be15df8f7 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -50,6 +50,7 @@ conf_files="
 if [ "$CHROOT_READY" ]; then
 	hostmakedepends="bison perl python3 texinfo"
 fi
+depends="glibc-gconv"
 makedepends="kernel-libc-headers"
 lib32files="/usr/lib/gconv/gconv-modules"
 lib32symlinks="ld-linux.so.2"
@@ -192,6 +193,16 @@ glibc-devel_package() {
 		fi
 	}
 }
+
+glibc-gconv_package() {
+	depends="glibc>=${version}_${revision}"
+	short_desc+=" - gconv modules"
+	pkg_install() {
+		vmove "usr/lib/gconv"
+		vmove "usr/bin/iconvconfig"
+	}
+}
+
 glibc-locales_package() {
 	conf_files="/etc/default/libc-locales"
 	short_desc+=" - locale data files"

  parent reply	other threads:[~2021-03-06 12:22 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-27 21:57 [PR PATCH] glibc: add INSTALL hook to make gconv module cache ArsenArsen
2021-02-27 21:58 ` [PR REVIEW] " ericonr
2021-02-27 22:12 ` [PR PATCH] [Updated] " ArsenArsen
2021-02-27 22:34 ` ArsenArsen
2021-02-27 22:36 ` ArsenArsen
2021-02-27 22:55 ` [PR REVIEW] " ericonr
2021-02-27 23:07 ` [PR PATCH] [Updated] " ArsenArsen
2021-02-28  7:10 ` ericonr
2021-02-28 19:11 ` ArsenArsen
2021-02-28 19:32 ` Duncaen
2021-02-28 20:44 ` ArsenArsen
2021-02-28 23:54 ` [PR PATCH] [Updated] " ArsenArsen
2021-03-02  7:07 ` [PR PATCH] [Updated] glibc: generate gconv cache when possible ArsenArsen
2021-03-04 18:02 ` ArsenArsen
2021-03-06 12:21 ` ArsenArsen [this message]
2021-08-24 18:11 ` [PR PATCH] [Updated] [NOMERGE] " ArsenArsen
2021-08-24 18:14 ` ArsenArsen
2022-05-05  2:09 ` github-actions
2022-05-19  2:15 ` [PR PATCH] [Closed]: " github-actions

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=20210306122157.eh4mNgI-1B06R9VBt-HmpWe_Oio8-OzeNg-W1a3YG7A@z \
    --to=arsenarsen@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).