Attachment 150702 Details for Bug 196080 – Fix dependency generation for bundled shared libraries

[patch] Fix dependency generation for bundled shared libraries

seamonkey-ldap.patch (text/plain), 1.80 KB, created by Mikhail T. on 2014-12-17 23:48:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikhail T.

Created: 2014-12-17 23:48:17 UTC

Size: 1.80 KB

patch

obsolete

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

Actions: View | Diff

Attachments on bug 196080: 150702