This is the mail archive of the
ecos-patches@sources.redhat.com
mailing list for the eCos project.
[APPROVE?] Disable use of "make -j<n>" in configtool for 2.0b1 release
- From: John Dallaway <jld at ecoscentric dot com>
- To: ecos-patches at sources dot redhat dot com
- Date: Thu, 6 Mar 2003 10:47:15 +0000
- Subject: [APPROVE?] Disable use of "make -j<n>" in configtool for 2.0b1 release
- Organization: eCosCentric Limited
This patch disables the use of the "-j<n>" switch on the make command line
when building eCos with the wxWindows configtool. This is a temporary
measure to workaround problems with Cygwin 1.3.18 on SMP hosts. eCos 2.0
release branch only. Approval requested.
John Dallaway
eCosCentric Limited
--cut here--
Index: ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/host/tools/configtool/ChangeLog,v
retrieving revision 1.32.2.5
diff -u -5 -r1.32.2.5 ChangeLog
--- ChangeLog 25 Feb 2003 17:31:18 -0000 1.32.2.5
+++ ChangeLog 6 Mar 2003 10:41:41 -0000
@@ -1,5 +1,10 @@
+2003-03-06 John Dallaway <jld at ecoscentric dot com>
+
+ * appsettings.cpp: Disable use of "make -j<n>" for eCos builds in
+ 2.0b1 release due to problems with Cygwin 1.3.18.
+
2003-02-25 John Dallaway <jld at ecoscentric dot com>
* standalone/wxwin/makefile.gnu: No need to specify -L /usr/lib for
Linux builds.
Index: standalone/wxwin/appsettings.cpp
===================================================================
RCS file: /cvs/ecos/ecos/host/tools/configtool/standalone/wxwin/appsettings.cpp,v
retrieving revision 1.7
diff -u -5 -r1.7 appsettings.cpp
--- standalone/wxwin/appsettings.cpp 13 Feb 2003 16:23:38 -0000 1.7
+++ standalone/wxwin/appsettings.cpp 6 Mar 2003 10:41:43 -0000
@@ -107,11 +107,11 @@
m_showConflictsWindow = FALSE;
m_showPropertiesWindow = TRUE;
m_showShortDescrWindow = TRUE;
m_showMemoryWindow = FALSE;
m_showOutputWindow = TRUE;
-
+
m_showMacroNames = FALSE;
m_bUseCustomViewer = FALSE;
m_bUseExternalBrowser = FALSE;
m_eUseCustomBrowser = ecAssociatedExternal;
@@ -255,11 +255,11 @@
config.Read(_("/Window Size/WindowX"), & m_frameSize.x);
config.Read(_("/Window Size/WindowY"), & m_frameSize.y);
config.Read(_("/Window Size/WindowWidth"), & m_frameSize.width);
config.Read(_("/Window Size/WindowHeight"), & m_frameSize.height);
-
+
config.Read(_("/Window Size/TreeSashWidth"), & m_treeSashSize.x);
config.Read(_("/Window Size/TreeSashHeight"), & m_treeSashSize.y);
config.Read(_("/Window Size/ConfigPaneWidth"), & m_configPaneWidth);
config.Read(_("/Window Size/ConflictsWidth"), & m_conflictsSashSize.x);
config.Read(_("/Window Size/ConflictsHeight"), & m_conflictsSashSize.y);
@@ -318,11 +318,12 @@
if (!config.Read(_("/Build/Make Options"), & m_strMakeOptions))
{
#ifdef __WXMSW__
SYSTEM_INFO SystemInfo;
GetSystemInfo(&SystemInfo);
- m_strMakeOptions.Printf(_T("-j%d"),SystemInfo.dwNumberOfProcessors);
+// disable -j option for now due to problem with Cygwin 1.3.18
+// m_strMakeOptions.Printf(_T("-j%d"),SystemInfo.dwNumberOfProcessors);
#endif
}
// Set default build tools binary directories as specified by the installer
ecFileName strDefaultBuildToolsPath;