View | Details | Raw Unified | Return to bug 196080
Collapse All | Expand All

(-)Makefile (-2 / +1 lines)
Lines 89-96 Link Here
89 
.if ! ${PORT_OPTIONS:MLDAP}
 89 
.if ! ${PORT_OPTIONS:MLDAP}
90 
MOZ_OPTIONS+=	--disable-ldap --enable-mailnews
 90 
MOZ_OPTIONS+=	--disable-ldap --enable-mailnews
91 
.else
 91 
.else
92 
BROKEN=		XPCOMGlueLoad error for file ${LOCALBASE}/lib/${MOZILLA}/libxul.so: \
93 
		Cannot open "../../ldap/sdks/c-sdk/ldap/libraries/libldap/libldap60.so"
94 
MOZ_OPTIONS+=	--enable-ldap --enable-mailnews
 92 
MOZ_OPTIONS+=	--enable-ldap --enable-mailnews
95 
.endif
 93 
.endif
96 
.if ${PORT_OPTIONS:MENIGMAIL}
 94 
.if ${PORT_OPTIONS:MENIGMAIL}
Lines 173-178 Link Here
173 
	${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${STAGEDIR}${PREFIX}/share/applications/
 171 
	${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${STAGEDIR}${PREFIX}/share/applications/
174 
	${LN} -sf ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png \
 172 
	${LN} -sf ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png \
175 
		${STAGEDIR}${PREFIX}/share/pixmaps/${MOZILLA}.png
 173 
		${STAGEDIR}${PREFIX}/share/pixmaps/${MOZILLA}.png
174 
	${RM} ${STAGEDIR}${PREFIX}/lib/seamonkey/seamonkey-bin
176 
.if ${PORT_OPTIONS:MLIGHTNING}
 175 
.if ${PORT_OPTIONS:MLIGHTNING}
177 
	@${MKDIR} ${STAGEDIR}${XPI_LIBDIR}/${XPI_ID} ${STAGEDIR}${XPI_LIBDIR}/symlinks/seamonkey
 176 
	@${MKDIR} ${STAGEDIR}${XPI_LIBDIR}/${XPI_ID} ${STAGEDIR}${XPI_LIBDIR}/symlinks/seamonkey
178 
	@(cd ${STAGEDIR}${XPI_LIBDIR}/${XPI_ID}; ${TAR} -xf ${XPI_FILE})
 177 
	@(cd ${STAGEDIR}${XPI_LIBDIR}/${XPI_ID}; ${TAR} -xf ${XPI_FILE})
(-)files/patch-bug1112904 (+11 lines)
Line 0 Link Here
1 
--- mozilla/python/mozbuild/mozbuild/backend/recursivemake.py	2014-12-03 01:23:18.000000000 -0500
2 
+++ mozilla/python/mozbuild/mozbuild/backend/recursivemake.py	2014-12-17 18:02:43.000000000 -0500
3 
@@ -1165,6 +1166,6 @@
4 
                     write_shared_and_system_libs(l)
5 
                 else:
6 
-                    backend_file.write_once('SHARED_LIBS += %s/%s\n'
7 
-                        % (pretty_relpath(l), l.import_name))
8 
+                    backend_file.write_once('SHARED_LIBS += -L%s -l%s\n'
9 
+                        % (pretty_relpath(l), l.basename))
10 
             for l in lib.linked_system_libs:
11 
                 backend_file.write_once('OS_LIBS += %s\n' % l)

Return to bug 196080