Skip to contentSkip to conversation

pifmrds: Fix Makefile to prevent link usage in static build

PATCH New Eric Limpens 3 participants 3 messages Feb 26, 2016 – Feb 28, 2016

lore
Share & tools
lore

Eric Limpens

author
#0 lore raw

PATCH 1/1 pifmrds: Fix Makefile to prevent link usage in static build

This patch fixes an autobuild error during a static build:
http://autobuild.buildroot.net/results/f61ae46ba4d4fc3af3784d1f612a8c1cc7de3314/

Signed-off-by Eric Limpens <[email protected]>
---
 .../pifmrds/0003-Makefile-fix-static-link.patch    | 25 ++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 package/pifmrds/0003-Makefile-fix-static-link.patch
package/pifmrds/0003-Makefile-fix-static-link.patch new file +25 -0
new file mode 100644
index 0000000..322a748
@@ -0,0 +1,25 @@
+Makefile: Fix static linking
+
+This patch fixes
+http://autobuild.buildroot.net/results/f61ae46ba4d4fc3af3784d1f612a8c1cc7de3314/
+
+
+Signed-off-by: "Eric Limpens" <[email protected]>
+
+
+diff -purN pifmrds-0bf57f9ce0d954365a38d8af8e7be6f28521c3f2.orig/src/Makefile pifmrds-0bf57f9ce0d954365a38d8af8e7be6f28521c3f2/src/Makefile
+--- pifmrds-0bf57f9ce0d954365a38d8af8e7be6f28521c3f2.orig/src/Makefile	2016-02-26 08:06:43.102962592 +0100
++++ pifmrds-0bf57f9ce0d954365a38d8af8e7be6f28521c3f2/src/Makefile	2016-02-26 08:27:11.069148203 +0100
+@@ -1,10 +1,10 @@
+ CC = gcc
+ 
+ app: rds.o waveforms.o pi_fm_rds.o fm_mpx.o control_pipe.o
+-	$(CC) $(LDFLAGS) -o pi_fm_rds rds.o waveforms.o pi_fm_rds.o fm_mpx.o control_pipe.o -lm -lsndfile
++	$(CC) $(LDFLAGS) -o pi_fm_rds rds.o waveforms.o pi_fm_rds.o fm_mpx.o control_pipe.o -lsndfile -lm
+ 
+ rds_wav: rds.o waveforms.o rds_wav.o fm_mpx.o
+-	$(CC) $(LDFLAGS) -o rds_wav rds_wav.o rds.o waveforms.o fm_mpx.o -lm -lsndfile
++	$(CC) $(LDFLAGS) -o rds_wav rds_wav.o rds.o waveforms.o fm_mpx.o -lsndfile -lm
+ 
+ rds.o: rds.c waveforms.h
+ 	$(CC) $(CFLAGS) rds.c
Signature · 1 line
1.9.1
#1 lore raw

PATCH v3 1/1 pifmrds: add patch to correct linking in static build

From: Eric Limpens <[email protected]>

This patch fixes an autobuild error during a static build:
http://autobuild.buildroot.net/results/f61ae46ba4d4fc3af3784d1f612a8c1cc7de3314/

Signed-off-by Eric Limpens <[email protected]>
[Arnout: clean up commit message and patch log]
Signed-off-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

---
v3: clean up commit message and patch log [Arnout]

---
 .../pifmrds/0003-Makefile-fix-static-link.patch    | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 package/pifmrds/0003-Makefile-fix-static-link.patch
package/pifmrds/0003-Makefile-fix-static-link.patch new file +23 -0
new file mode 100644
index 0000000..ecd7c4f
@@ -0,0 +1,23 @@
+Makefile: Fix static linking
+
+Since libsndfile uses funtions from libm, the -lm should be specified
+after libsndfile for static linking.
+
+Signed-off-by: "Eric Limpens" <[email protected]>
+
+diff -purN pifmrds-0bf57f9ce0d954365a38d8af8e7be6f28521c3f2.orig/src/Makefile pifmrds-0bf57f9ce0d954365a38d8af8e7be6f28521c3f2/src/Makefile
+--- pifmrds-0bf57f9ce0d954365a38d8af8e7be6f28521c3f2.orig/src/Makefile	2016-02-26 08:06:43.102962592 +0100
++++ pifmrds-0bf57f9ce0d954365a38d8af8e7be6f28521c3f2/src/Makefile	2016-02-26 08:27:11.069148203 +0100
+@@ -1,10 +1,10 @@
+ CC = gcc
+ 
+ app: rds.o waveforms.o pi_fm_rds.o fm_mpx.o control_pipe.o
+-	$(CC) $(LDFLAGS) -o pi_fm_rds rds.o waveforms.o pi_fm_rds.o fm_mpx.o control_pipe.o -lm -lsndfile
++	$(CC) $(LDFLAGS) -o pi_fm_rds rds.o waveforms.o pi_fm_rds.o fm_mpx.o control_pipe.o -lsndfile -lm
+ 
+ rds_wav: rds.o waveforms.o rds_wav.o fm_mpx.o
+-	$(CC) $(LDFLAGS) -o rds_wav rds_wav.o rds.o waveforms.o fm_mpx.o -lm -lsndfile
++	$(CC) $(LDFLAGS) -o rds_wav rds_wav.o rds.o waveforms.o fm_mpx.o -lsndfile -lm
+ 
+ rds.o: rds.c waveforms.h
+ 	$(CC) $(CFLAGS) rds.c
Signature · 1 line
2.7.0
Applied
#2 lore raw

PATCH v3 1/1 pifmrds: add patch to correct linking in static build

Dear Arnout Vandecappelle (Essensium/Mind),

Quoted 8 lines · Arnout Vandecappelle (Essensium/Mind)

From: Eric Limpens <[email protected]>

This patch fixes an autobuild error during a static build:
http://autobuild.buildroot.net/results/f61ae46ba4d4fc3af3784d1f612a8c1cc7de3314/

Signed-off-by Eric Limpens <[email protected]>
[Arnout: clean up commit message and patch log]
Signed-off-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>
Quoted 6 lines

---
v3: clean up commit message and patch log [Arnout]

---
 .../pifmrds/0003-Makefile-fix-static-link.patch    | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 package/pifmrds/0003-Makefile-fix-static-link.patch

Applied to master, thanks.

Thomas

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