diff options
| author | Pietro Cerutti <gahr@FreeBSD.org> | 2013-02-07 12:37:48 +0000 |
|---|---|---|
| committer | Pietro Cerutti <gahr@FreeBSD.org> | 2013-02-07 12:37:48 +0000 |
| commit | 2ad92eab941d8bd35f72240b5b91c4b980c9f370 (patch) | |
| tree | 4a9b0f7a86a869936906241e211d87ca2346121e /www/oops | |
| parent | 48c300ed7fb454f7a0142586e99a5bd9dcb7b135 (diff) | |
- Get rid of PTHREAD_CFLAGS and PTHREAD_LIBS (category: www)
Approved by: portmgr
Notes
Notes:
svn path=/head/; revision=311829
Diffstat (limited to 'www/oops')
| -rw-r--r-- | www/oops/Makefile | 2 | ||||
| -rw-r--r-- | www/oops/files/patch-configure.in | 30 |
2 files changed, 13 insertions, 19 deletions
diff --git a/www/oops/Makefile b/www/oops/Makefile index 8b45b710e0fa..e8b7135724f5 100644 --- a/www/oops/Makefile +++ b/www/oops/Makefile @@ -28,8 +28,6 @@ CONFIGURE_ARGS?=--sbindir=${PREFIX}/sbin \ --enable-oops-user=${USERS} \ --enable-large-files \ --with-regexp=system -CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" CFLAGS+= -fPIC CXXFLAGS+= -fPIC diff --git a/www/oops/files/patch-configure.in b/www/oops/files/patch-configure.in index af956942be20..d91ba7565be9 100644 --- a/www/oops/files/patch-configure.in +++ b/www/oops/files/patch-configure.in @@ -1,30 +1,26 @@ --- configure.in.orig 2004-11-23 08:20:04.000000000 +0300 +++ configure.in 2012-02-02 20:33:20.000000000 +0400 -@@ -328,14 +327,17 @@ - rel=`uname -r` - case "$rel" in - 4*) +@@ -325,19 +325,7 @@ + if test "X$LIBGB_NAME" != "X" ; then + LIBGB_NAME="$LIBGB_NAME -lstdc++" + fi +- rel=`uname -r` +- case "$rel" in +- 4*) - CFLAGS="$CFLAGS -pthread" - ;; - 5*) - LIBS="-lc_r $LEXLIB $LIBS" -+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS $PTHREAD_LIBS" - ;; +- ;; - *) - CFLAGS="$CFLAGS -pthread" - LIBS="-lc_r $LEXLIB $LIBS" -+ 5.[[012]]*) -+ LIBS="$PTHREAD_LIBS $LEXLIB $LIBS" -+ ;; -+ [[56789]]*) -+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS $PTHREAD_LIBS" -+ ;; -+ *) -+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -+ LIBS="$PTHREAD_LIBS $LEXLIB $LIBS" - ;; - esac +- ;; +- esac ++ LIBS="-lpthread $LEXLIB $LIBS" RPATH_OPTION="-rpath" + ;; + bsdi*) CFLAGS="$CFLAGS -pthread -DBSDOS" @@ -430,10 +432,10 @@ esac |