* [bug#60430] [PATCH] gnu: icu4c: Update packaging style.
@ 2022-12-30 16:09 Nicolas Graves via Guix-patches via
2023-03-21 15:19 ` Maxim Cournoyer
2024-01-20 20:04 ` bug#60430: [PATCH core-updates] " Maxim Cournoyer
0 siblings, 2 replies; 3+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2022-12-30 16:09 UTC (permalink / raw)
To: 60430; +Cc: ngraves
* gnu/packages/icu4c.scm (icu4c): Update packaging style.
---
gnu/packages/icu4c.scm | 66 ++++++++++++++++++++----------------------
1 file changed, 32 insertions(+), 34 deletions(-)
diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm
index 1e4f66d956..1338c8f525 100644
--- a/gnu/packages/icu4c.scm
+++ b/gnu/packages/icu4c.scm
@@ -63,41 +63,39 @@ (define-public icu4c
(inputs
(list perl))
(arguments
- `(#:configure-flags
- (list
+ (list
+ #:configure-flags
+ `(list
"--enable-rpath"
- ,@(if (%current-target-system)
- '((string-append "--with-cross-build="
- (assoc-ref %build-inputs "icu4c-build-root")))
- '()))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'chdir-to-source
- (lambda _ (chdir "source") #t))
- (add-after 'chdir-to-source 'update-LDFLAGS
- (lambda _
- ;; Do not create a "data-only" libicudata.so because it causes
- ;; problems on some architectures (notably armhf and MIPS).
- (substitute* "config/mh-linux"
- (("LDFLAGSICUDT=-nodefaultlibs -nostdlib")
- "LDFLAGSICUDT="))
- #t))
- ,@(if (target-riscv64?)
- `((add-after 'unpack 'disable-failing-test
- ;; It is unknown why this test is failing.
- (lambda _
- (substitute* "source/test/intltest/numbertest_api.cpp"
- (("(TESTCASE_AUTO\\(unitUsage\\));" all)
- (string-append "//" all))))))
- '())
- (add-after 'install 'avoid-coreutils-reference
- ;; Don't keep a reference to the build tools.
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (substitute* (find-files (string-append out "/lib/icu")
- "\\.inc$")
- (("INSTALL_CMD=.*/bin/install") "INSTALL_CMD=install"))
- #t))))))
+ ,@(if (%current-target-system)
+ '((string-append "--with-cross-build="
+ (assoc-ref %build-inputs "icu4c-build-root")))
+ '()))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'chdir-to-source
+ (lambda _ (chdir "source")))
+ (add-after 'chdir-to-source 'update-LDFLAGS
+ (lambda _
+ ;; Do not create a "data-only" libicudata.so because it causes
+ ;; problems on some architectures (notably armhf and MIPS).
+ (substitute* "config/mh-linux"
+ (("LDFLAGSICUDT=-nodefaultlibs -nostdlib")
+ "LDFLAGSICUDT="))))
+ #$@(if (target-riscv64?)
+ `((add-after 'unpack 'disable-failing-test
+ ;; It is unknown why this test is failing.
+ (lambda _
+ (substitute* "source/test/intltest/numbertest_api.cpp"
+ (("(TESTCASE_AUTO\\(unitUsage\\));" all)
+ (string-append "//" all))))))
+ '())
+ (add-after 'install 'avoid-coreutils-reference
+ ;; Don't keep a reference to the build tools.
+ (lambda _
+ (substitute* (find-files (string-append #$output "/lib/icu")
+ "\\.inc$")
+ (("INSTALL_CMD=.*/bin/install") "INSTALL_CMD=install")))))))
(synopsis "International Components for Unicode")
(description
"ICU is a set of C/C++ and Java libraries providing Unicode and
--
2.38.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#60430] [PATCH] gnu: icu4c: Update packaging style.
2022-12-30 16:09 [bug#60430] [PATCH] gnu: icu4c: Update packaging style Nicolas Graves via Guix-patches via
@ 2023-03-21 15:19 ` Maxim Cournoyer
2024-01-20 20:04 ` bug#60430: [PATCH core-updates] " Maxim Cournoyer
1 sibling, 0 replies; 3+ messages in thread
From: Maxim Cournoyer @ 2023-03-21 15:19 UTC (permalink / raw)
To: Nicolas Graves; +Cc: 60430, GNU Debbugs
retitle 60430 [PATCH core-updates] gnu: icu4c: Update packaging style.
quit
Hello!
Nicolas Graves <ngraves@ngraves.fr> writes:
> * gnu/packages/icu4c.scm (icu4c): Update packaging style.
> ---
> gnu/packages/icu4c.scm | 66 ++++++++++++++++++++----------------------
> 1 file changed, 32 insertions(+), 34 deletions(-)
>
> diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm
> index 1e4f66d956..1338c8f525 100644
> --- a/gnu/packages/icu4c.scm
> +++ b/gnu/packages/icu4c.scm
> @@ -63,41 +63,39 @@ (define-public icu4c
> (inputs
> (list perl))
> (arguments
> - `(#:configure-flags
> - (list
> + (list
> + #:configure-flags
> + `(list
> "--enable-rpath"
> - ,@(if (%current-target-system)
> - '((string-append "--with-cross-build="
> - (assoc-ref %build-inputs "icu4c-build-root")))
> - '()))
> - #:phases
> - (modify-phases %standard-phases
> - (add-after 'unpack 'chdir-to-source
> - (lambda _ (chdir "source") #t))
> - (add-after 'chdir-to-source 'update-LDFLAGS
> - (lambda _
> - ;; Do not create a "data-only" libicudata.so because it causes
> - ;; problems on some architectures (notably armhf and MIPS).
> - (substitute* "config/mh-linux"
> - (("LDFLAGSICUDT=-nodefaultlibs -nostdlib")
> - "LDFLAGSICUDT="))
> - #t))
> - ,@(if (target-riscv64?)
> - `((add-after 'unpack 'disable-failing-test
> - ;; It is unknown why this test is failing.
> - (lambda _
> - (substitute* "source/test/intltest/numbertest_api.cpp"
> - (("(TESTCASE_AUTO\\(unitUsage\\));" all)
> - (string-append "//" all))))))
> - '())
> - (add-after 'install 'avoid-coreutils-reference
> - ;; Don't keep a reference to the build tools.
> - (lambda* (#:key outputs #:allow-other-keys)
> - (let ((out (assoc-ref outputs "out")))
> - (substitute* (find-files (string-append out "/lib/icu")
> - "\\.inc$")
> - (("INSTALL_CMD=.*/bin/install") "INSTALL_CMD=install"))
> - #t))))))
> + ,@(if (%current-target-system)
> + '((string-append "--with-cross-build="
> + (assoc-ref %build-inputs "icu4c-build-root")))
> + '()))
> + #:phases
> + #~(modify-phases %standard-phases
> + (add-after 'unpack 'chdir-to-source
> + (lambda _ (chdir "source")))
> + (add-after 'chdir-to-source 'update-LDFLAGS
> + (lambda _
> + ;; Do not create a "data-only" libicudata.so because it causes
> + ;; problems on some architectures (notably armhf and MIPS).
> + (substitute* "config/mh-linux"
> + (("LDFLAGSICUDT=-nodefaultlibs -nostdlib")
> + "LDFLAGSICUDT="))))
> + #$@(if (target-riscv64?)
> + `((add-after 'unpack 'disable-failing-test
> + ;; It is unknown why this test is failing.
> + (lambda _
> + (substitute* "source/test/intltest/numbertest_api.cpp"
> + (("(TESTCASE_AUTO\\(unitUsage\\));" all)
> + (string-append "//" all))))))
> + '())
> + (add-after 'install 'avoid-coreutils-reference
> + ;; Don't keep a reference to the build tools.
> + (lambda _
> + (substitute* (find-files (string-append #$output "/lib/icu")
> + "\\.inc$")
> + (("INSTALL_CMD=.*/bin/install") "INSTALL_CMD=install")))))))
> (synopsis "International Components for Unicode")
> (description
> "ICU is a set of C/C++ and Java libraries providing Unicode and
This looks good, but it's a core-updates change: guix refresh -l
icu4c@69 says 12433 packages would be rebuilt.
Also, you should update all the variants which inherits this one to also
use gexp expressions, as it may cause problems otherwise.
I'm adding 'core-updates' to the title to avoid merge mistakes.
Thanks for working on it!
--
Maxim
^ permalink raw reply [flat|nested] 3+ messages in thread
* bug#60430: [PATCH core-updates] gnu: icu4c: Update packaging style.
2022-12-30 16:09 [bug#60430] [PATCH] gnu: icu4c: Update packaging style Nicolas Graves via Guix-patches via
2023-03-21 15:19 ` Maxim Cournoyer
@ 2024-01-20 20:04 ` Maxim Cournoyer
1 sibling, 0 replies; 3+ messages in thread
From: Maxim Cournoyer @ 2024-01-20 20:04 UTC (permalink / raw)
To: Nicolas Graves; +Cc: 60430-done
Hi,
Nicolas Graves <ngraves@ngraves.fr> writes:
> * gnu/packages/icu4c.scm (icu4c): Update packaging style.
That's now already been done on core-updates.
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-01-20 20:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-30 16:09 [bug#60430] [PATCH] gnu: icu4c: Update packaging style Nicolas Graves via Guix-patches via
2023-03-21 15:19 ` Maxim Cournoyer
2024-01-20 20:04 ` bug#60430: [PATCH core-updates] " Maxim Cournoyer
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).