Attempt to fix build on amd64. [1]
Also fix build problem with MySQL support. [2] Correct use PTHREAD_[CFLAGS|LIBS]. Bump PORTREVISION. [1] Notify from: kris via bento [2] Submitted by: Sergey Mokryshev <mokr@mokr.net>
This commit is contained in:
parent
c0215b5087
commit
017e891a43
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=100760
2 changed files with 46 additions and 7 deletions
|
@ -7,7 +7,7 @@
|
|||
|
||||
PORTNAME= oops
|
||||
PORTVERSION= ${OOPSVERSION}
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= www
|
||||
MASTER_SITES= http://oops-cache.org/
|
||||
DISTNAME= ${PORTNAME}-${OOPSVERSION}
|
||||
|
@ -20,7 +20,6 @@ BUILD_DEPENDS+= gawk:${PORTSDIR}/lang/gawk
|
|||
OOPSVERSION= 1.5.23
|
||||
|
||||
USE_SUBMAKE= yes
|
||||
USE_REINPLACE= yes
|
||||
USE_AUTOCONF= yes
|
||||
CONFIGURE_ARGS?=--sbindir=${PREFIX}/sbin \
|
||||
--sysconfdir=${PREFIX}/etc/oops \
|
||||
|
@ -28,7 +27,8 @@ CONFIGURE_ARGS?=--sbindir=${PREFIX}/sbin \
|
|||
--libdir=${PREFIX}/libexec/oops \
|
||||
--enable-oops-user=oops \
|
||||
--enable-large-files
|
||||
MAKE_ENV+= CXX="${CXX}" \
|
||||
CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fPIC" \
|
||||
CXXFLAGS="${CXXFLAGS} -fPIC" \
|
||||
PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
|
||||
PTHREAD_LIBS="${PTHREAD_LIBS}"
|
||||
|
||||
|
@ -46,10 +46,6 @@ pre-fetch:
|
|||
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
|
||||
.endif
|
||||
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} -e 's|CXX=g++||g' \
|
||||
${WRKSRC}/configure.in
|
||||
|
||||
pre-configure:
|
||||
@cd ${WRKSRC} && ${AUTOHEADER}
|
||||
|
||||
|
|
43
www/oops/files/patch-configure.in
Normal file
43
www/oops/files/patch-configure.in
Normal file
|
@ -0,0 +1,43 @@
|
|||
--- configure.in.orig Thu Feb 12 13:38:59 2004
|
||||
+++ configure.in Thu Feb 12 13:44:17 2004
|
||||
@@ -315,7 +315,6 @@
|
||||
|
||||
;;
|
||||
freebsd*) CFLAGS="$CFLAGS -D_REENTRANT -DFREEBSD -D_THREAD_SAFE -DFD_SETSIZE=2048 -I."
|
||||
- CXX=g++
|
||||
CXXSOFLAGS="-shared -Xlinker -Bstatic"
|
||||
LIBS="$LEXLIB $LIBS"
|
||||
if test "$large_files" = "yes" ; then
|
||||
@@ -328,14 +327,14 @@
|
||||
rel=`uname -r`
|
||||
case "$rel" in
|
||||
4*)
|
||||
- CFLAGS="$CFLAGS -pthread"
|
||||
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS $PTHREAD_LIBS"
|
||||
;;
|
||||
5*)
|
||||
- LIBS="-lc_r $LEXLIB $LIBS"
|
||||
+ LIBS="$PTHREAD_LIBS $LEXLIB $LIBS"
|
||||
;;
|
||||
*)
|
||||
- CFLAGS="$CFLAGS -pthread"
|
||||
- LIBS="-lc_r $LEXLIB $LIBS"
|
||||
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
|
||||
+ LIBS="$PTHREAD_LIBS $LEXLIB $LIBS"
|
||||
;;
|
||||
esac
|
||||
RPATH_OPTION="-rpath"
|
||||
@@ -430,10 +429,10 @@
|
||||
esac
|
||||
|
||||
if test "X$MYSQL_PATH" != "X" ; then
|
||||
- LIBS="-L$MYSQL_PATH/lib -lmysqlclient $LIBS"
|
||||
+ LIBS="-L$MYSQL_PATH/lib/mysql -lmysqlclient $LIBS"
|
||||
AC_DEFINE(HAVE_MYSQL)
|
||||
- CFLAGS="$CFLAGS -I$MYSQL_PATH/include"
|
||||
- MYSQL_LIB="-L$MYSQL_PATH/lib -lmysqlclient"
|
||||
+ CFLAGS="$CFLAGS -I$MYSQL_PATH/include/mysql"
|
||||
+ MYSQL_LIB="-L$MYSQL_PATH/lib/mysql -lmysqlclient"
|
||||
fi
|
||||
|
||||
if test "X$PGSQL_PATH" != "X" ; then
|
Loading…
Reference in a new issue