summaryrefslogtreecommitdiff
path: root/www/mozilla/patches/patch-ab
blob: 1931cc24597735ed584551b2a4c1b5f3e85923db (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
$NetBSD: patch-ab,v 1.14 2000/12/15 08:23:46 martin Exp $

--- configure.in.orig	Sat Sep 30 23:16:13 2000
+++ configure.in	Wed Dec 13 10:11:27 2000
@@ -360,8 +360,6 @@
 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'
@@ -705,31 +703,26 @@
     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)'
+	MKSHLIB_FORCE_ALL='-Wl,--whole-archive'
+	MKSHLIB_UNFORCE_ALL='-Wl,--no-whole-archive'
     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'
+	MKSHLIB_FORCE_ALL=''
+	MKSHLIB_UNFORCE_ALL=''
+	# a.out ignores --no-whole-archive; using --whole-archive breaks link
     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
     if test "$LIBRUNPATH"; then
-	DSO_LDOPTS="-R$LIBRUNPATH $DSO_LDOPTS"
+	DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
     fi
     ;;
 
@@ -981,8 +974,6 @@
 
 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.
@@ -1195,12 +1186,6 @@
     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				   =
@@ -1691,13 +1676,6 @@
 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
@@ -2046,6 +2024,9 @@
 				CXXFLAGS="$CXXFLAGS -mt" 
 			fi
 			;;
+	*-*-netbsd*)
+		USE_PTHREADS=
+		_PTHREAD_LDFLAGS=
 	esac
 	AC_MSG_RESULT($ac_cv_have_dash_pthread)
 fi