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

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Fri Nov 27 10:35:36 CET 2009


Revision: 7475
          http://gar.svn.sourceforge.net/gar/?rev=7475&view=rev
Author:   wahwah
Date:     2009-11-27 09:35:36 +0000 (Fri, 27 Nov 2009)

Log Message:
-----------
chromium: Using git sources

Modified Paths:
--------------
    csw/mgar/pkg/chromium/trunk/Makefile

Modified: csw/mgar/pkg/chromium/trunk/Makefile
===================================================================
--- csw/mgar/pkg/chromium/trunk/Makefile	2009-11-27 09:10:09 UTC (rev 7474)
+++ csw/mgar/pkg/chromium/trunk/Makefile	2009-11-27 09:35:36 UTC (rev 7475)
@@ -54,7 +54,8 @@
 ## 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  = 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
@@ -123,10 +124,10 @@
 ## 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
+REQUIRED_PKGS = CSWnspr CSWnss CSWffmpeg
 ##
 ## A list of packages necessary to build this package
-PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWnspr-devel CSWlibxcbdevel
+PREREQUISITE_PKGS = $(REQUIRED_PKGS) CSWnspr-devel CSWlibxcbdevel CSWffmpeg
 ##
 ## When using non-empty $(PACKAGES):
 ## REQUIRED_PKGS_CSWpkgname =
@@ -180,13 +181,17 @@
 GYP_GENERATORS = make
 export GYP_GENERATORS
 
-WORKSRC = $(WORKDIR)/home/chrome-svn/tarball/chromium
+# WORKSRC = $(WORKDIR)/home/chrome-svn/tarball/chromium
+WORKSRC = $(WORKDIR)/chromium
 CHROMIUM_ROOT = $(WORKSRC)
 
 EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
 
 GARCOMPILER = GNU
 
+# Because of bashisms in Makefiles in Chromium
+SHELL = /opt/csw/bin/bash
+
 include gar/category.mk
 
 $(WORKSRC)/.gclient:
@@ -195,20 +200,32 @@
 		GYP_GENERATORS=make \
 	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; \
+	fi)
+	@$(MAKECOOKIE)
+
 # Skipping gclient sync for now; running only gclient runhooks.  The build
 # instructions say that we'll miss on some platform-specific depends, but
 # I don't think there's anything platform-specific for Solaris in the source
 # code repository.
 
-configure-chromium: depot-tools gclient-runhooks
-	@$(MAKECOOKIE)
+configure-chromium: depot-tools gclient-sync
 
 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 \
-	gclient sync)
+	gclient sync --revision src@$(CHROMIUM_REVISION))
+	# gclient sync)
 	@$(MAKECOOKIE)
 
 gclient-runhooks: $(WORKSRC)/.gclient
@@ -216,6 +233,7 @@
 		&& \
 		PATH=$$PATH:$(abspath $(WORKDIR)/depot_tools):/opt/csw/gcc4/bin \
 		GYP_GENERATORS=make \
+		GYP_DEFINES="use_system_ffmpeg=1" \
 	gclient runhooks --force)
 	@$(MAKECOOKIE)
 
@@ -234,4 +252,4 @@
 	(cd $(CHROMIUM_ROOT)/src \
 		&& \
 	PATH=$$PATH:$(abspath $(WORKDIR)/depot_tools):/opt/csw/gcc4/bin \
-	gmake chrome)
+	gmake $(PARALLELMFLAGS) chrome)


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