Revision: 13485
http://gar.svn.sourceforge.net/gar/?rev=13485&view=rev
Author: wahwah
Date: 2011-02-27 18:39:46 +0000 (Sun, 27 Feb 2011)
Log Message:
-----------
lighttpd: Work towards the solution of mod_compress problem.
Modified Paths:
--------------
csw/mgar/pkg/lighttpd/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/lighttpd/trunk/files/0002-Force-LDFLAGS-on-mod_compress.patch
Modified: csw/mgar/pkg/lighttpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lighttpd/trunk/Makefile 2011-02-27 18:19:40 UTC (rev
13484)
+++ csw/mgar/pkg/lighttpd/trunk/Makefile 2011-02-27 18:39:46 UTC (rev
13485)
@@ -17,12 +17,24 @@
MASTER_SITES = http://download.lighttpd.net/lighttpd/releases-1.4.x/
DISTFILES = $(NAME)-$(VERSION).tar.gz
+EXTRA_LIB = $(prefix)/lib
EXTRA_LDFLAGS += -lsendfile
+
# To fix undefined symbol 'dlopen' on Solaris 9
EXTRA_LDFLAGS_5.9 += -ldl
EXTRA_LDFLAGS += $(EXTRA_LDFLAGS_$(GAROSREL))
+
PATCHFILES += 0001-Work-around-linking-problem-buffer.c.patch
+# The module compilation ignores LDFLAGS by default, let's force them to
+# inject the right -R flag.
+PATCHFILES += 0002-Force-LDFLAGS-on-mod_compress.patch
+
+# lighttpd puts its modules under libdir, so we pass libdir as a subdirectory,
+# because modules are not supposed to be in /opt/csw/lib.
+libdir = $(prefix)/lib/lighttpd
+
+CONFIGURE_ARGS = $(DIRPATHS)
# Solaris 9 does not have IPV6_V6ONLY.
# IPv6 support only works on Solaris 10.
CONFIGURE_ARGS_5.9 = --disable-ipv6
@@ -31,6 +43,7 @@
PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386
PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
+# One test is still failing.
TEST_TARGET = check
include gar/category.mk
Added:
csw/mgar/pkg/lighttpd/trunk/files/0002-Force-LDFLAGS-on-mod_compress.patch
===================================================================
--- csw/mgar/pkg/lighttpd/trunk/files/0002-Force-LDFLAGS-on-mod_compress.patch
(rev 0)
+++ csw/mgar/pkg/lighttpd/trunk/files/0002-Force-LDFLAGS-on-mod_compress.patch
2011-02-27 18:39:46 UTC (rev 13485)
@@ -0,0 +1,24 @@
+From fa3fa5796150b4c381a3b6c8b5a0dc20b26a82bd Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <mac...@opencsw.org>
+Date: Sun, 27 Feb 2011 19:10:12 +0100
+Subject: [PATCH] Force LDFLAGS on mod_compress
+
+---
+ src/Makefile.in | 2 +-
+ src/configparser.c | 240 +++++++++++++++++++++++-----------------------
+ src/mod_ssi_exprparser.c | 56 ++++++------
+ 3 files changed, 148 insertions(+), 150 deletions(-)
+
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 5b7cb63..1362f2c 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -762,7 +762,7 @@ mod_access_la_SOURCES = mod_access.c
+ mod_access_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
+ mod_access_la_LIBADD = $(common_libadd)
+ mod_compress_la_SOURCES = mod_compress.c
+-mod_compress_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
++mod_compress_la_LDFLAGS = -module -export-dynamic -avoid-version
-no-undefined $(LDFLAGS)
+ mod_compress_la_LIBADD = $(Z_LIB) $(BZ_LIB) $(common_libadd)
+ mod_auth_la_SOURCES = mod_auth.c http_auth_digest.c http_auth.c
+ mod_auth_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
