Use 'pkg-config glib-2.0 --libs --static' to construct linker flags when

building the static binary. Fixes build problem reported by nigel@ since the
glib-2.0.pc now (correctly) only lists pthread in Libs.private not in Libs.
ok ajacoutot@
This commit is contained in:
sthen 2012-08-30 13:47:45 +00:00
parent 57af6dc327
commit 9fc05a7ddf
2 changed files with 4 additions and 4 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.7 2012/04/11 10:11:32 sthen Exp $
# $OpenBSD: Makefile,v 1.8 2012/08/30 13:47:45 sthen Exp $
COMMENT-main= wrapper to run CGI applications via FastCGI
COMMENT-static= static-linked fcgi-cgi wrapper for chroot use
@ -7,7 +7,7 @@ V= 0.1.8
DISTNAME= fcgi-cgi-$V
PKGNAME-main= fcgi-cgi-$V
PKGNAME-static= fcgi-cgi-static-$V
REVISION= 2
REVISION= 3
CATEGORIES= www
HOMEPAGE= http://redmine.lighttpd.net/projects/fcgi-cgi/wiki

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-Makefile_am,v 1.1 2012/04/10 19:34:52 sthen Exp $
$OpenBSD: patch-Makefile_am,v 1.2 2012/08/30 13:47:45 sthen Exp $
--- Makefile.am.orig Thu Oct 28 22:43:23 2010
+++ Makefile.am Tue Apr 10 15:47:59 2012
@@ -4,5 +4,9 @@ man1_MANS=fcgi-cgi.1
@ -10,5 +10,5 @@ $OpenBSD: patch-Makefile_am,v 1.1 2012/04/10 19:34:52 sthen Exp $
fcgi_cgi_SOURCES=fastcgi.c fcgi-cgi.c
+
+fcgi_cgi_static_LDADD=$(fcgi_cgi_LDADD)
+fcgi_cgi_static_LDFLAGS=-static
+fcgi_cgi_static_LDFLAGS=-static `pkg-config glib-2.0 --libs --static`
+fcgi_cgi_static_SOURCES=$(fcgi_cgi_SOURCES)