1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00

- Unbreak on 4.x: pass threading library to linker

PR:		ports/68654 (based on)
Submitted by:	Carl Makin <carl@stagecraft.cx> (maintainer)
This commit is contained in:
Pav Lucistnik 2004-07-05 15:14:00 +00:00
parent 170b76e0f6
commit cd81526d9a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=112964
2 changed files with 13 additions and 10 deletions

View File

@ -26,10 +26,4 @@ CONFIGURE_ARGS= --with-Qt-dir=${X11BASE} CXX="g++ ${PTHREAD_CFLAGS}" \
USE_GMAKE= yes
USE_BZIP2= yes
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500000
BROKEN= "Configure fails on 4.x"
.endif
.include <bsd.port.post.mk>
.include <bsd.port.mk>

View File

@ -1,11 +1,20 @@
--- configure.orig Sat Jun 7 11:05:07 2003
+++ configure Sat Jun 7 11:08:01 2003
--- configure.orig Thu Jan 30 22:25:15 2003
+++ configure Mon Jul 5 13:03:08 2004
@@ -3714,7 +3714,7 @@
bnv_qt_lib="`ls $bnv_qt_lib_dir/libqt* | sed -n 1p |
sed s@$bnv_qt_lib_dir/lib@@ | sed s@[.].*@@`"
fi
- bnv_qt_LIBS="-L$bnv_qt_lib_dir -l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
+ bnv_qt_LIBS="$LIBS -L$bnv_qt_lib_dir -l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
else
# Use cached value or do search, starting with suggestions from
# the command line
@@ -4172,7 +4172,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
- bnv_err_4=`grep -v '^ *+' bnv_qt_test_4.out`
+ bnv_err_4=`grep -v '^ *+' bnv_qt_test_4.out | grep -vi warning:`
+ bnv_err_4=`grep -v '^ *+' bnv_qt_test_4.out | grep -vi warning`
if test x"$bnv_err_4" != x; then
echo "$bnv_err_4" >&5
else