diff options
| author | Jeremy Lea <reg@FreeBSD.org> | 2000-12-21 19:40:44 +0000 |
|---|---|---|
| committer | Jeremy Lea <reg@FreeBSD.org> | 2000-12-21 19:40:44 +0000 |
| commit | cd3604440efa805410fd57c1510b28e2539c7b29 (patch) | |
| tree | e61434256254222071162a9568bf7091f85b0b37 /www/mozilla-devel/files/patch-qt | |
| parent | Update to 001115. (diff) | |
Explictly link against libgcc_r, to work around bugs in 4.2-RELEASE onwards
and -CURRENT. I'm still not sure why the bug was exposed only recently, but
it is due to libstdc++ being linked without the -nostdlib option (causing it
to be statically linked against libgcc even for the threaded case).
Thanks to Andrew Bliznak <andrew@ort.lviv.net> for testing this.
Notes
Notes:
svn path=/head/; revision=36205
Diffstat (limited to 'www/mozilla-devel/files/patch-qt')
| -rw-r--r-- | www/mozilla-devel/files/patch-qt | 34 |
1 files changed, 26 insertions, 8 deletions
diff --git a/www/mozilla-devel/files/patch-qt b/www/mozilla-devel/files/patch-qt index b7964a4911ff..361bf6cbdd5d 100644 --- a/www/mozilla-devel/files/patch-qt +++ b/www/mozilla-devel/files/patch-qt @@ -1,21 +1,39 @@ ---- configure.orig Thu Apr 13 19:18:25 2000 -+++ configure Thu Apr 20 09:07:57 2000 -@@ -5618,7 +5618,7 @@ +--- configure.orig Sat Sep 30 23:16:14 2000 ++++ configure Thu Dec 21 00:49:23 2000 +@@ -5786,7 +5786,7 @@ echo $ac_n "checking for Qt insanity""... $ac_c" 1>&6 - echo "configure:5620: checking for Qt insanity" >&5 + echo "configure:5788: checking for Qt insanity" >&5 - QT_CFLAGS="-I${QTDIR}/include/qt" + QT_CFLAGS="-I${QTDIR}/include/X11/qt" QT_LIBS="-L/usr/X11R6/lib -L${QTDIR}/lib -lqt -lXext -lX11" # Check whether --with-static-qt or --without-static-qt was given. -@@ -7108,6 +7108,9 @@ - case "$target_os" in +@@ -7702,6 +7702,9 @@ os2*) LIBS= -+ ;; + ;; +freebsd*) + CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}" - ;; ++ ;; esac for ac_hdr in sys/byteorder.h compat.h getopt.h + do +@@ -8655,8 +8658,6 @@ + if test $? -eq 0; then + if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then + ac_cv_have_dash_pthread=yes +- CFLAGS="$CFLAGS -pthread" +- CXXFLAGS="$CXXFLAGS -pthread" + fi + fi + rm -f conftest* +@@ -8672,7 +8673,7 @@ + EOF + + if test "$ac_cv_have_dash_pthread" = "yes"; then +- _PTHREAD_LDFLAGS="" ++ _PTHREAD_LDFLAGS="-pthread -lgcc_r" + else + _PTHREAD_LDFLAGS="-lc_r" + fi |