Clean up netbsd section.
Thanks to martin@NetBSD.ORG (Martin Husemann) and taya@sm.sony.co.jp (Shin'ichiro TAYA) for the patch. Bug #61745 r=cls
This commit is contained in:
Родитель
181396975a
Коммит
356604f15b
51
configure.in
51
configure.in
|
@ -380,9 +380,6 @@ OBJ_SUFFIX=o
|
|||
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'
|
||||
|
@ -736,31 +733,18 @@ case "$target" in
|
|||
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
|
||||
DSO_LDOPTS='-shared -Wl,-soname,lib$(LIBRARY_NAME)$(DLL_SUFFIX)'
|
||||
BIN_FLAGS='-Wl,--export-dynamic'
|
||||
else
|
||||
DSO_PIC_CFLAGS='-fPIC -DPIC'
|
||||
DLL_SUFFIX=".so.1.0"
|
||||
DSO_LDOPTS='-x -shared'
|
||||
SHLIB_LDSTARTFILE=/usr/lib/c++rt0.o
|
||||
DSO_LDOPTS='-shared'
|
||||
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'
|
||||
case $OS_TEST in
|
||||
alpha)
|
||||
dnl NetBSD/alpha can't find a shared lib
|
||||
dnl (.so.1.0) unless there's a .so as well.
|
||||
NEED_BASE_DLL_NAME_ALSO=1
|
||||
;;
|
||||
*86)
|
||||
MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
|
||||
MKCSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
|
||||
;;
|
||||
esac
|
||||
# This will fail on a.out systems prior to 1.5.1_ALPHA.
|
||||
MKSHLIB_FORCE_ALL='-Wl,--whole-archive'
|
||||
MKSHLIB_UNFORCE_ALL='-Wl,--no-whole-archive'
|
||||
if test "$LIBRUNPATH"; then
|
||||
DSO_LDOPTS="-R$LIBRUNPATH $DSO_LDOPTS"
|
||||
DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
|
||||
fi
|
||||
;;
|
||||
|
||||
|
@ -1005,11 +989,6 @@ dnl the qsort routine under solaris is faulty
|
|||
|
||||
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.
|
||||
AC_DEFINE_UNQUOTED(D_INO,$DIRENT_INO)
|
||||
|
@ -1265,12 +1244,6 @@ 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 =
|
||||
|
@ -1776,13 +1749,6 @@ AC_SUBST(LIBIDL_LIBS)
|
|||
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
|
||||
|
@ -2176,6 +2142,9 @@ then
|
|||
CXXFLAGS="$CXXFLAGS -mt"
|
||||
fi
|
||||
;;
|
||||
*-*-netbsd*)
|
||||
USE_PTHREADS=
|
||||
_PTHREAD_LDFLAGS=
|
||||
esac
|
||||
fi
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче