Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] dante: fix runtime on musl.
@ 2021-01-24 19:54 ericonr
  2021-01-24 20:03 ` [PR PATCH] [Updated] " ericonr
  2021-01-25 19:15 ` [PR PATCH] [Merged]: " ericonr
  0 siblings, 2 replies; 3+ messages in thread
From: ericonr @ 2021-01-24 19:54 UTC (permalink / raw)
  To: ml

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

There is a new pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages dante
https://github.com/void-linux/void-packages/pull/28184

dante: fix runtime on musl.
musl implements the sched_{set,get}scheduler functions as stubs.
Unfortunately, dante fails if the functions are available but return an
error, which is always the case for musl. Force it to think setscheduler
isn't available (var appropriated from Alpine).

Also fix their m4 stuff to search for sched_setaffinity properly (needs
_GNU_SOURCE on musl). That functions is implemented completely by musl.

Fixes #28180

<!-- 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/28184.patch is attached

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

From b61245b795d4e4dc39277f583b6c50d494fc4931 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 24 Jan 2021 16:50:37 -0300
Subject: [PATCH] dante: fix runtime on musl.

musl implements the sched_{set,get}scheduler functions as stubs.
Unfortunately, dante fails if the functions are available but return an
error, which is always the case for musl. Force it to think setscheduler
isn't available (var appropriated from Alpine).

Also fix their m4 stuff to search for sched_setaffinity properly (needs
_GNU_SOURCE on musl). That functions is implemented completely by musl.

Fixes #28180
---
 .../patches/musl-detect-sched_setaffinity.patch      | 12 ++++++++++++
 srcpkgs/dante/template                               |  4 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/dante/patches/musl-detect-sched_setaffinity.patch

diff --git a/srcpkgs/dante/patches/musl-detect-sched_setaffinity.patch b/srcpkgs/dante/patches/musl-detect-sched_setaffinity.patch
new file mode 100644
index 00000000000..87c784a40bf
--- /dev/null
+++ b/srcpkgs/dante/patches/musl-detect-sched_setaffinity.patch
@@ -0,0 +1,12 @@
+diff --git libscompat.m4 libscompat.m4
+index 913e9e5..03f0a64 100644
+--- libscompat.m4
++++ libscompat.m4
+@@ -103,6 +103,7 @@ AC_CHECK_FUNC(getpassphrase,
+ 
+ AC_MSG_CHECKING([for sched_setaffinity])
+ AC_TRY_COMPILE([
++#define _GNU_SOURCE
+ #include <sched.h>
+ ],
+ [   cpu_set_t set1;
diff --git a/srcpkgs/dante/template b/srcpkgs/dante/template
index 44e08fd6ab1..17fe0f69ae6 100644
--- a/srcpkgs/dante/template
+++ b/srcpkgs/dante/template
@@ -1,7 +1,7 @@
 # Template file for 'dante'
 pkgname=dante
 version=1.4.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="tar automake libtool"
 short_desc="SOCKS server and client"
@@ -13,6 +13,8 @@ checksum=4c97cff23e5c9b00ca1ec8a95ab22972813921d7fbf60fc453e3e06382fc38a7
 
 if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
 	configure_args="--with-libc=libc.so.6"
+else
+	configure_args="ac_cv_func_sched_setscheduler=no"
 fi
 
 pre_configure() {

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Updated] dante: fix runtime on musl.
  2021-01-24 19:54 [PR PATCH] dante: fix runtime on musl ericonr
@ 2021-01-24 20:03 ` ericonr
  2021-01-25 19:15 ` [PR PATCH] [Merged]: " ericonr
  1 sibling, 0 replies; 3+ messages in thread
From: ericonr @ 2021-01-24 20:03 UTC (permalink / raw)
  To: ml

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

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

https://github.com/ericonr/void-packages dante
https://github.com/void-linux/void-packages/pull/28184

dante: fix runtime on musl.
musl implements the sched_{set,get}scheduler functions as stubs.
Unfortunately, dante fails if the functions are available but return an
error, which is always the case for musl. Force it to think setscheduler
isn't available (var appropriated from Alpine).

Also fix their m4 stuff to search for sched_setaffinity properly (needs
_GNU_SOURCE on musl). That functions is implemented completely by musl.

Fixes #28180

<!-- 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/28184.patch is attached

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

From 9531fababe64a698c18c8552455d229507a532e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 24 Jan 2021 16:50:37 -0300
Subject: [PATCH] dante: fix runtime on musl.

musl implements the sched_{set,get}scheduler functions as stubs.
Unfortunately, dante fails if the functions are available but return an
error, which is always the case for musl. Force it to think setscheduler
isn't available (var appropriated from Alpine).

Fixes #28180
---
 srcpkgs/dante/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/dante/template b/srcpkgs/dante/template
index 44e08fd6ab1..17fe0f69ae6 100644
--- a/srcpkgs/dante/template
+++ b/srcpkgs/dante/template
@@ -1,7 +1,7 @@
 # Template file for 'dante'
 pkgname=dante
 version=1.4.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="tar automake libtool"
 short_desc="SOCKS server and client"
@@ -13,6 +13,8 @@ checksum=4c97cff23e5c9b00ca1ec8a95ab22972813921d7fbf60fc453e3e06382fc38a7
 
 if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
 	configure_args="--with-libc=libc.so.6"
+else
+	configure_args="ac_cv_func_sched_setscheduler=no"
 fi
 
 pre_configure() {

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Merged]: dante: fix runtime on musl.
  2021-01-24 19:54 [PR PATCH] dante: fix runtime on musl ericonr
  2021-01-24 20:03 ` [PR PATCH] [Updated] " ericonr
@ 2021-01-25 19:15 ` ericonr
  1 sibling, 0 replies; 3+ messages in thread
From: ericonr @ 2021-01-25 19:15 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

dante: fix runtime on musl.
https://github.com/void-linux/void-packages/pull/28184

Description:
musl implements the sched_{set,get}scheduler functions as stubs.
Unfortunately, dante fails if the functions are available but return an
error, which is always the case for musl. Force it to think setscheduler
isn't available (var appropriated from Alpine).

Fixes #28180

<!-- 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] 3+ messages in thread

end of thread, other threads:[~2021-01-25 19:15 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-24 19:54 [PR PATCH] dante: fix runtime on musl ericonr
2021-01-24 20:03 ` [PR PATCH] [Updated] " ericonr
2021-01-25 19:15 ` [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).