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
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
|
NSPR does not know that gcc does work on AIX:
https://bugzilla.mozilla.org/show_bug.cgi?id=547991
--- ./mozilla/nsprpub/configure.in.orig 2010-02-23 14:36:55 +0100
+++ ./mozilla/nsprpub/configure.in 2010-02-23 14:37:08 +0100
@@ -871,8 +871,13 @@
AC_DEFINE(HAVE_FCNTL_FILE_LOCKING)
USE_IPV6=1
AIX_LINK_OPTS='-brtl -bnso -berok'
+ if test -n "$GNU_CC"; then
+ LD='$(CC)'
+ DSO_LDOPTS='-shared -Wl,-G,-bernotok,-bexpall,-blibpath:/usr/lib:/lib'
+ fi
;;
esac
+ test -z "$GNU_CC" &&
CFLAGS="$CFLAGS -qro -qroconst"
AIX_WRAP='$(DIST)/lib/aixwrap.o'
AIX_TMP='./_aix_tmp.o'
--- ./mozilla/nsprpub/configure.orig 2010-02-23 14:36:58 +0100
+++ ./mozilla/nsprpub/configure 2010-02-23 14:37:08 +0100
@@ -3099,8 +3099,13 @@
USE_IPV6=1
AIX_LINK_OPTS='-brtl -bnso -berok'
+ if test -n "$GNU_CC"; then
+ LD='$(CC)'
+ DSO_LDOPTS='-shared -Wl,-G,-bernotok,-bexpall,-blibpath:/usr/lib:/lib'
+ fi
;;
esac
+ test -z "$GNU_CC" &&
CFLAGS="$CFLAGS -qro -qroconst"
AIX_WRAP='$(DIST)/lib/aixwrap.o'
AIX_TMP='./_aix_tmp.o'
--- ./mozilla/nsprpub/lib/ds/Makefile.in.orig 2010-02-23 14:40:10 +0100
+++ ./mozilla/nsprpub/lib/ds/Makefile.in 2010-02-23 14:40:58 +0100
@@ -68,11 +68,19 @@
endif # WINNT
ifeq ($(OS_ARCH), AIX)
+ifndef NS_USE_GCC
ifeq ($(CLASSIC_NSPR),1)
OS_LIBS = -lc
else
OS_LIBS = -lc_r
endif
+else
+ifeq ($(CLASSIC_NSPR),1)
+OS_LIBS =
+else
+OS_LIBS = -pthread
+endif
+endif
endif
ifeq ($(OS_ARCH),IRIX)
--- ./mozilla/nsprpub/lib/libc/src/Makefile.in.orig 2010-02-23 14:45:41 +0100
+++ ./mozilla/nsprpub/lib/libc/src/Makefile.in 2010-02-23 14:47:58 +0100
@@ -77,11 +77,19 @@
endif # WINNT
ifeq ($(OS_ARCH), AIX)
+ifndef NS_USE_GCC
ifeq ($(CLASSIC_NSPR),1)
OS_LIBS = -lc
else
OS_LIBS = -lc_r
endif
+else
+ifeq ($(CLASSIC_NSPR),1)
+OS_LIBS =
+else
+OS_LIBS = -pthread
+endif
+endif
endif
ifeq ($(OS_ARCH),IRIX)
--- ./mozilla/nsprpub/pr/src/Makefile.in.orig 2010-02-23 14:37:04 +0100
+++ ./mozilla/nsprpub/pr/src/Makefile.in 2010-02-23 14:52:16 +0100
@@ -110,19 +110,29 @@
endif
ifeq ($(OS_ARCH),AIX)
+ifndef NS_USE_GCC
DSO_LDOPTS += -binitfini::_PR_Fini
+endif
OS_LIBS = -lodm -lcfg
ifeq ($(CLASSIC_NSPR),1)
ifeq ($(OS_RELEASE),4.1)
OS_LIBS += -lsvld -lc
else
+ifndef NS_USE_GCC
OS_LIBS += -ldl -lc
+else
+OS_LIBS += -ldl
+endif
endif
else
ifeq ($(OS_RELEASE),4.1)
OS_LIBS += -lpthreads -lsvld -lC_r -lC -lc_r -lm /usr/lib/libc.a
else
+ifndef NS_USE_GCC
OS_LIBS += -lpthreads -ldl -lC_r -lC -lc_r -lm /usr/lib/libc.a
+else
+OS_LIBS += -pthread -ldl -lm
+endif
endif
endif
endif
--- mozilla/nsprpub/pr/tests/Makefile.in.orig 2010-02-23 15:14:03 +0100
+++ mozilla/nsprpub/pr/tests/Makefile.in 2010-02-23 15:17:58 +0100
@@ -341,9 +341,17 @@
# AIX
ifeq ($(OS_ARCH),AIX)
+ ifndef NS_USE_GCC
LDOPTS += -blibpath:$(ABSOLUTE_LIB_DIR):/usr/lib:/lib
+ else
+ LDOPTS += -Wl,-blibpath:$(ABSOLUTE_LIB_DIR):/usr/lib:/lib
+ endif
ifneq ($(OS_ARCH)$(OS_RELEASE),AIX4.1)
+ ifndef NS_USE_GCC
LDOPTS += -brtl
+ else
+ LDOPTS += -Wl,-brtl
+ endif
EXTRA_LIBS = -ldl
endif
endif
--- mozilla/nsprpub/lib/tests/Makefile.in.orig 2010-02-23 15:35:37 +0100
+++ mozilla/nsprpub/lib/tests/Makefile.in 2010-02-23 15:35:37 +0100
@@ -127,7 +127,11 @@
# AIX
ifeq ($(OS_ARCH),AIX)
+ifndef NS_USE_GCC
LDOPTS += -blibpath:$(PWD)/$(dist_libdir):/usr/lib:/lib
+else
+LDOPTS += -Wl,-blibpath:$(PWD)/$(dist_libdir):/usr/lib:/lib
+endif
LIBPR = -lnspr$(MOD_MAJOR_VERSION)_shr
LIBPLC = -lplc$(MOD_MAJOR_VERSION)_shr
endif
|
GitWeb