mirror of
https://abf.rosa.ru/djam/chromium-browser-stable-test.git
synced 2025-02-24 10:02:47 +00:00
49 lines
3 KiB
Diff
49 lines
3 KiB
Diff
--- chromium-20.0.1132.43/native_client/tools/Makefile.orig 2012-07-03 17:54:36.000000000 +0000
|
|
+++ chromium-20.0.1132.43/native_client/tools/Makefile 2012-07-03 17:55:43.000000000 +0000
|
|
@@ -956,11 +956,11 @@ buildbot-build-with-newlib: | \
|
|
|
|
# Don't generate patch files for things like gmp or linux-headers-for-nacl
|
|
# because these are not changed from upstream.
|
|
-BINUTILS_PATCHNAME := naclbinutils-$(BINUTILS_VERSION)-r$(shell svnversion | tr : _)
|
|
-GCC_PATCHNAME := naclgcc-$(GCC_VERSION)-r$(shell svnversion | tr : _)
|
|
-#GDB_PATCHNAME := naclgdb-$(GDB_VERSION)-r$(shell svnversion | tr : _)
|
|
-GLIBC_PATCHNAME := naclglibc-$(GLIBC_VERSION)-r$(shell svnversion | tr : _)
|
|
-NEWLIB_PATCHNAME := naclnewlib-$(NEWLIB_VERSION)-r$(shell svnversion | tr : _)
|
|
+BINUTILS_PATCHNAME := naclbinutils-$(BINUTILS_VERSION)
|
|
+GCC_PATCHNAME := naclgcc-$(GCC_VERSION)
|
|
+#GDB_PATCHNAME := naclgdb-$(GDB_VERSION)
|
|
+GLIBC_PATCHNAME := naclglibc-$(GLIBC_VERSION)
|
|
+NEWLIB_PATCHNAME := naclnewlib-$(NEWLIB_VERSION)
|
|
|
|
patch-names = $(BINUTILS_PATCHNAME) $(GCC_PATCHNAME) \
|
|
$(GLIBC_PATCHNAME) $(NEWLIB_PATCHNAME)
|
|
@@ -1003,15 +1003,15 @@ buildbot-mark-version: | \
|
|
+++ SRC/binutils/bfd/version.h\n\
|
|
@@ -3 +3 @@\n\
|
|
-#define BFD_VERSION_STRING @bfd_version_package@ @bfd_version_string@\n\
|
|
- +#define BFD_VERSION_STRING @bfd_version_package@ @bfd_version_string@ \" `LC_ALL=C svn info | grep 'Last Changed Date' | sed -e s'+Last Changed Date: \(....\)-\(..\)-\(..\).*+\1\2\3+'` (Native Client r`LC_ALL=C svnversion`, Git Commit `cd SRC/binutils ; LC_ALL=C git rev-parse HEAD`)\"\n" |\
|
|
+ +#define BFD_VERSION_STRING @bfd_version_package@ @bfd_version_string@ \" `LC_ALL=C svn info | grep 'Last Changed Date' | sed -e s'+Last Changed Date: \(....\)-\(..\)-\(..\).*+\1\2\3+'`\"\n" |\
|
|
patch -p0
|
|
LC_ALL=C svn info | grep 'Last Changed Date' | sed -e s'+Last Changed Date: \(....\)-\(..\)-\(..\).*+\1\2\3+' > SRC/gcc/gcc/DATESTAMP
|
|
- echo "Native Client r`LC_ALL=C svnversion`, Git Commit `cd SRC/gcc ; LC_ALL=C git rev-parse HEAD`" > SRC/gcc/gcc/DEV-PHASE
|
|
+ echo "Native Client" > SRC/gcc/gcc/DEV-PHASE
|
|
printf -- "--- SRC/gdb/gdb/version.in\n\
|
|
+++ SRC/gdb/gdb/version.in\n\
|
|
@@ -1 +1 @@\n\
|
|
-`cat SRC/gdb/gdb/version.in`\n\
|
|
- +`cat SRC/gdb/gdb/version.in` `LC_ALL=C svn info | grep 'Last Changed Date' | sed -e s'+Last Changed Date: \(....\)-\(..\)-\(..\).*+\1\2\3+'` (Native Client r`LC_ALL=C svnversion`, Git Commit `cd SRC/gdb ; LC_ALL=C git rev-parse HEAD`)\n" |\
|
|
+ +`cat SRC/gdb/gdb/version.in` `LC_ALL=C svn info | grep 'Last Changed Date' | sed -e s'+Last Changed Date: \(....\)-\(..\)-\(..\).*+\1\2\3+'`\n" |\
|
|
patch -p0
|
|
endif
|
|
|
|
--- chromium-20.0.1132.43/third_party/webrtc/build/common.gypi.orig 2012-07-03 20:49:11.000000000 +0000
|
|
+++ chromium-20.0.1132.43/third_party/webrtc/build/common.gypi 2012-07-03 20:49:29.000000000 +0000
|
|
@@ -98,7 +98,7 @@
|
|
'defines': [
|
|
# TODO(leozwang): Most of team use git-svn, need to add
|
|
# git-svn support as well.
|
|
- 'WEBRTC_SVNREVISION="<!(svnversion -n)"',
|
|
+ 'WEBRTC_SVNREVISION="exported"',
|
|
],
|
|
'conditions': [
|
|
['build_with_chromium==1', {
|