Date: prev next · Thread: first prev next last
2011 Archives by date, by thread · List index 

Hi,
The mozilla ldap libraries fail to compile on my systems, since the Makefile.in's are all trying to create directories. $(MKDIR) is not defined so it attempts to run the directory name as a command, which of course fails. Since LibreOffice doesn't need those calls to $(MKDIR) to compile, I added to the end of seamonkey-source-1.1.14.patch some lines that remove the dependencies on directory creation. 

This patch applies to 3.4.3.2 and I also tested it on git without problem.
I'll inline it so you can look it over and I'll also attach since it may get munged by email programs.
--- ./moz/seamonkey-source-1.1.14.patch.orig 2011-08-15 12:35:01.000000000 -0600 +++ ./moz/seamonkey-source-1.1.14.patch 2011-10-19 11:52:21.605457361 -0600 
@@ -6352,3 +6352,116 @@
 +PROCESS_MAP_FILE = grep -v ';-' $< | \
 +        sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
 +
+--- misc/build/mozilla/directory/c-sdk/ldap/libraries/liblber/Makefile.in.orig 2006-02-03 07:44:41.000000000 -0700 ++++ misc/build/mozilla/directory/c-sdk/ldap/libraries/liblber/Makefile.in 2011-10-19 11:39:08.257702312 -0600 
+@@ -79,12 +79,12 @@ versiont.c:    Makefile.client Version.c
+     -e "s|%VERSION%|$${v}|" \
+ < Version.c > $@)
+
+-export::    $(OBJDEST) $(LIBDIR) $(OBJS) $(LIBLBER)
++export::    $(LIBLBER)
+
+ $(LIBDIR):
+     $(MKDIR) $(LIBDIR)
+
+-$(LIBLBER): $(OBJS) $(LIBDIR)
++$(LIBLBER): $(OBJS)
+     @echo ======= making $(LIBLBER)
+ ifdef SO_FILES_TO_REMOVE
+     -$(RM) $(SO_FILES_TO_REMOVE)
+--- misc/build/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in.orig 2006-02-03 07:44:42.000000000 -0700 ++++ misc/build/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in 2011-10-19 11:42:42.758184969 -0600 
+@@ -279,13 +279,13 @@ versiont.c:    Makefile.client Version.c
+ < Version.c > $@)
+
+ # Set the default sources for the export target
+-EXPDEPS = $(OBJDIR_NAME) $(LIBDIR) $(OBJS) $(LIBLDAP) $(DLLLDAP)
++EXPDEPS = $(OBJS) $(LIBLDAP) $(DLLLDAP)
+ # Remove the LIB source if on win32 and using MSVC
+ # This avoids problems with -jX builds where 'link' will make both the
+ # .dll and .lib files in one pass
+ ifeq ($(OS_ARCH), WINNT)
+ ifeq ($(LD),link)
+-EXPDEPS = $(OBJDIR_NAME) $(LIBDIR) $(OBJS) $(DLLLDAP)
++EXPDEPS = $(OBJS) $(DLLLDAP)
+ endif
+ endif
+
+@@ -297,7 +297,7 @@ ltest::    $(LIBLDAP) test.o
+ $(LIBDIR):
+     $(MKDIR) $(LIBDIR)
+
+-$(LIBLDAP): $(OBJS) $(LIBDIR) $(LDAP_EXPORT_DEFS)
++$(LIBLDAP): $(OBJS) $(LDAP_EXPORT_DEFS)
+     @echo ======= making $(LIBLDAP)
+ ifdef SO_FILES_TO_REMOVE
+     -$(RM) $(SO_FILES_TO_REMOVE)
+@@ -314,7 +314,7 @@ else
+ endif
+ endif
+
+-$(DLLLDAP): $(OBJS) $(LIBDIR) $(LDAP_EXPORT_DEFS)
++$(DLLLDAP): $(OBJS) $(LDAP_EXPORT_DEFS)
+     @echo ======= making $(DLLLDAP)
+ ifdef SO_FILES_TO_REMOVE
+     -$(RM) $(SO_FILES_TO_REMOVE)
+--- misc/build/mozilla/directory/c-sdk/ldap/libraries/libldif/Makefile.in.orig 2006-02-03 07:44:49.000000000 -0700 ++++ misc/build/mozilla/directory/c-sdk/ldap/libraries/libldif/Makefile.in 2011-10-19 11:43:47.847420057 -0600 
+@@ -77,12 +77,12 @@ versiont.c:    Makefile.client Version.c
+     -e "s|%VERSION%|$${v}|" \
+ < Version.c > $@)
+
+-export::    $(OBJDEST) $(LIBDIR) $(OBJS) $(LIBLDIF)
++export::    $(LIBLDIF)
+
+ $(LIBDIR):
+     $(MKDIR) $(LIBDIR)
+
+-$(LIBLDIF): $(OBJS) $(LIBDIR)
++$(LIBLDIF): $(OBJS)
+     @echo ======= making $(LIBLDIF)
+ ifdef SO_FILES_TO_REMOVE
+     -$(RM) $(SO_FILES_TO_REMOVE)
+--- misc/build/mozilla/directory/c-sdk/ldap/libraries/libiutil/Makefile.in.orig 2006-02-03 07:44:41.000000000 -0700 ++++ misc/build/mozilla/directory/c-sdk/ldap/libraries/libiutil/Makefile.in 2011-10-19 11:40:11.357962284 -0600 
+@@ -89,12 +89,12 @@ versiont.c:    Makefile.client Version.c
+     -e "s|%VERSION%|$${v}|" \
+ < Version.c > $@)
+
+-export::    $(OBJDEST) $(LIBDIR) $(OBJS) $(LIBIUTIL)
++export::    $(LIBIUTIL)
+
+ $(LIBDIR):
+     $(MKDIR) $(LIBDIR)
+
+-$(LIBIUTIL): $(OBJS) $(LIBDIR)
++$(LIBIUTIL): $(OBJS)
+     @echo ======= making $(LIBIUTIL)
+ ifdef SO_FILES_TO_REMOVE
+     -$(RM) $(SO_FILES_TO_REMOVE)
+--- misc/build/mozilla/directory/c-sdk/ldap/libraries/libprldap/Makefile.in.orig 2006-02-03 07:44:49.000000000 -0700 ++++ misc/build/mozilla/directory/c-sdk/ldap/libraries/libprldap/Makefile.in 2011-10-19 11:37:15.096028389 -0600 
+@@ -201,12 +201,12 @@ versiont.c:    Makefile.client Version.c
+     -e "s|%VERSION%|$${v}|" \
+ < Version.c > $@)
+
+-export::    $(OBJDEST) $(LIBDIR) $(OBJS) $(DLLPRLDAP)
++export::    $(DLLPRLDAP)
+
+ $(LIBDIR):
+     $(MKDIR) $(LIBDIR)
+
+-$(LIBPRLDAP): $(OBJS) $(LIBDIR) $(PRLDAP_EXPORT_DEFS)
++$(LIBPRLDAP): $(OBJS) $(PRLDAP_EXPORT_DEFS)
+     @echo ======= making $(LIBPRLDAP)
+ ifdef SO_FILES_TO_REMOVE
+     -$(RM) $(SO_FILES_TO_REMOVE)
+@@ -219,7 +219,7 @@ else
+     $(LINK_LIB) $(EXTRA_LIBS)
+ endif
+
+-$(DLLPRLDAP): $(OBJS) $(LIBDIR) $(PRLDAP_EXPORT_DEFS)
++$(DLLPRLDAP): $(OBJS) $(PRLDAP_EXPORT_DEFS)
+     @echo ======= making $(DLLPRLDAP)
+ ifdef SO_FILES_TO_REMOVE
+     -$(RM) $(SO_FILES_TO_REMOVE)


--- ./moz/seamonkey-source-1.1.14.patch.orig    2011-08-15 12:35:01.000000000 -0600
+++ ./moz/seamonkey-source-1.1.14.patch 2011-10-19 11:52:21.605457361 -0600
@@ -6352,3 +6352,116 @@
 +PROCESS_MAP_FILE = grep -v ';-' $< | \
 +        sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
 +
+--- misc/build/mozilla/directory/c-sdk/ldap/libraries/liblber/Makefile.in.orig 2006-02-03 
07:44:41.000000000 -0700
++++ misc/build/mozilla/directory/c-sdk/ldap/libraries/liblber/Makefile.in      2011-10-19 
11:39:08.257702312 -0600
+@@ -79,12 +79,12 @@ versiont.c:        Makefile.client Version.c
+       -e "s|%VERSION%|$${v}|" \
+       < Version.c > $@)
+ 
+-export::    $(OBJDEST) $(LIBDIR) $(OBJS) $(LIBLBER)
++export::    $(LIBLBER)
+ 
+ $(LIBDIR):
+       $(MKDIR) $(LIBDIR)
+ 
+-$(LIBLBER): $(OBJS) $(LIBDIR)
++$(LIBLBER): $(OBJS)
+       @echo ======= making $(LIBLBER)
+ ifdef SO_FILES_TO_REMOVE
+       -$(RM) $(SO_FILES_TO_REMOVE)
+--- misc/build/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in.orig 2006-02-03 
07:44:42.000000000 -0700
++++ misc/build/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in      2011-10-19 
11:42:42.758184969 -0600
+@@ -279,13 +279,13 @@ versiont.c:      Makefile.client Version.c
+       < Version.c > $@)
+ 
+ # Set the default sources for the export target
+-EXPDEPS = $(OBJDIR_NAME) $(LIBDIR) $(OBJS) $(LIBLDAP) $(DLLLDAP)
++EXPDEPS = $(OBJS) $(LIBLDAP) $(DLLLDAP)
+ # Remove the LIB source if on win32 and using MSVC
+ # This avoids problems with -jX builds where 'link' will make both the
+ # .dll and .lib files in one pass
+ ifeq ($(OS_ARCH), WINNT)
+ ifeq ($(LD),link)
+-EXPDEPS = $(OBJDIR_NAME) $(LIBDIR) $(OBJS) $(DLLLDAP)
++EXPDEPS = $(OBJS) $(DLLLDAP)
+ endif
+ endif
+ 
+@@ -297,7 +297,7 @@ ltest::    $(LIBLDAP) test.o
+ $(LIBDIR):
+       $(MKDIR) $(LIBDIR)
+ 
+-$(LIBLDAP): $(OBJS) $(LIBDIR) $(LDAP_EXPORT_DEFS)
++$(LIBLDAP): $(OBJS) $(LDAP_EXPORT_DEFS)
+       @echo ======= making $(LIBLDAP)
+ ifdef SO_FILES_TO_REMOVE
+       -$(RM) $(SO_FILES_TO_REMOVE)
+@@ -314,7 +314,7 @@ else
+ endif
+ endif
+ 
+-$(DLLLDAP): $(OBJS) $(LIBDIR) $(LDAP_EXPORT_DEFS)
++$(DLLLDAP): $(OBJS) $(LDAP_EXPORT_DEFS)
+       @echo ======= making $(DLLLDAP)
+ ifdef SO_FILES_TO_REMOVE
+       -$(RM) $(SO_FILES_TO_REMOVE)
+--- misc/build/mozilla/directory/c-sdk/ldap/libraries/libldif/Makefile.in.orig 2006-02-03 
07:44:49.000000000 -0700
++++ misc/build/mozilla/directory/c-sdk/ldap/libraries/libldif/Makefile.in      2011-10-19 
11:43:47.847420057 -0600
+@@ -77,12 +77,12 @@ versiont.c:        Makefile.client Version.c
+       -e "s|%VERSION%|$${v}|" \
+       < Version.c > $@)
+ 
+-export::    $(OBJDEST) $(LIBDIR) $(OBJS) $(LIBLDIF)
++export::    $(LIBLDIF)
+ 
+ $(LIBDIR):
+       $(MKDIR) $(LIBDIR)
+ 
+-$(LIBLDIF): $(OBJS) $(LIBDIR)
++$(LIBLDIF): $(OBJS)
+       @echo ======= making $(LIBLDIF)
+ ifdef SO_FILES_TO_REMOVE
+       -$(RM) $(SO_FILES_TO_REMOVE)
+--- misc/build/mozilla/directory/c-sdk/ldap/libraries/libiutil/Makefile.in.orig        2006-02-03 
07:44:41.000000000 -0700
++++ misc/build/mozilla/directory/c-sdk/ldap/libraries/libiutil/Makefile.in     2011-10-19 
11:40:11.357962284 -0600
+@@ -89,12 +89,12 @@ versiont.c:        Makefile.client Version.c
+       -e "s|%VERSION%|$${v}|" \
+       < Version.c > $@)
+ 
+-export::    $(OBJDEST) $(LIBDIR) $(OBJS) $(LIBIUTIL)
++export::    $(LIBIUTIL)
+ 
+ $(LIBDIR):
+       $(MKDIR) $(LIBDIR)
+ 
+-$(LIBIUTIL): $(OBJS) $(LIBDIR)
++$(LIBIUTIL): $(OBJS)
+       @echo ======= making $(LIBIUTIL)
+ ifdef SO_FILES_TO_REMOVE
+       -$(RM) $(SO_FILES_TO_REMOVE)
+--- misc/build/mozilla/directory/c-sdk/ldap/libraries/libprldap/Makefile.in.orig       2006-02-03 
07:44:49.000000000 -0700
++++ misc/build/mozilla/directory/c-sdk/ldap/libraries/libprldap/Makefile.in    2011-10-19 
11:37:15.096028389 -0600
+@@ -201,12 +201,12 @@ versiont.c:      Makefile.client Version.c
+       -e "s|%VERSION%|$${v}|" \
+       < Version.c > $@)
+ 
+-export::    $(OBJDEST) $(LIBDIR) $(OBJS) $(DLLPRLDAP)
++export::    $(DLLPRLDAP)
+ 
+ $(LIBDIR):
+       $(MKDIR) $(LIBDIR)
+ 
+-$(LIBPRLDAP): $(OBJS) $(LIBDIR) $(PRLDAP_EXPORT_DEFS)
++$(LIBPRLDAP): $(OBJS) $(PRLDAP_EXPORT_DEFS)
+       @echo ======= making $(LIBPRLDAP)
+ ifdef SO_FILES_TO_REMOVE
+       -$(RM) $(SO_FILES_TO_REMOVE)
+@@ -219,7 +219,7 @@ else
+       $(LINK_LIB) $(EXTRA_LIBS)
+ endif
+ 
+-$(DLLPRLDAP): $(OBJS) $(LIBDIR) $(PRLDAP_EXPORT_DEFS)
++$(DLLPRLDAP): $(OBJS) $(PRLDAP_EXPORT_DEFS)
+       @echo ======= making $(DLLPRLDAP)
+ ifdef SO_FILES_TO_REMOVE
+       -$(RM) $(SO_FILES_TO_REMOVE)

Context

Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.