- 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)
This commit is contained in:
Marcelo Araujo 2009-08-11 12:26:49 +00:00
parent 2b8d3a9f82
commit d99def8e48
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=239316
2 changed files with 14 additions and 0 deletions

View file

@ -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

View file

@ -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@