* [PR PATCH] R: define __MUSL__ when building for musl libc
@ 2021-09-16 15:47 sgn
2021-09-18 13:27 ` [PR PATCH] [Merged]: " sgn
0 siblings, 1 reply; 2+ messages in thread
From: sgn @ 2021-09-16 15:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1647 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages R-musl
https://github.com/void-linux/void-packages/pull/32982
R: define __MUSL__ when building for musl libc
R people assumes it's defined for musl libc.
<!-- 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/32982.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-R-musl-32982.patch --]
[-- Type: text/x-diff, Size: 1019 bytes --]
From 6013dc74052dc84472f533ae29741654337fff52 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: Thu, 16 Sep 2021 22:44:43 +0700
Subject: [PATCH] R: define __MUSL__ when building for musl libc
R people assumes it's defined for musl libc.
---
srcpkgs/R/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index dad0e3b00421..38ecea576b55 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
# Template file for 'R'
pkgname=R
version=4.1.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
--with-blas$(vopt_if openblas '=openblas') --with-lapack
@@ -37,6 +37,10 @@ case "$XBPS_TARGET_MACHINE" in
*) ;;
esac
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+ export CPPFLAGS=-D__MUSL__
+fi
+
pre_configure() {
export R_BROWSER=/usr/bin/xdg-open
export R_PDFVIEWER=/usr/bin/xdg-open
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: R: define __MUSL__ when building for musl libc
2021-09-16 15:47 [PR PATCH] R: define __MUSL__ when building for musl libc sgn
@ 2021-09-18 13:27 ` sgn
0 siblings, 0 replies; 2+ messages in thread
From: sgn @ 2021-09-18 13:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1505 bytes --]
There's a merged pull request on the void-packages repository
R: define __MUSL__ when building for musl libc
https://github.com/void-linux/void-packages/pull/32982
Description:
R people assumes it's defined for musl libc.
<!-- 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
-->
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-09-18 13:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-16 15:47 [PR PATCH] R: define __MUSL__ when building for musl libc sgn
2021-09-18 13:27 ` [PR PATCH] [Merged]: " sgn
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).