You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by st...@apache.org on 2013/02/01 09:46:35 UTC
svn commit: r1441343 [2/35] - in /openoffice/branches/ia2: ./
ext_libraries/apr-util/ ext_libraries/apr/ ext_sources/
extras/l10n/source/ast/ extras/l10n/source/da/ extras/l10n/source/eu/
extras/l10n/source/gd/ extras/l10n/source/ko/ extras/l10n/source...
Propchange: openoffice/branches/ia2/
------------------------------------------------------------------------------
Merged /openoffice/trunk:r1418193-1439794
Merged /openoffice/branches/alg/clibboard:r1428975-1437368
Modified: openoffice/branches/ia2/ext_libraries/apr-util/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/ext_libraries/apr-util/makefile.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/ext_libraries/apr-util/makefile.mk (original)
+++ openoffice/branches/ia2/ext_libraries/apr-util/makefile.mk Fri Feb 1 08:46:00 2013
@@ -62,7 +62,7 @@ CONFIGURE_FLAGS=
BUILD_DIR=$(CONFIGURE_DIR)
BUILD_ACTION=$(GNUMAKE)
-BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+#BUILD_FLAGS+= -j$(EXTMAXPROCESS)
.ELIF "$(GUI)" == "OS2"
Modified: openoffice/branches/ia2/ext_libraries/apr/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/ext_libraries/apr/makefile.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/ext_libraries/apr/makefile.mk (original)
+++ openoffice/branches/ia2/ext_libraries/apr/makefile.mk Fri Feb 1 08:46:00 2013
@@ -66,8 +66,8 @@ CONFIGURE_ACTION=.$/configure --prefix=$
CONFIGURE_FLAGS=
BUILD_DIR=$(CONFIGURE_DIR)
-BUILD_ACTION=$(GNUMAKE)
-BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+BUILD_ACTION=$(GNUMAKE) --debug=b
+#BUILD_FLAGS+= -j$(EXTMAXPROCESS)
# Make apr-1-config believe that apr has been installed.
INSTALL_ACTION=if [ -f apr-1-config.orig ]; then mv -f apr-1-config.orig apr-1-config; fi; \
Modified: openoffice/branches/ia2/ext_sources/.gitignore
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/ext_sources/.gitignore?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/ext_sources/.gitignore (original)
+++ openoffice/branches/ia2/ext_sources/.gitignore Fri Feb 1 08:46:00 2013
@@ -1,2 +1 @@
-/fetch.log
-
+*