[Libreoffice-commits] .: gdk-pixbuf/makefile.mk libgsf/makefile.mk librsvg/makefile.mk pango/makefile.mk
gdk-pixbuf/makefile.mk |5 + libgsf/makefile.mk | 19 +-- librsvg/makefile.mk|4 pango/makefile.mk |7 +-- 4 files changed, 23 insertions(+), 12 deletions(-) New commits: commit a7c02ed28a8ff20ada18ba82f97b0d67f604d5d8 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Sat Mar 24 02:10:51 2012 +0100 help XCode 2.5 resolve @loader_path/libfoo.dylib diff --git a/gdk-pixbuf/makefile.mk b/gdk-pixbuf/makefile.mk index 3beb162..c2709ec 100644 --- a/gdk-pixbuf/makefile.mk +++ b/gdk-pixbuf/makefile.mk @@ -50,6 +50,11 @@ TARFILE_MD5=a7d6c5f2fe2d481149ed3ba807b5c043 .IF $(OS)==MACOSX PATCH_FILES=gdk-pixbuf-2.23.0.patch + +LOADER_PATTERN:=-Wl,-dylib_file,@loader_path/REPLACEME:$(SOLARLIBDIR)/REPLACEME +LOADER_LIBS:=glib-2.0.0 gmodule-2.0.0 gobject-2.0.0 gthread-2.0.0 +EXTRA_LINKFLAGS+=$(foreach,lib,$(LOADER_LIBS) $(subst,REPLACEME,lib$(lib).dylib $(LOADER_PATTERN))) + CONFIGURE_DIR= CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \ BASE_DEPENDENCIES_CFLAGS=-I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0 \ diff --git a/libgsf/makefile.mk b/libgsf/makefile.mk index 095d059..684ea56 100644 --- a/libgsf/makefile.mk +++ b/libgsf/makefile.mk @@ -48,8 +48,6 @@ LIBGSFVERSION=1.14.19 TARFILE_NAME=$(PRJNAME)-$(LIBGSFVERSION) TARFILE_MD5=3a84ac2da37cae5bf7ce616228c6fbde -.IF $(OS)==MACOSX || $(OS)==WNT - .IF $(OS) == WNT PATCH_FILES=libgsf-1.14.19.windows.patch @@ -60,15 +58,21 @@ ADDITIONAL_FILES=\ gsf/makefile.mk \ gsf/gsf-config.h -.ELSE +.ENDIF + +.IF $(OS)==MACOSX PATCH_FILES=libgsf-1.14.19.patch +LOADER_PATTERN:=-Wl,-dylib_file,@loader_path/REPLACEME:$(SOLARLIBDIR)/REPLACEME +LOADER_LIBS:=glib-2.0.0 gmodule-2.0.0 gobject-2.0.0 gthread-2.0.0 +EXTRA_LINKFLAGS+=$(foreach,lib,$(LOADER_LIBS) $(subst,REPLACEME,lib$(lib).dylib $(LOADER_PATTERN))) + CONFIGURE_DIR= CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \ ./configure \ --prefix=/@.__$(EXTRPATH) \ CFLAGS=$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(LIBXML_CFLAGS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0 \ - LDFLAGS=-L$(SOLARLIBDIR) $(eq,$(OS),MACOSX $(EXTRA_LINKFLAGS) $(NULL)) \ + LDFLAGS=-L$(SOLARLIBDIR) $(EXTRA_LINKFLAGS) \ --without-python \ --without-bonobo \ --with-bz2 \ @@ -84,7 +88,7 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \ GDK_PIXBUF_LIBS=-lgdk_pixbuf-2.0 -CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS=$(EXTRA_CDEFS) $(NULL)) +CONFIGURE_FLAGS=CPPFLAGS=$(EXTRA_CDEFS) .IF $(CROSS_COMPILING)==YES CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) @@ -94,9 +98,6 @@ BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) \ $(GNUMAKE) BUILD_DIR=$(CONFIGURE_DIR) -.ENDIF - -.IF $(OS)==MACOSX OUT2LIB+=gsf/.libs/libgsf-1.114.dylib .ENDIF @@ -149,8 +150,6 @@ OUT2INC+=gsf/gsf-input-http.h OUT2INC+=gsf/gsf-outfile-zip.h OUT2INC+=gsf/gsf.h -.ENDIF - # --- Targets -- .INCLUDE : set_ext.mk diff --git a/librsvg/makefile.mk b/librsvg/makefile.mk index 2383167..fea2c8f 100644 --- a/librsvg/makefile.mk +++ b/librsvg/makefile.mk @@ -53,6 +53,10 @@ TARFILE_MD5=d7a242ca43e33e1b63d3073f9d46a6a8 PATCH_FILES=librsvg-2.32.1.patch +LOADER_PATTERN:=-Wl,-dylib_file,@loader_path/REPLACEME:$(SOLARLIBDIR)/REPLACEME +LOADER_LIBS:=cairo.2 gio-2.0.0 glib-2.0.0 gmodule-2.0.0 gobject-2.0.0 gthread-2.0.0 intl.8 pango-1.0.0 +EXTRA_LINKFLAGS+=$(foreach,lib,$(LOADER_LIBS) $(subst,REPLACEME,lib$(lib).dylib $(LOADER_PATTERN))) + .IF $(LIBXML_LIBS) == LIBXML_LIBS=-lxml2 .ENDIF diff --git a/pango/makefile.mk b/pango/makefile.mk index ec18260..2fb2db8 100644 --- a/pango/makefile.mk +++ b/pango/makefile.mk @@ -53,13 +53,16 @@ TARFILE_MD5=22ad1c8d3fda7e73b0798035f3dd96bc PATCH_FILES=pango-1.28.3.patch -CONFIGURE_LDFLAGS=-L$(SOLARLIBDIR) +LOADER_PATTERN:=-Wl,-dylib_file,@loader_path/REPLACEME:$(SOLARLIBDIR)/REPLACEME +LOADER_LIBS:=glib-2.0.0 gthread-2.0.0 +EXTRA_LINKFLAGS+=$(foreach,lib,$(LOADER_LIBS) $(subst,REPLACEME,lib$(lib).dylib $(LOADER_PATTERN))) + CONFIGURE_DIR= CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \ ./configure --prefix=/@.__$(EXTRPATH) --disable-dependency-tracking --disable-doc-cross-references \ CFLAGS=$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(EXTRA_CDEFS) -I$(SOLARINCDIR) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0 \ CXXFLAGS=$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(EXTRA_CDEFS) -I$(SOLARINCDIR) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0 \ - LDFLAGS=$(CONFIGURE_LDFLAGS) \ + LDFLAGS=-L$(SOLARLIBDIR) $(EXTRA_LINKFLAGS) \ CAIRO_CFLAGS=-I
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk |6 ++ 1 file changed, 6 insertions(+) New commits: commit 2d3c700725736a5e59e60b80018582480674074d Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Sat Mar 24 03:54:52 2012 +0100 help XCode 2.5 resolve @loader_path/libfoo.dylib diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 1a054c7..c6a033c 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -407,6 +407,12 @@ $(call gb_LinkTarget_add_linked_libs,$(1),\ rdf \ ) +ifeq ($(OS),MACOSX) + +$(call gb_LinkTarget_add_libs,$(1),$(foreach replaceme,librasqal.1 libraptor.1,-dylib_file @loader_path/$(replaceme).dylib:$(gb_Library_OUTDIRLOCATION)/$(replaceme).dylib)) + +endif + endef endif # SYSTEM_REDLAND ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7c4da6d5191bbd7ceb299dc422f62987683d743c Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Thu Mar 22 14:11:01 2012 +0100 Revert AC_PROG_GREP (I'm pedantic, am I not?) - XCode 2.5.x doesn't know it This reverts commit 4762788eb4ab7f2278861aaf9b9d6d665db61310. diff --git a/configure.in b/configure.in index c6df5f1..cdd4b42 100644 --- a/configure.in +++ b/configure.in @@ -63,7 +63,7 @@ AC_SUBST(CROSS_COMPILING) AC_PROG_EGREP # AC_PROG_EGREP doesn't set GREP on all systems as well -AC_PROG_GREP +AC_PATH_PROG(GREP, grep) if test $build_os = cygwin; then EXEEXT_FOR_BUILD=.exe ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |2 ++ 1 file changed, 2 insertions(+) New commits: commit e065cfc6746161f8ee43c9f32abc728987696043 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Wed Mar 21 18:27:26 2012 +0100 checking for egrep doesn't necessarily set GREP as well diff --git a/configure.in b/configure.in index 0c5093e..66dcf18 100644 --- a/configure.in +++ b/configure.in @@ -62,6 +62,8 @@ fi AC_SUBST(CROSS_COMPILING) AC_PROG_EGREP +# AC_PROG_EGREP doesn't set GREP on all systems as well +AC_PATH_PROG(GREP, grep) if test $build_os = cygwin; then EXEEXT_FOR_BUILD=.exe ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: moz/makefile.mk
moz/makefile.mk | 25 + 1 file changed, 9 insertions(+), 16 deletions(-) New commits: commit abb1bcf7bf11e596d93960bf8ca16cf671e6a2d0 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Wed Jan 11 00:44:08 2012 +0100 fix build on Mac - use SDK, map loader_path for nss-libs, remove HH cruft diff --git a/moz/makefile.mk b/moz/makefile.mk index 4487bc1..120c731 100644 --- a/moz/makefile.mk +++ b/moz/makefile.mk @@ -68,18 +68,6 @@ MOZILLA_CONFIGURE_FLAGS +=--disable-xft .EXPORT : CFLAGS LDFLAGS MOZ_ENABLE_COREXFONTS .ENDIF # $(SYSBASE)!= $(OS) == LINUX -.IF $(SYSBASE)!= $(OS) == MACOSX -PKGCONFIG_ROOT!:=$(ENV_ROOT)$/macports-1.7.0 -PKG_CONFIG:=$(PKGCONFIG_ROOT)$/bin$/pkg-config -PKG_CONFIG_PATH:=$(PKGCONFIG_ROOT)$/lib$/pkgconfig -.EXPORT : PKG_CONFIG_PATH PKG_CONFIG -# hmm... rather gcc specific switches... -CFLAGS:=-isystem $(SYSBASE)/usr/include -B$(SYSBASE)/usr/lib -B$(SYSBASE)/usr/lib/system -L$(ENV_ROOT)/macports-1.7.0/lib -lmathCommon -LDFLAGS:=-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -L$(SYSBASE)/usr/lib/system -XLDOPTS:= -B$(SYSBASE)/usr/lib -B$(SYSBASE)/usr/lib/system -lmathCommon -.EXPORT : CFLAGS LDFLAGS XLDOPTS -.ENDIF # $(SYSBASE)!= $(OS) == MACOSX - # - pkg-config end --- MOZILLA_VERSION=1.1.14 @@ -156,6 +144,10 @@ MOZILLA_CONFIGURE_FLAGS += \ --with-nss-prefix=$(OUTDIR) \ --with-nspr-prefix=$(OUTDIR) +.IF $(OS)==MACOSX +# help the linker to resolve @loader_path to the solver (needed at least for 10.4 / XCode 2.5) +LDFLAGS+=$(foreach,name,$(echo nspr4 nss3 nssutil3 plc4 plds4) -Wl,-dylib_file,@loader_path/lib$(name).dylib:$(OUTDIR)/lib/lib$(name).dylib) +.ENDIF .ENDIF #disable profilelocking to share profile with mozilla @@ -166,11 +158,12 @@ MOZILLA_CONFIGURE_FLAGS += \ .IF $(GUI)==UNX .IF $(GUIBASE)==aqua MOZILLA_CONFIGURE_FLAGS+= \ ---with-macos-sdk=$(MACOSX_DEV_SDK) \ +--with-macos-sdk=$(MACOSX_SDK_PATH) \ --disable-glibtest \ --enable-macos-target=$(MACOSX_DEPLOYMENT_TARGET) \ --disable-libxul DEFAULT_MOZILLA_TOOLKIT=mac + .ELSE #We do not need mozilla ui, but libIDL version are decided by default toolkit. #default-toolkit=xlib need libIDL 0.68 @@ -284,7 +277,7 @@ LIBIDL_PREFIX:=$(MOZ_TOOLS)/vc71 .IF $(BUILD_MOZAB)== all: -@echo Never Build Mozilla. + @echo Never Build Mozilla. .ENDIF .INCLUDE : set_ext.mk @@ -352,12 +345,12 @@ $(MISC)$/build$/moztools.complete : $(MISC)$/build$/moztools.unpack zip: \ $(MISC)$/CREATETARBALL -.IF $(GUIBASE)==aqua $(CREATE_UNIVERSAL_MAC_MOZ_ZIP)!= +.IF $(GUIBASE)==aqua MOZ_ARCH=$(eq,$(CPU),I i386 ppc) MOZILLA_CONFIGURE_FLAGS+=$(eq,$(CPU),I --target=i386-apple-darwin8 --target=powerpc-apple-darwin8) force_clean : -@$(IFEXIST) $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) $(THEN) echo 'ERROR: get rid of your outputdir first (or refactor the makefiles to allow incremental creation of prebuilt zips). Remember to copy already created zips to a safe place '; exit 1 $(FI) + @$(IFEXIST) $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) $(THEN) echo 'ERROR: get rid of your outputdir first (or refactor the makefiles to allow incremental creation of prebuilt zips). Remember to copy already created zips to a safe place '; exit 1 $(FI) zip_intel .SEQUENTIAL: force_clean $(MISC)$/CREATETARBALL ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: nss/makefile.mk
nss/makefile.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0ee79ba6a79fa7277b468bdd8918a88aafa6d5f7 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Mon Jan 9 17:39:55 2012 +0100 use absolute path diff --git a/nss/makefile.mk b/nss/makefile.mk index 93cd3d7..4076025 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -150,7 +150,7 @@ OS_TARGET=WIN95 #To build nss one has to call make nss_build_all in #mozilla/security/nss -NSS_BUILD_DIR=$(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/mozilla/security/nss +NSS_BUILD_DIR=$(ABS_PACKAGE_DIR)/$(TARFILE_ROOTDIR)/mozilla/security/nss BUILD_ACTION= PATH=$(moz_build)/msys/bin:$(moz_build)/moztools/bin:$(PATH) $(MOZILLABUILD)/msys/bin/bash -i \ -c cd $(NSS_BUILD_DIR) make nss_build_all ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: nss/makefile.mk
nss/makefile.mk | 62 1 file changed, 31 insertions(+), 31 deletions(-) New commits: commit 7cfb7a449765e774d24dd242629d5742dc87d675 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Wed Jan 4 18:09:44 2012 +0100 get rid of obsolete pathdelimiter escape diff --git a/nss/makefile.mk b/nss/makefile.mk index bc7b827..dbb5f07 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -38,7 +38,7 @@ TARGET=nss .IF $(SYSTEM_NSS)==YES all: -@echo NSS will not be built. Using system one instead. + @echo NSS will not be built. Using system one instead. .ENDIF VER_MAJOR=3 @@ -91,11 +91,11 @@ MACOS_SDK_DIR*=$(MACDEVSDK) .ENDIF # $(EXTRA_CFLAGS)!= .ENDIF # $(OS)==MACOSX -OUT2LIB=mozilla$/dist$/out$/lib$/*$(DLLPOST) mozilla$/dist$/out$/lib$/libcrmf.a +OUT2LIB=mozilla/dist/out/lib/*$(DLLPOST) mozilla/dist/out/lib/libcrmf.a -OUT2BIN=config$/nspr-config mozilla$/security$/nss$/nss-config +OUT2BIN=config/nspr-config mozilla/security/nss/nss-config -BUILD_DIR=mozilla$/security$/nss +BUILD_DIR=mozilla/security/nss BUILD_ACTION= $(GNUMAKE) nss_build_all #See #i105566# moz#513024# .IF $(OS)==LINUX @@ -126,20 +126,20 @@ nss_LIBS= nss_LIBS+=$(MINGW_SHARED_LIBSTDCPP) .ENDIF -BUILD_DIR=mozilla$/security$/nss +BUILD_DIR=mozilla/security/nss BUILD_ACTION=NS_USE_GCC=1 CC=$(nss_CC) CXX=$(nss_CXX) OS_LIBS=$(nss_LIBS) OS_TARGET=WIN95 _WIN32_IE=0x500 PATH=$(PATH) DEFINES=-D_WIN32_IE=0x500 $(GNUMAKE) nss_build_all OUT2LIB= \ -mozilla$/dist$/out$/lib$/libnspr4.a \ -mozilla$/dist$/out$/lib$/libnss3.a \ -mozilla$/dist$/out$/lib$/libnssdbm3.a \ -mozilla$/dist$/out$/lib$/libnssutil3.a \ -mozilla$/dist$/out$/lib$/libplc4.a \ -mozilla$/dist$/out$/lib$/libplds4.a \ -mozilla$/dist$/out$/lib$/libsmime3.a \ -mozilla$/dist$/out$/lib$/libsoftokn3.a \ -mozilla$/dist$/out$/lib$/libsqlite3.a \ -mozilla$/dist$/out$/lib$/libssl3.a +mozilla/dist/out/lib/libnspr4.a \ +mozilla/dist/out/lib/libnss3.a \ +mozilla/dist/out/lib/libnssdbm3.a \ +mozilla/dist/out/lib/libnssutil3.a \ +mozilla/dist/out/lib/libplc4.a \ +mozilla/dist/out/lib/libplds4.a \ +mozilla/dist/out/lib/libsmime3.a \ +mozilla/dist/out/lib/libsoftokn3.a \ +mozilla/dist/out/lib/libsqlite3.a \ +mozilla/dist/out/lib/libssl3.a .ELSE # $(COM)==GCC MOZ_MSVCVERSION= 9 @@ -155,32 +155,32 @@ OS_TARGET=WIN95 #To build nss one has to call make nss_build_all in #mozilla/security/nss -NSS_BUILD_DIR= $(subst,\,/ $(PWD)/$(MISC)/build/$(TARFILE_ROOTDIR)/mozilla/security/nss) -BUILD_ACTION= PATH=$(moz_build)/msys/bin:$(moz_build)/moztools/bin:$(PATH) $(subst,/,$/ $(MOZILLABUILD)/msys/bin/bash) -i \ +NSS_BUILD_DIR=$(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/mozilla/security/nss +BUILD_ACTION= PATH=$(moz_build)/msys/bin:$(moz_build)/moztools/bin:$(PATH) $(MOZILLABUILD)/msys/bin/bash -i \ -c cd $(NSS_BUILD_DIR) make nss_build_all OUT2LIB= \ - mozilla$/dist$/out$/lib$/nspr4.lib \ - mozilla$/dist$/out$/lib$/nss3.lib \ - mozilla$/dist$/out$/lib$/nssdbm3.lib \ - mozilla$/dist$/out$/lib$/nssutil3.lib \ - mozilla$/dist$/out$/lib$/plc4.lib \ - mozilla$/dist$/out$/lib$/plds4.lib \ - mozilla$/dist$/out$/lib$/smime3.lib \ - mozilla$/dist$/out$/lib$/softokn3.lib \ - mozilla$/dist$/out$/lib$/sqlite3.lib \ - mozilla$/dist$/out$/lib$/ssl3.lib + mozilla/dist/out/lib/nspr4.lib \ + mozilla/dist/out/lib/nss3.lib \ + mozilla/dist/out/lib/nssdbm3.lib \ + mozilla/dist/out/lib/nssutil3.lib \ + mozilla/dist/out/lib/plc4.lib \ + mozilla/dist/out/lib/plds4.lib \ + mozilla/dist/out/lib/smime3.lib \ + mozilla/dist/out/lib/softokn3.lib \ + mozilla/dist/out/lib/sqlite3.lib \ + mozilla/dist/out/lib/ssl3.lib .ENDIF # $(COM)==GCC -OUT2BIN=mozilla$/dist$/out$/lib$/*$(DLLPOST) \ - config$/nspr-config \ - mozilla$/security$/nss$/nss-config +OUT2BIN=mozilla/dist/out/lib/*$(DLLPOST) \ + config/nspr-config \ + mozilla/security/nss/nss-config .ENDIF # $(GUI)==WNT -OUTDIR2INC=mozilla$/dist$/public$/nss mozilla$/dist$/out$/include +OUTDIR2INC=mozilla/dist/public/nss mozilla/dist/out/include # --- Targets -- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: nss/makefile.mk
nss/makefile.mk |9 ++--- 1 file changed, 2 insertions(+), 7 deletions(-) New commits: commit 39042cce6685fc9db5ee20957bcc7ac584c28554 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Wed Jan 4 23:36:45 2012 +0100 compile nss against the Mac OSX SDK nss-3.12.8/mozilla/security/coreconf/Darwin.mk claims gcc would pass syslibroot according to passed -isysroot parameter, hence let's try it for now, although I'm not 100% confident in this statement. libs that get linked without syslibroot include libsqlite3.dylib - and that is a known troublemaker⦠diff --git a/nss/makefile.mk b/nss/makefile.mk index dbb5f07..93cd3d7 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -82,13 +82,8 @@ USE_64:=1 .ENDIF # $(OS)$(COM)==LINUXGCC .IF $(OS)==MACOSX -.IF $(EXTRA_CFLAGS)!= -CPP:=gcc -E $(EXTRA_CFLAGS) -CXX:=g++ $(EXTRA_CFLAGS) -CC:=gcc $(EXTRA_CFLAGS) -MACOS_SDK_DIR*=$(MACDEVSDK) -.EXPORT : CPP MACOS_SDK_DIR -.ENDIF # $(EXTRA_CFLAGS)!= +MACOS_SDK_DIR:=$(MACOSX_SDK_PATH) +.EXPORT : MACOS_SDK_DIR .ENDIF # $(OS)==MACOSX OUT2LIB=mozilla/dist/out/lib/*$(DLLPOST) mozilla/dist/out/lib/libcrmf.a ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/ui/unoobj/filtuno.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 47a941847617fd232dc48947b82f2b6a9830a895
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Fri Dec 16 12:39:39 2011 -0600
WaE Mac unitialized value false positive
diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx
index 6c1a651..4fe9f0f 100644
--- a/sc/source/ui/unoobj/filtuno.cxx
+++ b/sc/source/ui/unoobj/filtuno.cxx
@@ -82,7 +82,7 @@ SC_SIMPLE_SERVICE_INFO( ScFilterOptionsObj,
SCFILTEROPTIONSOBJ_IMPLNAME, SCFILTE
static void load_CharSet( rtl_TextEncoding nCharSet, bool bExport )
{
-sal_Int32 nChar;
+sal_Int32 nChar = 0;
SequenceAny aValues;
const Any *pProperties;
SequenceOUString aNames(1);
@@ -101,7 +101,9 @@ static void load_CharSet( rtl_TextEncoding nCharSet, bool
bExport )
{
pProperties[0] = nChar;
if( nChar = 0)
+{
nCharSet = (rtl_TextEncoding) nChar;
+}
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'tinderbox' - local_conf/Error_Parse.pm
local_conf/Error_Parse.pm |1 +
1 file changed, 1 insertion(+)
New commits:
commit 73e7270c6ee48533df3660b397ce625a72c8b7b9
Author: Christian Lohmaier lohmaier+git...@googlemail.com
Date: Sun Dec 18 00:58:56 2011 +0100
add No rule to make target to error-flag-list
diff --git a/local_conf/Error_Parse.pm b/local_conf/Error_Parse.pm
index fcfe5ae..316bfa9 100644
--- a/local_conf/Error_Parse.pm
+++ b/local_conf/Error_Parse.pm
@@ -160,6 +160,7 @@ sub line_type {
($line =~ /jmake.MakerFailedException:/) || # Java error
($line =~ / Warning:/) || # dmake warning
($line =~ / Error:/)|| # dmake error
+($line =~ /\*\*\* No rule to make target/) || # make error
(no rule or failed to build)
0);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - bin/git-new-workdir
bin/git-new-workdir |4
1 file changed, 4 insertions(+)
New commits:
commit d1ac28dfbb741f1771262bf5e19888cb996f2fcd
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date: Fri Dec 16 12:43:06 2011 +0100
when creating linked clone with branch, make sure to ff to the current state
the git-new-workdir helper is mostly useful to have one pristine clone
where the updates get pulled into from that you create working copies.
As pulling to that master copy only updates the current branch (usually
master), checking out a different branch using git-new-workdir will
result in your branch is behind the remote branch by xx commits when
there have been commits after the branch was first checked out locally.
Thus this change adds a fast-forwarding merge when a branch is given.
diff --git a/bin/git-new-workdir b/bin/git-new-workdir
index 3ad2c0c..137ea08 100755
--- a/bin/git-new-workdir
+++ b/bin/git-new-workdir
@@ -80,3 +80,7 @@ cp $git_dir/HEAD .git/HEAD
# checkout the branch (either the same as HEAD from the original repository, or
# the one that was asked for)
git checkout -f $branch
+if test -n $branch
+then
+ git merge --ff-only '@{upstream}'
+fi
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - connectivity/source download
connectivity/source/drivers/postgresql/makefile.mk | 11 ++-
download |3 ++-
2 files changed, 4 insertions(+), 10 deletions(-)
New commits:
commit 968dee3f4e392753d1663d8a5fc2f73e696003e1
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date: Thu Dec 15 15:36:30 2011 +0100
-Wl,-dead_strip_dylibs is not supported with XCode 2.5, align with master
diff --git a/connectivity/source/drivers/postgresql/makefile.mk
b/connectivity/source/drivers/postgresql/makefile.mk
index c99deae..cc6a4df 100644
--- a/connectivity/source/drivers/postgresql/makefile.mk
+++ b/connectivity/source/drivers/postgresql/makefile.mk
@@ -91,16 +91,9 @@ LIBPQ_DEP_LIBS+=\
.ENDIF
.ELSE
LIBPQ_LINK=$(OUTDIR)/lib/libpq.a
-.IF $(OS)==MACOSX
-LIBPQ_DEP_LIBS += -Wl,-dead_strip_dylibs
-.ELSE
-LIBPQ_DEP_LIBS += -Wl,--as-needed
-.ENDIF
+LIBPQ_DEP_LIBS+=$(eq,$(OS),MACOSX $(NULL) -Wl,--as-needed)
.INCLUDE : $(OUTDIR_FOR_BUILD)/inc/postgresql/libpq-flags.mk
-.IF $(OS)==MACOSX
-.ELSE
-LIBPQ_DEP_LIBS += -Wl,--no-as-needed
-.ENDIF
+LIBPQ_DEP_LIBS+=$(eq,$(OS),MACOSX $(NULL) -Wl,--no-as-needed)
.ENDIF
POSTGRESQL_INC=-I$(OUTDIR)/inc/postgresql
POSTGRESQL_LIB=
commit c3add9d8919a8d10a695cb69c513d94aa1a8f757
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date: Thu Dec 15 14:18:19 2011 +0100
when using linked git, use the same branch as the main repo
diff --git a/download b/download
index c889a46..cf9f8c1 100755
--- a/download
+++ b/download
@@ -52,8 +52,9 @@ if [ -d .git ] ; then
else
# space-saving clone from another local workdir
mkdir clone
+branch=$(git symbolic-ref HEAD | cut -d/ -f 3)
for i in $GIT_REPO_NAMES ; do
-bin/git-new-workdir $GIT_LINK_SRC/$i clone/$i
+bin/git-new-workdir $GIT_LINK_SRC/$i clone/$i $branch
for d in clone/$i/* ; do
if [ ${d} != clone/$i/git-hooks ]; then
ln -sfn ${d} $(basename ${d})
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'tinderbox' - 4 commits - bin/get-latest-master.pl bin/get-taglists.pl bin/tinderupdate.sh lib/TinderDB local_conf/Error_Parse.pm local_conf/TreeData.pm
bin/get-latest-master.pl | 143 --
bin/get-taglists.pl | 39
bin/tinderupdate.sh |2
lib/TinderDB/VC_OOo.pm| 15
local_conf/Error_Parse.pm | 21 ++
local_conf/TreeData.pm| 103 +
6 files changed, 37 insertions(+), 286 deletions(-)
New commits:
commit 0661bfa636e93d73fdb9c8a1eb47c48a286080de
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date: Wed Dec 14 19:09:11 2011 +0100
add some more false positives
diff --git a/local_conf/Error_Parse.pm b/local_conf/Error_Parse.pm
index ee6e232..fcfe5ae 100644
--- a/local_conf/Error_Parse.pm
+++ b/local_conf/Error_Parse.pm
@@ -275,10 +275,31 @@ sub line_type {
# some more filenames that cause a false trigger
($line =~ m#^/bin/sh \.\./\.\./libtool
--tag=CXX.*DynamicLibraryManagerException\.lo Exception\.lo#) ||
($line =~
m#^boost_1_39_0/(boost(/tr1/tr1(/sun)?)?|libs(/unordered/test)?)/exception(\.|/)?#)
||
+($line =~
m#^boost_1_44_0/(boost(/tr1/tr1(/sun)?)?|libs(/unordered/test)?)/exception(\.|/)?#)
||
($line =~
m#^commons-lang-2\.3-src/src/(java|test)/org/apache/commons/lang/exception/#) ||
($line =~
m#^commons-httpclient-3\.1/docs/exception-handling\.html#) ||
# annoying configure messages
($line =~ m#^checking (if|whether).*/bin/rm: cannot remove
`conftest\*´: No such file or directory$#) ||
+($line =~ m#^checking for -Bsymbolic-functions linker
support \.\.\. not found#) ||
+# gettext related
+($line =~ m#^checking where term(info|cap) library
functions come from\.\.\. not found, consider installing GNU ncurses#) ||
+($line =~ m#^ CC (error-progname|fatal-signal).lo#) ||
+($line =~ m#^ CCLD (gdbus-)?error#) ||
+# libgsf related
+($line =~ m#^configure: WARNING: thumbnailer will not be
built, unable to find gconftool-2#) ||
+# rules in instsetoo_native/util/makefile.mk
+($line =~ m#^dmake: makefile\.mk: line (222|277):
Warning: -- Prior to dmake 4\.5 only one#) ||
+# odk - subclass copying where no subclass exists
+($line =~ m#^cp:
.*/class/com/sun/star/lib/loader/WinRegKey(Exception)?\$\*\.class'?: No such
file or directory#) ||
+# gbuildified modules - filenames
+($line =~ m#^\[ build IDL \]
udkapi/com/sun/star/uno/Exception\.urd#) ||
+# gentoo-box
+($line =~ m#^checking dynamic linker characteristics\.\.\.
cat: ld\.so\.conf\.d/\*\.conf: No such file or directory#) ||
+($line =~ m#^((\.\./)?\.)?\./libtool: line [0-9]+: cd:
\.\./lib: No such file or directory#) ||
+# SuSE box
+($line =~
m#\.\./\.\./dist/include/xpcom_obsolete/nsFileStream\.h: In member function
'PRBool nsErrorProne::failed\(\) const':$#) ||
+# system-libs
+($line =~ m#^Therefore the version provided here does not
need to be built in addition\.#) ||
0);
commit 30a6484aa57db139c699bcb2b020df73cef381db
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date: Wed Dec 14 16:30:02 2011 +0100
no need for grouping by cws-status anymore, create LibreOffice group instead
diff --git a/local_conf/TreeData.pm b/local_conf/TreeData.pm
index 9551abc..dd99d52 100644
--- a/local_conf/TreeData.pm
+++ b/local_conf/TreeData.pm
@@ -226,11 +226,23 @@ $VERSION = '#tinder_version#';
branch = 'trunk',
},
'MASTER' = {
- root =
'git://anongit.freedesktop.org/git/libreoffice/bootstrap',
+ root =
'git://anongit.freedesktop.org/git/libreoffice/core',
module = 'all',
branch = 'master',
VCS = 'GIT',
},
+'libreoffice-3-5' = {
+ root =
'git://anongit.freedesktop.org/git/libreoffice/core',
+ module = 'all',
+ branch = 'libreoffice-3-5',
+ VCS = 'GIT',
+ },
+'libreoffice-3-4' = {
+ root =
'git://anongit.freedesktop.org/git/libreoffice/core',
+ module = 'all',
+ branch = 'libreoffice-3-4',
+ VCS = 'GIT',
+ },
);
# We group trees into sets so that individual managers can get a page
@@ -250,96 +262,13 @@ $VERSION = '#tinder_version#';
# },
);
-my %count_trees_by_master = ();
-sub
[Libreoffice-commits] .: connectivity/source cppuhelper/test lingucomponent/source
connectivity/source/drivers/postgresql/makefile.mk | 11 ++- cppuhelper/test/bootstrap/makefile.mk |2 +- lingucomponent/source/languageguessing/makefile.mk |6 +++--- 3 files changed, 6 insertions(+), 13 deletions(-) New commits: commit 89b4260fc9ddc39ebc36ea44723f101aabf1d043 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue Dec 13 01:59:12 2011 +0100 GUI is also UNX for Mac, to check for Mac use either OSâMACOSX or GUIBASEâaqua diff --git a/connectivity/source/drivers/postgresql/makefile.mk b/connectivity/source/drivers/postgresql/makefile.mk index 3f9bfb5..1fd0481 100644 --- a/connectivity/source/drivers/postgresql/makefile.mk +++ b/connectivity/source/drivers/postgresql/makefile.mk @@ -91,16 +91,9 @@ LIBPQ_DEP_LIBS+=\ .ENDIF .ELSE LIBPQ_LINK=$(OUTDIR)/lib/libpq.a -.IF $(GUI)==MAC -LIBPQ_DEP_LIBS += -Wl,-dead_strip_dylibs -.ELSE -LIBPQ_DEP_LIBS += -Wl,--as-needed -.ENDIF +LIBPQ_DEP_LIBS+=$(eq,$(OS),MACOSX -Wl,-dead_strip_dylibs -Wl,--as-needed) .INCLUDE : $(OUTDIR_FOR_BUILD)/inc/postgresql/libpq-flags.mk -.IF $(GUI)==MAC -.ELSE -LIBPQ_DEP_LIBS += -Wl,--no-as-needed -.ENDIF +LIBPQ_DEP_LIBS+=$(eq,$(OS),MACOSX $(NULL) -Wl,--no-as-needed) .ENDIF POSTGRESQL_INC=-I$(OUTDIR)/inc/postgresql POSTGRESQL_LIB= diff --git a/cppuhelper/test/bootstrap/makefile.mk b/cppuhelper/test/bootstrap/makefile.mk index 86665df..d1caeba 100644 --- a/cppuhelper/test/bootstrap/makefile.mk +++ b/cppuhelper/test/bootstrap/makefile.mk @@ -37,7 +37,7 @@ USE_DEFFILE:= TRUE .INCLUDE : settings.mk -.IF $(GUI)==UNX || $(GUI)==MAC +.IF $(GUI)==UNX PURPENVHELPERLIB := -luno_purpenvhelper$(COMID) .ELSE diff --git a/lingucomponent/source/languageguessing/makefile.mk b/lingucomponent/source/languageguessing/makefile.mk index 5fe1945..65036db 100644 --- a/lingucomponent/source/languageguessing/makefile.mk +++ b/lingucomponent/source/languageguessing/makefile.mk @@ -39,19 +39,19 @@ VISIBILITY_HIDDEN=TRUE # --- Files -.IF $(GUI)==UNX || $(GUI)==MAC +.IF $(GUI)==UNX .IF $(SYSTEM_LIBEXTTEXTCAT) == YES LIBTEXTCATLIB=$(LIBEXTTEXTCAT_LIBS) .ELSE LIBTEXTCATLIB=-lexttextcat .ENDIF -.ELSE # $(GUI)==UNX || $(GUI)==MAC +.ELSE # $(GUI)==UNX .IF $(COM)==GCC LIBTEXTCATLIB=-lilibexttextcat .ELSE LIBTEXTCATLIB=ilibexttextcat.lib .ENDIF -.ENDIF # $(GUI)==UNX || $(GUI)==MAC +.ENDIF # $(GUI)==UNX SLOFILES = \ $(SLO)$/altstrfunc.obj \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/unx
desktop/unx/source/start.c |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 17f977c104374eedd5638aadc3175dda88ad6360
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date: Tue Nov 8 14:40:07 2011 +0100
remove leftover comment regarding removed Mac OSX conditional
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index 29cda81..cd95d45 100644
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -645,7 +645,6 @@ static char *build_pagein_path (Args *args, const char
*pagein_name)
void
exec_pagein (Args *args)
{
-// no pagein for the while on OSX
char *argv[3];
/* don't use -L - since that does a chdir that breaks relative paths */
@@ -698,7 +697,7 @@ static void
exec_javaldx (Args *args)
{
#ifndef SOLAR_JAVA
- return;
+return;
#endif
char newpath[4096];
sal_uInt32 nArgs;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: post_download.in
post_download.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 39a2372a125e619186a243eec1b2828f5bd41b2b Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Mon Nov 7 18:08:11 2011 +0100 require autoconf = 2.59 to please MAC OSX 10.4 diff --git a/post_download.in b/post_download.in index 6025d38..34aeba8 100644 --- a/post_download.in +++ b/post_download.in @@ -1,5 +1,5 @@ AC_INIT([LibreOffice],[3.5],[],[],[http://documentfoundation.org/]) -AC_PREREQ([2.61]) +AC_PREREQ([2.59]) echo echo * ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
