diff options
| author | Marcelo Araujo <araujo@FreeBSD.org> | 2009-08-11 12:26:49 +0000 |
|---|---|---|
| committer | Marcelo Araujo <araujo@FreeBSD.org> | 2009-08-11 12:26:49 +0000 |
| commit | d99def8e48b4e4c1d6c84cecbc6393585c150bbd (patch) | |
| tree | 6865855d0b19dc22715cb68ef535fc8d957d2640 /www/mod_security | |
| parent | 2b8d3a9f82b443ab5b02bd0c48dc7271fe123d8c (diff) | |
| download | ports-d99def8e48b4e4c1d6c84cecbc6393585c150bbd.tar.gz ports-d99def8e48b4e4c1d6c84cecbc6393585c150bbd.zip | |
- Fix a linker error when you use mlogc with pthread in osversion
less than 700000.
Submitted by: Mel Flynn <mel.flynn+fbsd.questions@mailing.thruhere.net>
(private mail)
Notes
Notes:
svn path=/head/; revision=239316
Diffstat (limited to 'www/mod_security')
| -rw-r--r-- | www/mod_security/Makefile | 3 | ||||
| -rw-r--r-- | www/mod_security/files/extra-patch-fix-6.x-link | 11 |
2 files changed, 14 insertions, 0 deletions
diff --git a/www/mod_security/Makefile b/www/mod_security/Makefile index d1fc2775b029..61c3fc5b0d5c 100644 --- a/www/mod_security/Makefile +++ b/www/mod_security/Makefile @@ -47,6 +47,9 @@ OPTIONS= LUA "Embedded Lua language support" off \ SUB_FILES+= pkg-message.rules .if defined(WITH_MLOGC) PLIST_FILES+= bin/mlogc +.if ${OSVERSION} < 700000 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-fix-6.x-link +.endif .endif PLIST_DIRS+= ${APACHEETCDIR}/Includes/mod_security2/optional_rules PLIST_DIRS+= ${APACHEETCDIR}/Includes/mod_security2 diff --git a/www/mod_security/files/extra-patch-fix-6.x-link b/www/mod_security/files/extra-patch-fix-6.x-link new file mode 100644 index 000000000000..5347cadecc1a --- /dev/null +++ b/www/mod_security/files/extra-patch-fix-6.x-link @@ -0,0 +1,11 @@ +--- mlogc-src/Makefile.in.orig 2008-09-02 23:10:36.000000000 +0000 ++++ mlogc-src/Makefile.in 2009-08-09 20:24:50.000000000 +0000 +@@ -10,7 +10,7 @@ + MLOGC_VERSION = `grep '^\#define *VERSION ' mlogc.c | sed 's/.*VERSION *"\([^"]*\)"/\1/'` + + APR_FLAGS = @APR_CFLAGS@ +-APR_LIBS = @APR_LINK_LD@ ++APR_LIBS = @APR_LINK_LD@ @APR_LIBS@ + + CURL_FLAGS = @CURL_CFLAGS@ + CURL_LIBS = @CURL_LIBS@ |