diff mbox

[v3,1/2] libfcgi (0003-link-against-math.patch): Do actually link when needed.

Message ID 1432916111-1122-1-git-send-email-thomas.claveirole@green-communications.fr
State Accepted
Headers show

Commit Message

Thomas Claveirole May 29, 2015, 4:15 p.m. UTC 
libfcgi uses frexp() and thus should link with libm, but fails to do
so.  Thus link errors with programs that use libfcgi (the bug does
appear only with uClibc, because the GNU libc provides frexp()
directly in libc.so).  Modify 0003-link-against-math.patch so libfcgi
links against math, instead of programs that need it.

Signed-off-by: Thomas Claveirole <thomas.claveirole@green-communications.fr>
---
 package/libfcgi/0003-link-against-math.patch | 36 ++++++++++------------------
 1 file changed, 12 insertions(+), 24 deletions(-)

Comments

Thomas Petazzoni July 10, 2015, 10:28 p.m. UTC | #1 
Dear Thomas Claveirole,

On Fri, 29 May 2015 18:15:10 +0200, Thomas Claveirole wrote:
> libfcgi uses frexp() and thus should link with libm, but fails to do
> so.  Thus link errors with programs that use libfcgi (the bug does
> appear only with uClibc, because the GNU libc provides frexp()
> directly in libc.so).  Modify 0003-link-against-math.patch so libfcgi
> links against math, instead of programs that need it.
> 
> Signed-off-by: Thomas Claveirole <thomas.claveirole@green-communications.fr>
> ---
>  package/libfcgi/0003-link-against-math.patch | 36 ++++++++++------------------
>  1 file changed, 12 insertions(+), 24 deletions(-)

Applied with a slightly edited commit title, thanks.

Thomas
diff mbox

Patch

diff --git a/package/libfcgi/0003-link-against-math.patch b/package/libfcgi/0003-link-against-math.patch
index 4c87ea6..c60c6d5 100644
--- a/package/libfcgi/0003-link-against-math.patch
+++ b/package/libfcgi/0003-link-against-math.patch
@@ -1,28 +1,16 @@ 
-Link against math libraries when needed
+Link libfcgi against the math library.
 
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Thomas Claveirole <thomas.claveirole@green-communications.fr>
 
-Index: b/cgi-fcgi/Makefile.am
+Index: b/libfcgi/Makefile.am
 ===================================================================
---- a/cgi-fcgi/Makefile.am
-+++ b/cgi-fcgi/Makefile.am
-@@ -11,5 +11,5 @@
- LIBDIR      = ../libfcgi
- LIBFCGI     = $(LIBDIR)/libfcgi.la
+--- a/libfcgi/Makefile.am
++++ b/libfcgi/Makefile.am
+@@ -18,6 +18,7 @@
+                      os_@SYSTEM@.c
+ libfcgi_la_CC      = @PTHREAD_CC@
+ libfcgi_la_CFLAGS  = @PTHREAD_CFLAGS@
++libfcgi_la_LIBADD  = -lm
  
--LDADD = $(LIBFCGI)
-+LDADD = $(LIBFCGI) -lm
- cgi_fcgi_SOURCES = $(INCLUDE_FILES) cgi-fcgi.c
-Index: b/examples/Makefile.am
-===================================================================
---- a/examples/Makefile.am
-+++ b/examples/Makefile.am
-@@ -21,7 +21,7 @@
- LIBDIR      = ../libfcgi
- LIBFCGI     = $(LIBDIR)/libfcgi.la
- 
--LDADD = $(LIBFCGI)
-+LDADD = $(LIBFCGI) -lm
- 
- echo_SOURCES       = $(INCLUDE_FILES) echo.c
- echo_x_SOURCES     = $(INCLUDE_FILES) echo-x.c
+ libfcgi___la_SOURCES = $(INCLUDE_FILES)       \
+                        $(INCLUDEDIR)/fcgio.h  \