Date: Thu, 24 Sep 1998 03:27:13 +0200 From: Jeremy Lea <reg@shale.csir.co.za> To: mozilla@FreeBSD.ORG Subject: Happy... Message-ID: <19980924032713.A23665@shale.csir.co.za>
index | next in thread | raw e-mail
mozilla > ll moz*
-rwxr-xr-x 1 mozilla users 1064692 Sep 24 02:57 moz-export
-rwxr-xr-x 1 mozilla users 5804714 Sep 24 02:57 mozilla-export
-rw-r--r-- 1 mozilla users 58524 Sep 24 02:55 mozilla.o
mozilla > file moz-export
moz-export: ELF 32-bit LSB executable, Intel 80386, version 1 (FreeBSD), dynamically linked, not stripped
mozilla > ldd moz-export
moz-export:
libxfe2.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libxfe2.so (0x2811e000)
libXmL.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libXmL.so (0x281f0000)
libxfeicons.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libxfeicons.so (0x2821a000)
libDtWidgets.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libDtWidgets.so (0x28265000)
libXfeBm.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libXfeBm.so (0x2826d000)
libXfeToolBar.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libXfeToolBar.so (0x28272000)
libXfeWidgets.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libXfeWidgets.so (0x28282000)
libxlate.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libxlate.so (0x282a9000)
libmimetype.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libmimetype.so (0x282bd000)
libnetcache.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libnetcache.so (0x282c3000)
libnetcnvts.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libnetcnvts.so (0x282d1000)
libnetwork.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libnetwork.so (0x282da000)
libnetutil.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libnetutil.so (0x28303000)
libcnetinit.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libcnetinit.so (0x28306000)
libabouturl.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libabouturl.so (0x28308000)
libdataurl.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libdataurl.so (0x2830d000)
libfileurl.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libfileurl.so (0x2830f000)
libftpurl.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libftpurl.so (0x28314000)
libgophurl.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libgophurl.so (0x2831d000)
libhttpurl.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libhttpurl.so (0x28321000)
libjsurl.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libjsurl.so (0x28333000)
libmarimurl.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libmarimurl.so (0x28336000)
libremoturl.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libremoturl.so (0x28338000)
librdf.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/librdf.so (0x2833a000)
libxml.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libxml.so (0x28367000)
liblay.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/liblay.so (0x2837f000)
libpng.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libpng.so (0x28450000)
libmariner.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libmariner.so (0x28464000)
libimg.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libimg.so (0x28466000)
libprivacy.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libprivacy.so (0x2847c000)
libjpeg.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libjpeg.so (0x2847f000)
libhook.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libhook.so (0x2848f000)
libparse.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libparse.so (0x2849b000)
libpref.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libpref.so (0x284a5000)
libi18n.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libi18n.so (0x284b5000)
libpics.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libpics.so (0x28538000)
libpwcac.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libpwcac.so (0x28544000)
libreg.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libreg.so (0x28547000)
libmime.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libmime.so (0x28550000)
libmisc.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libmisc.so (0x2856c000)
libprgrss.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libprgrss.so (0x28575000)
libplug.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libplug.so (0x28578000)
libutil.so => /usr/lib/libutil.so (0x28589000)
libfont.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libfont.so (0x28591000)
liblayer.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/liblayer.so (0x285a2000)
liboji.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/liboji.so (0x285aa000)
libstubsj.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libstubsj.so (0x285b1000)
libstubnj.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libstubnj.so (0x285b3000)
libmocha.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libmocha.so (0x285b6000)
libstyle.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libstyle.so (0x285ec000)
libhtmldlgs.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libhtmldlgs.so (0x28612000)
libsecfree.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libsecfree.so (0x28617000)
libxp.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libxp.so (0x2861a000)
libdbm.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libdbm.so (0x2867e000)
libcaps.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libcaps.so (0x28686000)
libxpcom.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libxpcom.so (0x286a1000)
libplds21.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libplds21.so (0x286a8000)
libplc21.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libplc21.so (0x286ac000)
libmsgc21.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libmsgc21.so (0x286b0000)
libnspr21.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libnspr21.so (0x286b8000)
libzlib.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libzlib.so (0x286df000)
libjs.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libjs.so (0x286ea000)
libjsj.so => /usr/home/mozilla/mozilla/dist/FreeBSD3.0_OPT.OBJ/bin/libjsj.so (0x28733000)
libXm.so.1 => /usr/X11R6/lib/libXm.so.1 (0x28746000)
libXt.so.6 => /usr/X11R6/lib/libXt.so.6 (0x28842000)
libXmu.so.6 => /usr/X11R6/lib/libXmu.so.6 (0x28880000)
libXext.so.6 => /usr/X11R6/lib/libXext.so.6 (0x28891000)
libX11.so.6 => /usr/X11R6/lib/libX11.so.6 (0x2889b000)
libSM.so.6 => /usr/X11R6/lib/libSM.so.6 (0x28930000)
libICE.so.6 => /usr/X11R6/lib/libICE.so.6 (0x28938000)
libg++.so.4 => /usr/lib/libg++.so.4 (0x2894c000)
libstdc++.so.2 => /usr/lib/libstdc++.so.2 (0x28989000)
libm.so.2 => /usr/lib/libm.so.2 (0x289c0000)
libc.so.3 => /usr/lib/libc.so.3 (0x289da000)
And it works... (Well kinda).
Patches below. Against fresh tree. With LessTif. Bedtime.
Regards,
-Jeremy
--
| "I could be anything I wanted to, but one things true
--+-- Never gonna be as big as Jesus, never gonna hold the world in my hand
| Never gonna be as big as Jesus, never gonna build a promised land
| But that's, that's all right, OK with me..." -Audio Adrenaline
--- nsprpub/pr/include/private/primpl.h.orig Fri Sep 18 12:28:27 1998
+++ nsprpub/pr/include/private/primpl.h Wed Sep 23 16:17:27 1998
@@ -1471,6 +1471,7 @@
&& (!defined(HPUX) || !defined(_PR_PTHREADS)) \
&& (!defined(IRIX) || !defined(_PR_PTHREADS)) \
&& (!defined(LINUX) || !defined(_PR_PTHREADS)) \
+ && (!defined(FREEBSD) || !defined(_PR_PTHREADS)) \
&& (!defined(RHAPSODY)) \
&& !defined(PURIFY) \
&& !(defined (UNIXWARE) && defined (USE_SVR4_THREADS))
--- cmd/xfe/Makefile.orig Fri Sep 18 12:25:39 1998
+++ cmd/xfe/Makefile Thu Sep 24 01:13:00 1998
@@ -745,7 +745,7 @@
########################################
# FreeBSD
ifeq ($(OS_ARCH),FreeBSD)
-OTHER_LIBS = /usr/X11R6/lib/libXm.a -L/usr/X11R6/lib -lXt -lXmu -lXext -lX11 -lSM -lICE -lm $(OS_LIBS)
+OTHER_LIBS = $(MOTIFLIB) -L/usr/X11R6/lib -lXt -lXmu -lXext -lX11 -lSM -lICE -lm $(OS_LIBS)
endif
########################################
*** cmd/xfe/intl/freebsd.lm.orig Tue Aug 11 18:09:07 1998
--- cmd/xfe/intl/freebsd.lm Tue Aug 11 18:09:07 1998
***************
*** 0 ****
--- 1,43 ----
+
+ ! This table maps the host's locale names to MIME charsets
+ !
+ *localeCharset*C: iso-8859-1
+ *localeCharset*ASCII: us-ascii
+ *localeCharset*US-ASCII: us-ascii
+ *localeCharset*da_DK.ISO_8859-1: iso-8859-1
+ *localeCharset*de_AT.ISO_8859-1: iso-8859-1
+ *localeCharset*de_CH.ISO_8859-1: iso-8859-1
+ *localeCharset*de_DE.ISO_8859-1: iso-8859-1
+ *localeCharset*en_AU.ISO_8859-1: iso-8859-1
+ *localeCharset*en_CA.ISO_8859-1: iso-8859-1
+ *localeCharset*en_GB.ISO_8859-1: iso-8859-1
+ *localeCharset*en_US.ISO_8859-1: iso-8859-1
+ *localeCharset*es_ES.ISO_8859-1: iso-8859-1
+ *localeCharset*fi_FI.ISO_8859-1: iso-8859-1
+ *localeCharset*fr_BE.ISO_8859-1: iso-8859-1
+ *localeCharset*fr_CA.ISO_8859-1: iso-8859-1
+ *localeCharset*fr_CH.ISO_8859-1: iso-8859-1
+ *localeCharset*fr_FR.ISO_8859-1: iso-8859-1
+ *localeCharset*hr_HR.ISO_8859-2: iso-8859-2
+ *localeCharset*hu_HU.ISO_8859-2: iso-8859-2
+ *localeCharset*is_IS.ISO_8859-1: iso-8859-1
+ *localeCharset*it_IT.ISO_8859-1: iso-8859-1
+ *localeCharset*ja_JP.SJIS: x-sjis
+ *localeCharset*ja_JP.EUC: x-euc-jp
+ *localeCharset*ko_KR.EUC: euc-kr
+ *localeCharset*lt_LN.ASCII: us-ascii
+ *localeCharset*lt_LN.ISO_8859-1: iso-8859-1
+ *localeCharset*lt_LN.ISO_8859-2: iso-8859-2
+ *localeCharset*nl_BE.ISO_8859-1: iso-8859-1
+ *localeCharset*nl_NL.ISO_8859-1: iso-8859-1
+ *localeCharset*no_NO.ISO_8859-1: iso-8859-1
+ *localeCharset*pl_PL.ISO_8859-2: iso-8859-2
+ *localeCharset*pt_PT.ISO_8859-1: iso-8859-1
+ *localeCharset*ru_RU.CP866: cp866
+ *localeCharset*ru_SU.CP866: cp866
+ *localeCharset*ru_RU.KOI8-R: koi8-r
+ *localeCharset*ru_SU.KOI8-R: koi8-r
+ *localeCharset*sl_SI.ISO_8859-2: iso-8859-2
+ *localeCharset*sv_SE.ISO_8859-1: iso-8859-1
+
+
--- config/FreeBSD.mk.orig Wed Sep 9 22:37:33 1998
+++ config/FreeBSD.mk Thu Sep 24 00:42:54 1998
@@ -27,20 +27,22 @@
CPU_ARCH := x86
GFX_ARCH := x
+MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout)
+
OS_INCLUDES = -I/usr/X11R6/include
G++INCLUDES = -I/usr/include/g++
LOC_LIB_DIR =
MOTIF =
-MOTIFLIB =
+MOTIFLIB = -lXm
OS_LIBS =
# Don't define BSD, because it's already defined in /usr/include/sys/param.h.
-PLATFORM_FLAGS = -DFREEBSD -DBSDI -DBSDI_2 -D__386BSD__ -Di386 $(DSO_CFLAGS)
+PLATFORM_FLAGS = -DFREEBSD -mno-486 -Di386 -Wall -pipe $(DSO_CFLAGS)
MOVEMAIL_FLAGS = -DHAVE_STRERROR
-PORT_FLAGS = -DSW_THREADS -DNEED_UINT -DHAVE_LCHOWN -DNTOHL_ENDIAN_H -DHAVE_FILIO_H -DNEED_SYS_TIME_H -DNEED_UINT_T -DHAVE_BSD_FLOCK -DHAVE_SYSERRLIST -DHAVE_SNPRINTF
+PORT_FLAGS = -DNEED_UINT -DHAVE_LCHOWN -DNTOHL_ENDIAN_H -DHAVE_FILIO_H -DNEED_UINT_T -DHAVE_BSD_FLOCK -DHAVE_SYSERRLIST -DHAVE_SNPRINTF
PDJAVA_FLAGS = -mx128m
OS_GPROF_FLAGS = -pg
-LD_FLAGS = -L/usr/X11R6/lib -lXm
+LD_FLAGS = -L/usr/X11R6/lib
ifdef USE_AUTOCONF
OS_CFLAGS =
@@ -48,16 +50,13 @@
OS_CFLAGS = $(PLATFORM_FLAGS) $(PORT_FLAGS) $(MOVEMAIL_FLAGS)
endif
-LOCALE_MAP = $(DEPTH)/cmd/xfe/intl/bsd386.lm
+LOCALE_MAP = $(DEPTH)/cmd/xfe/intl/freebsd.lm
EN_LOCALE = C
-DE_LOCALE = de_DE.ISO8859-1
-FR_LOCALE = fr_FR.ISO8859-1
-JP_LOCALE = ja
+DE_LOCALE = de_DE.ISO_8859-1
+FR_LOCALE = fr_FR.ISO_8859-1
+JP_LOCALE = ja_JP.EUC
SJIS_LOCALE = ja_JP.SJIS
KR_LOCALE = ko_KR.EUC
-CN_LOCALE = zh
-TW_LOCALE = zh
-I2_LOCALE = i2
######################################################################
# Version-specific stuff
@@ -67,7 +66,11 @@
# Overrides for defaults in config.mk (or wherever)
######################################################################
+ifeq ($(MOZ_OBJFORMAT),elf)
+DLL_SUFFIX = so
+else
DLL_SUFFIX = so.1.0
+endif
EMACS = /usr/bin/true
JAVA_PROG = $(JAVA_BIN)java
RANLIB = /usr/bin/ranlib
@@ -77,17 +80,17 @@
######################################################################
ifeq ($(USE_PTHREADS),1)
-OS_LIBS = -lc_r
-PORT_FLAGS += -D_PR_NEED_FAKE_POLL
+OS_LIBS = -pthread
+PORT_FLAGS += -D_THREAD_SAFE -D_PR_NEED_FAKE_POLL
else
-OS_LIBS = -lc
-PORT_FLAGS += -D_PR_LOCAL_THREADS_ONLY
+OS_LIBS =
+PORT_FLAGS += -DSW_THREADS -D_PR_LOCAL_THREADS_ONLY
endif
BUILD_UNIX_PLUGINS = 1
MKSHLIB = $(LD) $(DSO_LDOPTS)
-DSO_CFLAGS = -fpic
+DSO_CFLAGS = -fPIC
DSO_LDFLAGS =
-DSO_LDOPTS = -Bshareable
+DSO_LDOPTS = -Bshareable -soname $(@:$(OBJDIR)/%.$(DLL_SUFFIX)=%.$(DLL_SUFFIX))
--- config/rules.mk.orig Wed Sep 23 23:29:29 1998
+++ config/rules.mk Wed Sep 23 23:42:54 1998
@@ -112,9 +112,6 @@
ifeq ($(OS_ARCH),HP-UX)
SHARED_LIBRARY := $(LIBRARY:.a=.sl)
else
-ifneq (,$(filter FreeBSD NetBSD OpenBSD,$(OS_ARCH)))
-SHARED_LIBRARY := $(LIBRARY:.a=.so.1.0)
-else
ifeq ($(OS_ARCH)$(OS_RELEASE),SunOS4.1)
SHARED_LIBRARY := $(LIBRARY:.a=.so.1.0)
else
@@ -122,7 +119,6 @@
SHARED_LIBRARY := $(LIBRARY:.a=)_shr.a
else
SHARED_LIBRARY := $(LIBRARY:.a=.$(DLL_SUFFIX))
-endif
endif
endif
endif
--- cmd/xfe/src/context_funcs.cpp.orig Fri Sep 4 17:12:30 1998
+++ cmd/xfe/src/context_funcs.cpp Fri Sep 4 17:16:17 1998
@@ -74,13 +74,7 @@
#include <sys/vfs.h> /* for statfs() */
extern "C" int statfs(char *, struct statfs *);
#define STATFS statfs
-#elif defined(BSDI)
-#include <sys/mount.h> /* for statfs() */
-#define STATFS statfs
-#elif defined(NETBSD)
-#include <sys/mount.h> /* for statfs() */
-#define STATFS statfs
-#elif defined(OPENBSD)
+#elif defined(BSD)
#include <sys/mount.h> /* for statfs() */
#define STATFS statfs
#else
--- nsprpub/config/FreeBSD.mk.orig Wed Sep 9 23:24:58 1998
+++ nsprpub/config/FreeBSD.mk Thu Sep 24 00:44:49 1998
@@ -31,24 +31,29 @@
ifdef USE_AUTOCONF
OS_CFLAGS = $(DSO_CFLAGS)
else
-OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK -D_PR_NEED_POLL
+OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
endif
ifeq ($(USE_PTHREADS),1)
-OS_LIBS = -lc_r
-# XXX probably should define _THREAD_SAFE too.
-DEFINES += -D_PR_NEED_FAKE_POLL
+OS_LIBS = -pthread
+DEFINES += -D_THREAD_SAFE -D_PR_NEED_FAKE_POLL
else
-OS_LIBS = -lc
+OS_LIBS =
DEFINES += -D_PR_LOCAL_THREADS_ONLY
endif
ARCH = freebsd
+MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout)
+
+ifeq ($(MOZ_OBJFORMAT),elf)
+DLL_SUFFIX = so
+else
DLL_SUFFIX = so.1.0
+endif
DSO_CFLAGS = -fPIC
-DSO_LDOPTS = -Bshareable
+DSO_LDOPTS = -Bshareable -soname $(@:$(OBJDIR)/%.$(DLL_SUFFIX)=%.$(DLL_SUFFIX))
DSO_LDFLAGS =
MKSHLIB = $(LD) $(DSO_LDOPTS)
--- modules/libfont/src/Makefile.orig Wed Aug 26 15:18:24 1998
+++ modules/libfont/src/Makefile Wed Aug 26 15:18:51 1998
@@ -56,6 +56,8 @@
JMC_GEN = Mcf Mcfb Mcfmi Mcrc Mcdoer
JMC_GEN_FLAGS = -cimpl
+GARBAGE += M*.c
+
include $(DEPTH)/config/rules.mk
INCLUDES += -I.
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-mozilla" in the body of the message
home |
help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19980924032713.A23665>