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
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
|
--- moz/seamonkey-source-1.1.14.patch.orig 2009-08-05 06:24:32.000000000 +0900
+++ moz/seamonkey-source-1.1.14.patch 2009-08-05 12:23:12.000000000 +0900
@@ -12,6 +12,7 @@
do
if test -f "$_config"; then
echo "$_config";
+
--- misc/mozilla/build/cygwin-wrapper 2004-08-19 01:18:55.000000000 +0200
+++ misc/build/mozilla/build/cygwin-wrapper 2008-08-14 16:22:21.000000000 +0200
@@ -1,4 +1,4 @@
@@ -86,7 +87,7 @@
PYTHON = @MOZ_PYTHON@
--- misc/mozilla/config/config.mk 2008-01-29 20:30:22.000000000 +0100
+++ misc/build/mozilla/config/config.mk 2008-08-14 16:22:21.000000000 +0200
-@@ -758,6 +758,23 @@
+@@ -758,6 +758,30 @@
endif
#
@@ -106,6 +107,13 @@
+endif # IS_COMPONENT
+endif # SunOS
+
++ifeq ($(OS_ARCH),FreeBSD)
++EXTRA_DSO_LDOPTS += -Wl,-z,origin -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
++ifdef IS_COMPONENT
++EXTRA_DSO_LDOPTS += -Wl,-z,origin -Wl,-rpath,\$$ORIGIN/..:\$$ORIGIN/../../ure-link/lib
++endif # IS_COMPONENT
++endif # FreeBSD
++
+#
# Include any personal overrides the user might think are needed.
#
@@ -5810,7 +5818,7 @@
else
--- misc/mozilla/nsprpub/lib/ds/Makefile.in 2006-12-22 14:47:17.000000000 +0100
+++ misc/build/mozilla/nsprpub/lib/ds/Makefile.in 2008-08-14 16:22:21.000000000 +0200
-@@ -79,18 +79,22 @@
+@@ -79,18 +79,26 @@
OS_LIBS = -lc
endif
@@ -5818,6 +5826,10 @@
+MKSHLIB += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
+endif
+
++ifeq ($(OS_ARCH),FreeBSD)
++MKSHLIB += -Wl,-z,origin -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
++endif
++
ifeq ($(OS_ARCH),SunOS)
OS_LIBS = -lc
MAPFILE = $(OBJDIR)/pldsmap.sun
@@ -5838,7 +5850,7 @@
# dependencies in the same directory where it resides.
--- misc/mozilla/nsprpub/lib/libc/src/Makefile.in 2006-12-22 14:47:17.000000000 +0100
+++ misc/build/mozilla/nsprpub/lib/libc/src/Makefile.in 2008-08-14 16:22:21.000000000 +0200
-@@ -89,18 +89,22 @@
+@@ -89,18 +89,26 @@
OS_LIBS = -lc
endif
@@ -5846,6 +5858,10 @@
+MKSHLIB += -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
+endif
+
++ifeq ($(OS_ARCH),FreeBSD)
++MKSHLIB += -Wl,-z,origin -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
++endif
++
ifeq ($(OS_ARCH),SunOS)
OS_LIBS = -lc
MAPFILE = $(OBJDIR)/plcmap.sun
@@ -6353,3 +6369,120 @@
clean clobber::
rm -rf $(DIST)/$(APP_NAME).app
+
+--- misc/mozilla/security/coreconf/FreeBSD.mk 2009-06-28 16:28:27.000000000 +0900
++++ misc/build/mozilla/security/coreconf/FreeBSD.mk 2009-06-28 16:25:10.000000000 +0900
+@@ -52,6 +52,7 @@
+
+ DSO_CFLAGS = -fPIC
+ DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@)
++DSO_LDOPTS += -Wl,-z,origin -Wl,-rpath,\$$ORIGIN:\$$ORIGIN/../ure-link/lib
+
+ #
+ # The default implementation strategy for FreeBSD is pthreads.
+--- misc/mozilla/config/mkdepend/imakemdep.h 2009-06-29 02:48:45.000000000 +0900
++++ misc/build/mozilla/config/mkdepend/imakemdep.h 2009-06-29 02:48:01.000000000 +0900
+@@ -277,8 +277,8 @@
+ # ifdef __i386__
+ "-D__i386__",
+ # endif
+-# ifdef __x86_64__
+- "-D__x86_64__",
++# if defined(__amd64__) || defined(__x86_64__)
++ "-D__amd64__ -D__x86_64__",
+ # endif
+ # ifdef __GNUC__
+ "-traditional",
+
+--- misc/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in 2009-07-02 10:03:28.000000000 +0900
++++ misc/build/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in 2009-07-02 10:14:17.000000000 +0900
+@@ -249,6 +249,10 @@
+ EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -pthread
+ endif
+
++ifeq ($(OS_ARCH), FreeBSD)
++EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME)
++endif
++
+ ###########################################################################
+
+ ifeq ($(USE_DLL_EXPORTS_FILE), 1)
+@@ -306,7 +306,7 @@
+ ifdef SO_FILES_TO_REMOVE
+ -$(RM) $(SO_FILES_TO_REMOVE)
+ endif
+-ifneq (,$(filter AIX Linux HP-UX Darwin BeOS QNX NetBSD OSF1 OpenBSD, $(OS_ARCH)))
++ifneq (,$(filter AIX Linux HP-UX Darwin BeOS QNX NetBSD OSF1 OpenBSD FreeBSD, $(OS_ARCH)))
+ $(LINK_LIB) ../liblber/$(OBJDIR_NAME)/*.a
+ else
+ ifeq ($(OS_ARCH),OS2)
+
+########################################
+following is re_comp issue. FBSD has re_comp in /usr/lib/libcompat.a,
+but since re_comp, re_exec are deprecated, shared libs are not provided.
+This causes a problem for amd64 arch at extension project like following:
+
+Making: ../../../unxfbsdx.pro/lib/ldapbe2.uno.so
+ccache c++ -Wl,-z,combreloc -Wl,-rpath,'$ORIGIN:$ORIGIN/../ure-link/lib' -shared -L../../../unxfbsdx.pro/lib -L../lib -L/work/seamonkey/ports/editors/openoffice.org-3-devel/work/moz2seamonkey01/solenv/unxfbsdx/lib -L/work/seamonkey/ports/editors/openoffice.org-3-devel/work/moz2seamonkey01/solver/300/unxfbsdx.pro/lib -L/work/seamonkey/ports/editors/openoffice.org-3-devel/work/moz2seamonkey01/solenv/unxfbsdx/lib -L/usr/local/diablo-jdk1.6.0/lib -L/usr/local/diablo-jdk1.6.0/jre/lib/amd64 -L/usr/local/diablo-jdk1.6.0/jre/lib/amd64/server -L/usr/local/diablo-jdk1.6.0/jre/lib/amd64/native_threads -L/usr/local/lib ../../../unxfbsdx.pro/slo/ldapbe2.uno_version.o -o ../../../unxfbsdx.pro/lib/ldapbe2.uno.so ../../../unxfbsdx.pro/slo/ldapuserprofilebe.o ../../../unxfbsdx.pro/slo/ldapuserprof.o ../../../unxfbsdx.pro/slo/ldapaccess.o ../../../unxfbsdx.pro/slo/ldapuserprofilelayer.o ../../../unxfbsdx.pro/slo/propertysethelper.o ../../../unxfbsdx.pro/slo/componentdef.o -lldap50 -luno_cppuhelpergcc3 -luno_cppu -luno_salhelpergcc3 -luno_sal -lcompat -Wl,-Bstatic -llber50 -pthread -lm -Wl,-Bdynamic -lstlport_gcc
+/usr/bin/ld: /usr/lib/libcompat.a(regex.o): relocation R_X86_64_32 can not be used when making a shared object; recompile with -fPIC
+/usr/lib/libcompat.a: could not read symbols: Bad value
+dmake: Error code 1, while making '../../../unxfbsdx.pro/lib/ldapbe2.uno.so'
+.
+
+However, simply activating via "#define NEED_BSDREGEX" doesn't work as
+regex.h in seamonkey and /usr/include/unistd.h conflicts. We cannot
+stop include unistd.h :-(
+
+In file included from getfilter.c:53:
+../../../ldap/include/regex.h:76: error: conflicting types for 're_comp'
+/usr/include/unistd.h:516: error: previous declaration of 're_comp' was here
+../../../ldap/include/regex.h:77: error: conflicting types for 're_exec'
+/usr/include/unistd.h:517: error: previous declaration of 're_exec' was here
+
+--- misc/mozilla/directory/c-sdk/ldap/include/portable.h 2006-02-03 23:44:40.000000000 +0900
++++ misc/build/mozilla/directory/c-sdk/ldap/include/portable.h 2009-07-02 10:35:23.000000000 +0900
+@@ -131,7 +131,7 @@
+ * some systems don't have the BSD re_comp and re_exec routines
+ */
+ #ifndef NEED_BSDREGEX
+-#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined( DARWIN )) && !defined(sgi)
++#if ( defined( SYSV ) || defined( NETBSD ) || defined( FREEBSD ) || defined( linux ) || defined( DARWIN )) && !defined(sgi)
+ #define NEED_BSDREGEX
+ #endif
+ #endif
+
+--- misc/mozilla/directory/c-sdk/ldap/libraries/libldap/regex.c 2006-02-03 23:44:42.000000000 +0900
++++ misc/build/mozilla/directory/c-sdk/ldap/libraries/libldap/regex.c 2009-07-02 11:05:54.000000000 +0900
+@@ -267,7 +267,7 @@
+
+ char *
+ LDAP_CALL
+-re_comp( char *pat )
++re_comp( const char *pat )
+ {
+ register REGEXCHAR *p; /* pattern pointer */
+ register REGEXCHAR *mp=nfa; /* nfa pointer */
+@@ -513,7 +513,7 @@
+
+ int
+ LDAP_CALL
+-re_exec( char *lp )
++re_exec( const char *lp )
+ {
+ register REGEXCHAR c;
+ register REGEXCHAR *ep = 0;
+--- misc/mozilla/directory/c-sdk/ldap/include/regex.h 2006-02-03 23:44:40.000000000 +0900
++++ misc/build/mozilla/directory/c-sdk/ldap/include/regex.h 2009-07-02 11:05:24.000000000 +0900
+@@ -73,8 +73,8 @@
+ int re_init( void );
+ void re_lock( void );
+ int re_unlock( void );
+-char * LDAP_CALL re_comp( char *pat );
+-int LDAP_CALL re_exec( char *lp );
++char * LDAP_CALL re_comp( const char *pat );
++int LDAP_CALL re_exec( const char *lp );
+ void LDAP_CALL re_modw( char *s );
+ int LDAP_CALL re_subs( char *src, char *dst );
+ #else /* NEEDPROTOS */
+
+
|
