[csw-devel] SF.net SVN: gar:[7536] csw/mgar/pkg/chromium/trunk

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Wed Dec 2 14:05:15 CET 2009


Revision: 7536
          http://gar.svn.sourceforge.net/gar/?rev=7536&view=rev
Author:   wahwah
Date:     2009-12-02 13:05:15 +0000 (Wed, 02 Dec 2009)

Log Message:
-----------
chromium: First few bits.

Modified Paths:
--------------
    csw/mgar/pkg/chromium/trunk/Makefile
    csw/mgar/pkg/chromium/trunk/files/xml_dom_minidom_test.py

Added Paths:
-----------
    csw/mgar/pkg/chromium/trunk/files/IDLParser.pm-gcc.patch.patch
    csw/mgar/pkg/chromium/trunk/files/make-css-file-arrays.pl-gcc.patch
    csw/mgar/pkg/chromium/trunk/files/make-shell.patch
    csw/mgar/pkg/chromium/trunk/files/make_names.pl-gcc.patch

Modified: csw/mgar/pkg/chromium/trunk/Makefile
===================================================================
--- csw/mgar/pkg/chromium/trunk/Makefile	2009-12-02 12:37:53 UTC (rev 7535)
+++ csw/mgar/pkg/chromium/trunk/Makefile	2009-12-02 13:05:15 UTC (rev 7536)
@@ -2,182 +2,28 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-## This file contains comments to guide you through various GAR settings.
-## Please remove unnecessary comments before committing your code to the code
-## repository. The comments to remove are marked with double hashes.
-## If you want to remove them all in-place, use:
-## gsed -i -e '/^##/d' Makefile
-##
-## For more information about GAR variables, please see:
-## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference
-##
 GARNAME = chromium
 CHROMIUM_REVISION = 32797
 GARVERSION = 0.$(CHROMIUM_REVISION)
-##
-## The category that your software fits in. This is not a descriptive field, but
-## influences the build process. Depending on the CATEGORIES setting, different
-## Makefiles are included from gar/categories/ in your trunk directory, which
-## adjust the build settings for the respective category.
-##
-## Possible settings are:
-## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server,
-## utils, x11, xfce, xorg, xtra
 CATEGORIES = lib
-##
-## A one-line description of the package, which will appear in the pkginfo.
 DESCRIPTION = An open-source web browser
-##
-## A longer description of the package. This is only for descriptive purposes
-## inside the Makefile and is not used elsewhere.
 define BLURB
 endef
-##
-## Upstream URL that should show up in the VENDOR field as well as on
-## http://opencsw.org/packages/<packagename>.
 SPKG_SOURCEURL =
-##
-## Whitespace-separated list of URLs to download the source package from.
-## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR).
 MASTER_SITES = http://build.chromium.org/buildbot/archives/
-##
-## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the
-## Sourceforge project name differs from $(GARNAME). Specifies the Sourceforge
-## project name of the software you wish to download.
-## SF_PROJ =
-##
-## A list of space separated patch filenames from files/ that are to be applied
-## to the extracted software before the ./configure stage. Patches need to be
-## included in the DISTFILES variable as well.
-## PATCHFILES =
-##
-## Whitespace-separated list of files which comprise this build. mGAR will look
-## for the files in the $(FILEDIR) (trunk/files) directory and on the
-## $(MASTER_SITES).
 # DISTFILES  = chromium.r$(CHROMIUM_REVISION).tgz
 DISTFILES   =
-##
-## We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-##
-## Catalog name is the name to be used with pkg{-get,util} -i <pkgname>.
-## It is different from the system package name, which by convention is CSWpkgname.
-## CATALOGNAME =
-##
-## Set to 1 to mark the package as architecture-independent.
-## ARCHALL = 0
-##
-## A list of files / patterns that should be excluded from the package. Amends
-## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which
-## contains things like libtool .la files and files with a leading ~.
-## EXTRA_MERGE_EXCLUDE_FILES =
-##
-## A list of space separated package names that should be marked as
-## incompatible with the current package. This will go into the depend file.
-## When a user has one of the incompatible packages installed and installs
-## your package, he will be prompted that the incompatible package must be
-## removed. He will however not be prevented to install your package without
-## removing the conflicting package first.
-## INCOMPATIBLE_PKGS =
-##
-##  The name of the license file that should be included in your package. Defaults
-##  to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details
-##  on including and displaying licenses.
-## LICENSE =
-##
-## A list of space separated package names that should be produced from your
-## Makefile. This is used when a software has different components that can be
-## packaged and used individually (think runtime libraries, client tools, server
-## files, development headers). You don't need to set this when you just want to
-## produce one package.
-##
-## When you set this variable to include more than one package, you also need to
-## set PKGFILES_CSWpkgname for each package (except for the first one in your
-## $(PACKAGES) list) to define which files go into each package. The first
-## package from $(PACKAGES) one will hold all files that are not matched by
-## PKGFILES_ for other packages.
-## PACKAGES =
-##
-## If specified, GAR feeds the almost-final package prototype file to
-## $(PROTOTYPE_FILTER) and reads the final package prototype file from it.
-## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used
-## to prepare the prototype file for use with cswclassutils (see
-## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils,
-## you will rarely have to use this. A still valid use case would be to change
-## the file permissions of a file to be set-UID.
-## See http://wiki.opencsw.org/cswclassutils-package for common usage information
-## PROTOTYPE_FILTER =
-##
-## cswclassutils settings
-##
-## A list of action classes. Possible values are:
-## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf
-##	cswinetd cswetcservices
-## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils,
-## you need to add CSWcswclassutils to REQUIRED_PKGS.
-## SPKG_CLASSES = none
-## Simplified settings for classes:
-## PRESERVECONF =
-## SAMPLECONF =
-## INITSMF =
-## USERGROUP =
-## ETCSERVICES = <file containing an entry for /etc/services>
-## INETDCONF = <file containing an inetd.conf formatted entry>
-## A list of runtime package dependencies in the form of CSWfoo.
 REQUIRED_PKGS = CSWnspr CSWnss CSWffmpeg
-##
-## A list of packages necessary to build this package
-PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWnspr-devel CSWlibxcbdevel CSWffmpeg
-##
-## When using non-empty $(PACKAGES):
-## REQUIRED_PKGS_CSWpkgname =
-## SPKG_DESC_CSWpkgname =
-## PKGFILES_CSWpkgname =
-## CATALOGNAME_CSWpkgname =
-##
-## A list of space separated directories where objects should be stripped in
-## addition to the bin/ and sbin/ directories.
-## STRIP_DIRS =
-##
-## Define a custom target for the configure phase. When you set this, the target
-## that will be used instead of configure: target, is named
-## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile
-## after including gar/gar.include.mk. If you want to skip the configure phase
-## completely (for example when your software doesn't need to be compiled) assign
-## this variable an empty value. The procedure works for configure, build,
-## install and test steps.
+# CSWpyxml must be uninstalled
+PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWnspr-devel CSWlibxcbdevel CSWffmpeg CSWgperf CSWpython
 CONFIGURE_SCRIPTS = chromium
-BUILD_SCRIPTS = chromium
-INSTALL_SCRIPTS = chromium
-TEST_SCRIPTS = chromium
-##
-## Compilation settings
-##
-## The build directory.
-## WORKSRC = $(WORKDIR)/$(GARNAME)-$(GARVERSION)
-##
-## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this
-## for example, if you need to override Makefile variables.
-## BUILD_ARGS =
-##
-## Arguments passed to the ./configure script.
-## CONFIGURE_ARGS = $(DIRPATHS)
-##
-## BUILD64 =
-## CONFIGURE_ENV =
-## EXTRA_CFLAGS =
-## EXTRA_LDFLAGS =
-## EXTRA_INC =
-## EXTRA_LIB =
-## GARFLAVOR =
-## INSTALL_ARGS =
-## OPT_FLAGS_SOS = -xO3
-## OPT_FLAGS_GCC = -O2 -pipe
-##
-## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4.
-## GARCOMPILER = SOS11
-##
+BUILD_SCRIPTS     = chromium
+INSTALL_SCRIPTS   = chromium
+TEST_SCRIPTS      = chromium
 
+GIT_URI = git://git.chromium.org/chromium.git
+
 GYP_GENERATORS = make
 export GYP_GENERATORS
 
@@ -189,25 +35,29 @@
 
 GARCOMPILER = GNU
 
-# Because of bashisms in Makefiles in Chromium
-SHELL = /opt/csw/bin/bash
+# # Because of bashisms in Makefiles in Chromium
+# SHELL = /opt/csw/bin/bash
 
+# TODO: Make V8 realize it's a known architecture.
+# EXTRA_CFLAGS = -DV8_TARGET_ARCH_IA32
+# EXTRA_CXXFLAGS = -DV8_TARGET_ARCH_IA32
+
 include gar/category.mk
 
 $(WORKSRC)/.gclient:
-	(cd $(WORKSRC) && \
-		PATH=$$PATH:$(abspath $(WORKDIR)/depot_tools) \
-		GYP_GENERATORS=make \
+	(cd $(WORKSRC) \
+	    && \
+	PATH=$$PATH:$(abspath $(WORKDIR)/depot_tools) \
 	gclient config http://src.chromium.org/svn/trunk/src)
 
 post-extract-modulated:
 	mkdir -p $(WORKSRC)
 	(cd $(WORKSRC) \
-		&& \
+	    && \
 	if [ -d src ]; then \
 	  (cd src && git fetch ); \
 	else \
-	  git clone git://git.chromium.org/chromium.git src; \
+	  git clone $(GIT_URI) src; \
 	fi)
 	@$(MAKECOOKIE)
 
@@ -216,14 +66,18 @@
 # I don't think there's anything platform-specific for Solaris in the source
 # code repository.
 
-configure-chromium: depot-tools gclient-sync
+configure-chromium: prerequisite-tests depot-tools gclient-sync
 
+prerequisite-tests:
+	python files/xml_dom_minidom_test.py
+	@$(MAKECOOKIE)
+
 gclient-sync: $(WORKSRC)/.gclient
 	(cd $(WORKSRC) \
 		&& \
-		PATH=$$PATH:$(abspath $(WORKDIR)/depot_tools):/opt/csw/gcc4/bin \
-		GYP_DEFINES="use_system_ffmpeg=1" \
-		GYP_GENERATORS=make \
+	PATH=$(PATH):$(abspath $(WORKDIR)/depot_tools) \
+	GYP_DEFINES="use_system_ffmpeg=1" \
+	GYP_GENERATORS=make \
 	gclient sync --revision src@$(CHROMIUM_REVISION))
 	# gclient sync)
 	@$(MAKECOOKIE)
@@ -231,15 +85,15 @@
 gclient-runhooks: $(WORKSRC)/.gclient
 	(cd $(WORKSRC) \
 		&& \
-		PATH=$$PATH:$(abspath $(WORKDIR)/depot_tools):/opt/csw/gcc4/bin \
-		GYP_GENERATORS=make \
-		GYP_DEFINES="use_system_ffmpeg=1" \
+	PATH=$(PATH):$(abspath $(WORKDIR)/depot_tools) \
+	GYP_GENERATORS=make \
+	GYP_DEFINES="use_system_ffmpeg=1" \
 	gclient runhooks --force)
 	@$(MAKECOOKIE)
 
 depot-tools:
 	(cd $(WORKDIR) \
-		&& \
+	    && \
 	 if [ -d depot_tools ]; then \
 	   (cd depot_tools; svn up); \
 	 else \
@@ -253,3 +107,5 @@
 		&& \
 	PATH=$$PATH:$(abspath $(WORKDIR)/depot_tools):/opt/csw/gcc4/bin \
 	gmake $(PARALLELMFLAGS) chrome)
+	false
+	@$(MAKECOOKIE)

Added: csw/mgar/pkg/chromium/trunk/files/IDLParser.pm-gcc.patch.patch
===================================================================
--- csw/mgar/pkg/chromium/trunk/files/IDLParser.pm-gcc.patch.patch	                        (rev 0)
+++ csw/mgar/pkg/chromium/trunk/files/IDLParser.pm-gcc.patch.patch	2009-12-02 13:05:15 UTC (rev 7536)
@@ -0,0 +1,11 @@
+--- src/third_party/WebKit/WebCore/bindings/scripts/IDLParser.pm.orig	2009-11-28 10:25:59.122473741 +0000
++++ src/third_party/WebKit/WebCore/bindings/scripts/IDLParser.pm	2009-11-28 10:26:07.807234188 +0000
+@@ -64,7 +64,7 @@
+     $parentsOnly = shift;
+ 
+     if (!$preprocessor) {
+-        $preprocessor = "/usr/bin/gcc -E -P -x c++";
++        $preprocessor = "/opt/csw/gcc4/bin/gcc -E -P -x c++";
+     }
+ 
+     if (!$defines) {

Added: csw/mgar/pkg/chromium/trunk/files/make-css-file-arrays.pl-gcc.patch
===================================================================
--- csw/mgar/pkg/chromium/trunk/files/make-css-file-arrays.pl-gcc.patch	                        (rev 0)
+++ csw/mgar/pkg/chromium/trunk/files/make-css-file-arrays.pl-gcc.patch	2009-12-02 13:05:15 UTC (rev 7536)
@@ -0,0 +1,11 @@
+--- src/third_party/WebKit/WebCore/css/make-css-file-arrays.pl.orig	2009-11-28 10:22:54.972192369 +0000
++++ src/third_party/WebKit/WebCore/css/make-css-file-arrays.pl	2009-11-28 10:23:20.152912664 +0000
+@@ -28,7 +28,7 @@
+ GetOptions('preprocessor=s' => \$preprocessor);
+ 
+ if (!$preprocessor) {
+-    $preprocessor = "/usr/bin/gcc -E -P -x c++";
++    $preprocessor = "/opt/csw/gcc4/bin/gcc -E -P -x c++";
+ }
+ 
+ my $header = $ARGV[0];

Added: csw/mgar/pkg/chromium/trunk/files/make-shell.patch
===================================================================
--- csw/mgar/pkg/chromium/trunk/files/make-shell.patch	                        (rev 0)
+++ csw/mgar/pkg/chromium/trunk/files/make-shell.patch	2009-12-02 13:05:15 UTC (rev 7536)
@@ -0,0 +1,8 @@
+--- src/Makefile.orig	2009-11-28 09:56:56.496441208 +0000
++++ src/Makefile	2009-11-28 09:57:22.425335593 +0000
+@@ -1,3 +1,5 @@
++SHELL = /opt/csw/bin/bash
++
+ # The source directory tree.
+ srcdir := .
+ 

Added: csw/mgar/pkg/chromium/trunk/files/make_names.pl-gcc.patch
===================================================================
--- csw/mgar/pkg/chromium/trunk/files/make_names.pl-gcc.patch	                        (rev 0)
+++ csw/mgar/pkg/chromium/trunk/files/make_names.pl-gcc.patch	2009-12-02 13:05:15 UTC (rev 7536)
@@ -0,0 +1,11 @@
+--- src/third_party/WebKit/WebCore/dom/make_names.pl.orig	2009-11-28 10:24:25.492039333 +0000
++++ src/third_party/WebKit/WebCore/dom/make_names.pl	2009-11-28 10:24:37.696563843 +0000
+@@ -46,7 +46,7 @@
+ my %attrs = ();
+ my %parameters = ();
+ my $extraDefines = 0;
+-my $preprocessor = "/usr/bin/gcc -E -P -x c++";
++my $preprocessor = "/opt/csw/gcc4/bin/gcc -E -P -x c++";
+ 
+ GetOptions(
+     'tags=s' => \$tagsFile, 

Modified: csw/mgar/pkg/chromium/trunk/files/xml_dom_minidom_test.py
===================================================================
--- csw/mgar/pkg/chromium/trunk/files/xml_dom_minidom_test.py	2009-12-02 12:37:53 UTC (rev 7535)
+++ csw/mgar/pkg/chromium/trunk/files/xml_dom_minidom_test.py	2009-12-02 13:05:15 UTC (rev 7536)
@@ -35,6 +35,8 @@
 gmake[1]: *** [gclient-sync] Error 1
 gmake[1]: Leaving directory `/export/home/blizinski/opencsw/pkg/chromium/trunk'
 gmake: *** [build-isa-i386] Error 2
+
+It was fixed by removing CSWpyxml.
 """
 
 __author__ = 'Maciej Bliziński (blizinski at google.com)'


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list