Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated NetBSD section so that mozilla will build on NetBSD-current. Bug #41524 Thanks to Shin'ichiro TAYA <taya@sm.sony.co.jp> for the patch.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@73888 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cls%seawood.org 2000-07-08 11:39:05 +00:00
parent 1a16368373
commit e9f7740e5b
3 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/config/autoconf.mk.in
View File

@ -236,6 +236,8 @@ MKSHLIB_FORCE_ALL = @MKSHLIB_FORCE_ALL@
MKSHLIB_UNFORCE_ALL = @MKSHLIB_UNFORCE_ALL@
DSO_LDOPTS = @DSO_LDOPTS@
DLL_SUFFIX = @DLL_SUFFIX@
SHLIB_LDSTARTFILE = @SHLIB_LDSTARTFILE@
SHLIB_LDENDFILE = @SHLIB_LDENDFILE@
endif
NO_LD_ARCHIVE_FLAGS = @NO_LD_ARCHIVE_FLAGS@

2
mozilla/config/rules.mk
View File

@ -700,7 +700,7 @@ ifdef SHARED_LIBRARY_LIBS
@for lib in $(SHARED_LIBRARY_LIBS); do $(AR_EXTRACT) $${lib}; $(CLEANUP2); done
endif # SHARED_LIBRARY_LIBS
endif # NO_LD_ARCHIVE_FLAGS
$(MKSHLIB) $(OBJS) $(LOBJS) $(SUB_SHLOBJS) $(LDFLAGS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE)
$(MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(LOBJS) $(SUB_SHLOBJS) $(LDFLAGS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE)
@rm -f foodummyfilefoo $(SUB_SHLOBJS)
else
@touch no-such-file.vms; rm -f no-such-file.vms $(SUB_LOBJS)

36
mozilla/configure.in
View File

@ -344,6 +344,8 @@ LIB_SUFFIX=a
TARGET_MD_ARCH=unix
DIRENT_INO=d_ino
NEED_BASE_DLL_NAME_ALSO=
SHLIB_LDSTARTFILE=
SHLIB_LDENDFILE=
MOZ_JPEG_CFLAGS=
MOZ_JPEG_LIBS='-L$(DIST)/lib -ljpeg'
@ -682,11 +684,21 @@ case "$target" in
;;
*-netbsd*)
DLL_SUFFIX=".so.1.0"
DSO_CFLAGS=''
DSO_PIC_CFLAGS='-fPIC'
CFLAGS="$CFLAGS -Dunix"
CXXFLAGS="$CXXFLAGS -Dunix"
if $CC -E - -dM </dev/null | grep __ELF__ >/dev/null; then
DLL_SUFFIX=".so"
DSO_PIC_CFLAGS='-fPIC -DPIC'
DSO_LDOPTS='-x -shared -soname lib$(LIBRARY_NAME)$(DLL_SUFFIX)'
SHLIB_LDSTARTFILE=/usr/lib/crtbeginS.o
SHLIB_LDENDFILE=/usr/lib/crtendS.o
else
DSO_PIC_CFLAGS='-fPIC -DPIC'
DLL_SUFFIX=".so.1.0"
DSO_LDOPTS='-x -shared'
SHLIB_LDSTARTFILE=/usr/lib/c++rt0.o
fi
# At least for 1.3 and up, ld supports this, despite the test failing above.
MKSHLIB_FORCE_ALL='--whole-archive'
MKSHLIB_UNFORCE_ALL='--no-whole-archive'
@ -701,10 +713,6 @@ case "$target" in
MKCSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
;;
esac
dnl Test for a.out platform and handle C++ libraries correctly
if $CC -E - -dM </dev/null | grep -v __ELF__ >/dev/null; then
DSO_LDOPTS="-shared"
fi
if test "$LIBRUNPATH"; then
DSO_LDOPTS="-R$LIBRUNPATH $DSO_LDOPTS"
fi
@ -958,6 +966,8 @@ esac
dnl See above (netbsd)
AC_SUBST(NEED_BASE_DLL_NAME_ALSO)
AC_SUBST(SHLIB_LDSTARTFILE)
AC_SUBST(SHLIB_LDENDFILE)
dnl Only one oddball right now (QNX), but this gives us flexibility
dnl if any other platforms need to override this in the future.
@ -1167,6 +1177,12 @@ then
AM_PATH_GTK($GTK_VERSION,,
AC_MSG_ERROR(Test for GTK failed.))
case "$target" in
i386-*-netbsd*)
GTK_LIBS=`echo $GTK_LIBS | sed -e 's/-Wl,//g'`
;;
esac
dnl ========================================================
dnl = =
dnl = --with-java-supplement =
@ -1649,6 +1665,13 @@ fi
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
case "$target" in
i386-*-netbsd*)
GLIB_LIBS=`echo $GLIB_LIBS | sed -e 's/-Wl,//g'`
LIBIDL_LIBS=`echo $LIBIDL_LIBS | sed -e 's/-Wl,//g'`
;;
esac
dnl Checks for typedefs, structures, and compiler characteristics.
dnl ========================================================
AC_C_CONST
@ -2826,6 +2849,7 @@ case "$target" in
*-*-solaris*) MOZ_MONOLITHIC_TOOLKIT= ;;
*-openvms*) MOZ_MONOLITHIC_TOOLKIT= ;;
*-freebsd*) MOZ_MONOLITHIC_TOOLKIT= ;;
*-netbsd*) MOZ_MONOLITHIC_TOOLKIT= ;;
*-*-aix*) MOZ_MONOLITHIC_TOOLKIT= ;;
*-*-osf*) MOZ_MONOLITHIC_TOOLKIT= ;;
*-hpux11.*) MOZ_MONOLITHIC_TOOLKIT= ;;