Skip to contentSkip to conversation

package/squeezelite: fix musl build

PATCH New Bernd Kuhls 3 participants 3 messages Jan 31, 2016 – Feb 7, 2016

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH 1/1 package/squeezelite: fix musl build

The build error was not yet found by the autobuilders:

output_alsa.c: In function ?output_init_alsa?:
output_alsa.c:865:10: error: ?M_TRIM_THRESHOLD? undeclared (first use in this function)

  mallopt(M_TRIM_THRESHOLD, -1);
          ^
output_alsa.c:865:10: note: each undeclared identifier is reported only once for each function it appears in
output_alsa.c:866:10: error: ?M_MMAP_MAX? undeclared (first use in this function)
  mallopt(M_MMAP_MAX, 0);
          ^
Signed-off-by Bernd Kuhls <[email protected]>
---
 ...02-only-run-glibc-specific-hacks-on-glibc.patch | 30 ++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 package/squeezelite/0002-only-run-glibc-specific-hacks-on-glibc.patch
package/squeezelite/0002-only-run-glibc-specific-hacks-on-glibc.patch new file +30 -0
new file mode 100644
index 0000000..12237e4
@@ -0,0 +1,30 @@
+From d898fac929cd093bb39af3f517158777c21c06ef Mon Sep 17 00:00:00 2001
+From: Carlo Landmeter <[email protected]>
+Date: Tue, 31 Mar 2015 10:07:14 +0000
+Subject: [PATCH] only run glibc specific hacks on glibc
+
+---
+Patch downloaded from upstream PR:
+https://github.com/robadenshi/squeezelite/issues/97
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+
+ output_alsa.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/output_alsa.c b/output_alsa.c
+index aa01560..c1b5435 100644
+--- a/output_alsa.c
++++ b/output_alsa.c
+@@ -853,7 +853,7 @@ void output_init_alsa(log_level level, const char *device, unsigned output_buf_s
+ 		set_mixer(output.device, volume_mixer_name, volume_mixer_index ? atoi(volume_mixer_index) : 0, true, 0, 0);
+ 	}
+ 
+-#if LINUX
++#if defined(__GLIBC__)
+ 	// RT linux - aim to avoid pagefaults by locking memory: 
+ 	// https://rt.wiki.kernel.org/index.php/Threaded_RT-application_with_memory_locking_and_stack_handling_example
+ 	if (mlockall(MCL_CURRENT | MCL_FUTURE) == -1) {
+-- 
+2.3.4
+
Signature · 1 line
2.7.0
#1 lore raw

PATCH 1/1 package/squeezelite: fix musl build

Quoted 40 lines · Bernd Kuhls

The build error was not yet found by the autobuilders:

output_alsa.c: In function ?output_init_alsa?:
output_alsa.c:865:10: error: ?M_TRIM_THRESHOLD? undeclared (first use in this function)

  mallopt(M_TRIM_THRESHOLD, -1);
          ^
output_alsa.c:865:10: note: each undeclared identifier is reported only once for each function it appears in
output_alsa.c:866:10: error: ?M_MMAP_MAX? undeclared (first use in this function)
  mallopt(M_MMAP_MAX, 0);
          ^
Signed-off-by Bernd Kuhls <[email protected]>
---
 ...02-only-run-glibc-specific-hacks-on-glibc.patch | 30 ++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 package/squeezelite/0002-only-run-glibc-specific-hacks-on-glibc.patch
package/squeezelite/0002-only-run-glibc-specific-hacks-on-glibc.patch new file +17 -0
new file mode 100644
index 0000000..12237e4
@@ -0,0 +1,30 @@
+From d898fac929cd093bb39af3f517158777c21c06ef Mon Sep 17 00:00:00 2001
+From: Carlo Landmeter <[email protected]>
+Date: Tue, 31 Mar 2015 10:07:14 +0000
+Subject: [PATCH] only run glibc specific hacks on glibc
+
+---
+Patch downloaded from upstream PR:
+https://github.com/robadenshi/squeezelite/issues/97
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+
+ output_alsa.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/output_alsa.c b/output_alsa.c
+index aa01560..c1b5435 100644
+--- a/output_alsa.c

package/squeezelite/0002-only-run-glibc-specific-hacks-on-glibc.patch line 27

Quoted 10 lines
package/squeezelite/0002-only-run-glibc-specific-hacks-on-glibc.patch new file +10 -0
++++ b/output_alsa.c
+@@ -853,7 +853,7 @@ void output_init_alsa(log_level level, const char *device, unsigned output_buf_s
+ 		set_mixer(output.device, volume_mixer_name, volume_mixer_index ? atoi(volume_mixer_index) : 0, true, 0, 0);
+ 	}
+ 
+-#if LINUX
++#if defined(__GLIBC__)
+ 	// RT linux - aim to avoid pagefaults by locking memory: 
+ 	// https://rt.wiki.kernel.org/index.php/Threaded_RT-application_with_memory_locking_and_stack_handling_example
+ 	if (mlockall(MCL_CURRENT | MCL_FUTURE) == -1) {

This doesn't look right - you still want to do the mlockall even on musl, no?

Regards,
Arnout

Quoted 4 lines
package/squeezelite/0002-only-run-glibc-specific-hacks-on-glibc.patch new file +3 -0
+-- 
+2.3.4
+
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
#2 lore raw

PATCH 1/1 package/squeezelite: fix musl build

In reply to Bernd Kuhls

Dear Bernd Kuhls,

Quoted 11 lines · Bernd Kuhls

The build error was not yet found by the autobuilders:

output_alsa.c: In function ?output_init_alsa?:
output_alsa.c:865:10: error: ?M_TRIM_THRESHOLD? undeclared (first use in this function)

  mallopt(M_TRIM_THRESHOLD, -1);
          ^
output_alsa.c:865:10: note: each undeclared identifier is reported only once for each function it appears in
output_alsa.c:866:10: error: ?M_MMAP_MAX? undeclared (first use in this function)
  mallopt(M_MMAP_MAX, 0);
          ^
Quoted 5 lines
Signed-off-by Bernd Kuhls <[email protected]>
---
 ...02-only-run-glibc-specific-hacks-on-glibc.patch | 30 ++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 package/squeezelite/0002-only-run-glibc-specific-hacks-on-glibc.patch

Applied with some changes:

[Thomas: only enclose the mallopt() call in __GLIBC__, use Git to format the patch, improve the commit log.]

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com