Date: Thu, 21 Dec 2000 03:13:51 -0800 From: Jeremy Lea <reg@FreeBSD.ORG> To: Peter Schultz <pete@jocose.org> Cc: Andrew Bliznak <andrew@ort.lviv.net>, pete collins <petejc@collab.net>, mozilla@FreeBSD.ORG Subject: Re: mozilla on 5.0-current Message-ID: <20001221031351.T79112@shale.csir.co.za> In-Reply-To: <20001220110618.A17377@jocose.org>; from pete@jocose.org on Wed, Dec 20, 2000 at 11:06:18AM -0600 References: <3A40B3A9.DF71867F@collab.net> <Pine.LNX.4.30.0012201829550.14446-100000@ort.lviv.net> <20001220110618.A17377@jocose.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Hi,
On Wed, Dec 20, 2000 at 11:06:18AM -0600, Peter Schultz wrote:
[a bunch of stuff]
Can you try the attached patch for me please (without any other local
patches obviously... ;-)
Regards,
-Jeremy
--
FreeBSD - Because the best things in life are free...
http://www.freebsd.org/
www/mozilla:
Maintainer: reg@FreeBSD.org
Changes: Makefile files/patch-mi files/patch-qt
Adds : files/patch-an
Removes:
--- /usr/ports.ref/www/mozilla/Makefile Sun Nov 5 23:43:25 2000
+++ www/mozilla/Makefile Thu Dec 21 01:13:18 2000
@@ -49,7 +49,7 @@
--with-jpeg=${LOCALBASE} \
--with-png=${LOCALBASE}
MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin \
- CC_ONLY_FLAGS="${FLAGS}" CCC_ONLY_FLAGS="${CXXFLAGS}"
+ CC_ONLY_FLAGS="${CFLAGS}" CCC_ONLY_FLAGS="${CXXFLAGS}"
post-build:
@${SED} -e "s;@PREFIX@;${PREFIX};g" \
--- /usr/ports.ref/www/mozilla/files/patch-an Wed Dec 31 16:00:00 1969
+++ www/mozilla/files/patch-an Thu Dec 21 01:24:12 2000
@@ -0,0 +1,11 @@
+--- js/src/Makefile.in.orig Thu Dec 21 01:23:12 2000
++++ js/src/Makefile.in Thu Dec 21 01:23:22 2000
+@@ -218,7 +218,7 @@
+ endif
+
+ ifeq ($(OS_ARCH),FreeBSD)
+-LDFLAGS += -pthread
++LDFLAGS += -pthread -lgcc_r
+ endif
+ ifeq ($(OS_ARCH),IRIX)
+ ifdef USE_N32
--- /usr/ports.ref/www/mozilla/files/patch-mi Thu Feb 3 23:45:34 2000
+++ www/mozilla/files/patch-mi Thu Dec 21 01:17:09 2000
@@ -1,13 +1,13 @@
--- nsprpub/config/FreeBSD.mk.orig Wed Oct 20 14:19:53 1999
-+++ nsprpub/config/FreeBSD.mk Thu Feb 3 03:48:20 2000
-@@ -21,14 +21,16 @@
++++ nsprpub/config/FreeBSD.mk Thu Dec 21 01:16:34 2000
+@@ -21,24 +21,26 @@
include $(MOD_DEPTH)/config/UNIX.mk
-CC = gcc
-CCC = g++
RANLIB = ranlib
-+CCC = ${CXX}
++CCC = ${CXX}
+
+# During FreeBSD port build, CFLAGS contains all of the optimizations
+# flags desired...
@@ -20,3 +20,16 @@
CPU_ARCH = x86
endif
CPU_ARCH_TAG = _$(CPU_ARCH)
+
+-OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe $(THREAD_FLAG) -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
++OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
+
+ ifeq ($(USE_PTHREADS),1)
+ IMPL_STRATEGY = _PTH
+-DEFINES += -D_THREAD_SAFE
+-THREAD_FLAG += -pthread
++DEFINES += -D_THREAD_SAFE -D_REENTRANT
++DSO_LDOPTS += -pthread -lgcc_r
+ else
+ IMPL_STRATEGY = _EMU
+ DEFINES += -D_PR_LOCAL_THREADS_ONLY
--- /usr/ports.ref/www/mozilla/files/patch-qt Thu Apr 20 19:36:51 2000
+++ www/mozilla/files/patch-qt Thu Dec 21 01:10:51 2000
@@ -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
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-mozilla" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20001221031351.T79112>