Initial commit to get a handful of third_party packages building properly under Linux. Uses some temporary shims to detect platform and omit processing of some stuff that doesn't seem to work for me.

As previously discussed, I'm just doing whatever's expedient to getting *something* building under Linux, since we decided with the current state of Chrome head (with the upcoming freeze and release branch) it would be too disruptive to try to land all the latest site_scons in Chrome's copy.  The main thing to note is the SConscript.main.linux file which uses

  #/../third_party/*

instead of

  #/$BUILD_ROOT/third_party/*

and then uses variant_dir in the env.SConscript() call at the bottom to explicitly emit output into Hammer/third_party/*.  If either of these hacks is absent, scons under Linux simply concludes that all targets are up to date (there's nothing to build).  Explanations for this behavior or alternative workarounds are welcome.  Alternatively we could just commit this as-is and let someone with more knowledge of SCons internals try to debug it under Linux.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 56 insertions, 24 deletions

diff --git a/third_party/bsdiff/SConscript b/third_party/bsdiff/SConscript
index adcf647..424139c 100644
--- a/third_party/bsdiff/SConscript
+++ b/third_party/bsdiff/SConscript
@@ -27,6 +27,9 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 

+# TODO(keunwoo): Use better cross-platform abstraction; see chrome/SConstruct

+Import('PLATFORM')

+

 Import('env')

 

 env = env.Clone()

@@ -37,12 +40,13 @@ env.Prepend(
     ]

 )

 

-env.Append(

+if PLATFORM == 'WINDOWS':

+  env.Append(

     CCFLAGS = [

         '/TP',

         '/wd4800',

     ],

-)

+  )

 

 input_files = [

     "mbsdiff.cc",

diff --git a/third_party/bspatch/SConscript b/third_party/bspatch/SConscript
index 0df2882..cdd079f 100644
--- a/third_party/bspatch/SConscript
+++ b/third_party/bspatch/SConscript
@@ -27,6 +27,9 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 

+# TODO(keunwoo): Use better cross-platform abstraction; see chrome/SConstruct

+Import('PLATFORM')

+

 Import('env')

 

 env = env.Clone(

@@ -42,11 +45,14 @@ env.Append(
     CPPDEFINES = [

         '_LZMA_IN_CB',

     ],

+)

+if PLATFORM == 'WINDOWS':

+  env.Append(

     CCFLAGS = [

         '/TP',

         '/wd4800',

     ],

-)

+  )

 

 input_files = [

     'mbspatch.cc',

diff --git a/third_party/bzip2/SConscript b/third_party/bzip2/SConscript
index 1457400..0ff0fab 100644
--- a/third_party/bzip2/SConscript
+++ b/third_party/bzip2/SConscript
@@ -27,16 +27,23 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 

+# TODO(keunwoo): Use better cross-platform abstraction; see chrome/SConstruct

+Import('PLATFORM')

+

 Import('env')

 

 env = env.Clone()

 

+if PLATFORM == 'WINDOWS':

+  env.Append(

+      CCFLAGS = [

+          '/TC',

+          '/wd4996',

+          '/wd4800',

+      ],

+  )

+

 env.Append(

-    CCFLAGS = [

-        '/TC',

-        '/wd4996',

-        '/wd4800',

-    ],

     CPPDEFINES = [

         'BZ_NO_STDIO',

     ],

diff --git a/third_party/libjpeg/SConscript b/third_party/libjpeg/SConscript
index 3c5399c..3bd48d4 100644
--- a/third_party/libjpeg/SConscript
+++ b/third_party/libjpeg/SConscript
@@ -27,6 +27,9 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 

+# TODO(keunwoo): Use better cross-platform abstraction; see chrome/SConstruct

+Import('PLATFORM')

+

 Import('env')

 

 env = env.Clone()

@@ -37,12 +40,13 @@ env.Prepend(
     ],

 )

 

-env.Append(

-    CCFLAGS = [

-        '/TC',

-        '/wd4800',

-    ],

-)

+if PLATFORM == 'WINDOWS':

+  env.Append(

+      CCFLAGS = [

+          '/TC',

+          '/wd4800',

+      ],

+  )

 

 input_files = [

     'jcapimin.c',

diff --git a/third_party/libpng/SConscript b/third_party/libpng/SConscript
index ad6bdf9..dd3066a 100644
--- a/third_party/libpng/SConscript
+++ b/third_party/libpng/SConscript
@@ -27,6 +27,9 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 

+# TODO(keunwoo): Use better cross-platform abstraction; see chrome/SConstruct

+Import('PLATFORM')

+

 Import('env')

 

 env = env.Clone()

@@ -38,11 +41,15 @@ env.Prepend(
     ],

 )

 

+if PLATFORM == 'WINDOWS':

+  env.Append(

+      CCFLAGS = [

+          '/TP',

+          '/wd4800',

+      ],

+  )

+

 env.Append(

-    CCFLAGS = [

-        '/TP',

-        '/wd4800',

-    ],

     CPPDEFINES = [

         'PNG_USER_CONFIG',

         'CHROME_PNG_WRITE_SUPPORT',

diff --git a/third_party/zlib/SConscript b/third_party/zlib/SConscript
index 5a7de33..08f66c6 100644
--- a/third_party/zlib/SConscript
+++ b/third_party/zlib/SConscript
@@ -27,16 +27,20 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 

+# TODO(keunwoo): Use better cross-platform abstraction; see chrome/SConstruct

+Import('PLATFORM')

+

 Import('env')

 

 env = env.Clone()

 

-env.Append(

-    CCFLAGS = [

-        '/TC',

-        '/wd4800',

-    ],

-)

+if PLATFORM == 'WINDOWS':

+  env.Append(

+      CCFLAGS = [

+          '/TC',

+          '/wd4800',

+      ],

+  )

 

 input_files = [

     'adler32.c',