diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2004-10-07 16:00:44 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2004-10-07 16:00:44 +0000 |
| commit | 02ef3c46950fd63ecb908757d402500c07608aa7 (patch) | |
| tree | f845c4c88512867aa05981b1d7262c7b586b978f | |
| parent | fe3e9b0098847f5d054ed64074729d42e2bfbc56 (diff) | |
| download | ports-02ef3c46950fd63ecb908757d402500c07608aa7.tar.gz ports-02ef3c46950fd63ecb908757d402500c07608aa7.zip | |
Respect PTHREAD_{CFLAGS,LIBS} on 5.x and beyond.
Submitted by: marcus
Approved by: portmgr (self)
Notes
Notes:
svn path=/head/; revision=118576
| -rw-r--r-- | www/oops/files/patch-configure.in | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/www/oops/files/patch-configure.in b/www/oops/files/patch-configure.in index 5106642221b5..465217ca4492 100644 --- a/www/oops/files/patch-configure.in +++ b/www/oops/files/patch-configure.in @@ -1,5 +1,5 @@ ---- configure.in.orig Tue Oct 14 00:49:36 2003 -+++ configure.in Mon Mar 15 03:38:44 2004 +--- configure.in.orig Tue Oct 14 03:49:36 2003 ++++ configure.in Mon Sep 27 14:52:41 2004 @@ -315,8 +315,7 @@ ;; @@ -10,17 +10,23 @@ LIBS="$LEXLIB $LIBS" if test "$large_files" = "yes" ; then ## FreeBSD need no any special flags for 64bit files -@@ -328,14 +327,14 @@ +@@ -328,14 +327,20 @@ rel=`uname -r` case "$rel" in 4*) - CFLAGS="$CFLAGS -pthread" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS $PTHREAD_LIBS" ;; ++ 5.[012]*) ++ LIBS="$PTHREAD_LIBS $LEXLIB $LIBS" ++ ;; 5*) - LIBS="-lc_r $LEXLIB $LIBS" -+ LIBS="$PTHREAD_LIBS $LEXLIB $LIBS" ++ CFLAGS="$CFLAGS $PTHREAD_CFLAGS $PTHREAD_LIBS" ;; ++ 6*) ++ CFLAGS="$CFLAGS $PTHREAD_CFLAGS $PTHREAD_LIBS" ++ ;; *) - CFLAGS="$CFLAGS -pthread" - LIBS="-lc_r $LEXLIB $LIBS" @@ -29,7 +35,7 @@ ;; esac RPATH_OPTION="-rpath" -@@ -430,10 +429,10 @@ +@@ -430,10 +435,10 @@ esac if test "X$MYSQL_PATH" != "X" ; then |