|
From: <sv...@va...> - 2012-09-17 17:44:49
|
sewardj 2012-09-17 18:47:58 +0100 (Mon, 17 Sep 2012)
New Revision: 12984
Log:
Merge from trunk, r12964 (partial) and r12983 (3.8.0 release tarball
missing some files, #306310).
Modified files:
branches/VALGRIND_3_8_BRANCH/Makefile.am
branches/VALGRIND_3_8_BRANCH/README.android
Property changed: branches/VALGRIND_3_8_BRANCH/README.android (+0 -0)
___________________________________________________________________
Name: svn:mergeinfo
+ /branches/TCHAIN/README.android:12477-12516
/trunk/README.android:12873,12878-12879,12885,12887,12891-12894,12897-12898,12923,12947,12964
Modified: branches/VALGRIND_3_8_BRANCH/README.android (+3 -0)
===================================================================
--- branches/VALGRIND_3_8_BRANCH/README.android 2012-09-17 18:17:00 +01:00 (rev 12983)
+++ branches/VALGRIND_3_8_BRANCH/README.android 2012-09-17 18:47:58 +01:00 (rev 12984)
@@ -77,6 +77,9 @@
# different if /sdcard doesn't work on the device -- this is
# a known cause of difficulties.
+# The below re-generates configure, Makefiles, ...
+# This is not needed if you start from a release tarball.
+# (in any case, the release tarball does not contain the autogen.sh file).
./autogen.sh
# for ARM
Property changed: branches/VALGRIND_3_8_BRANCH/Makefile.am (+0 -0)
___________________________________________________________________
Name: svn:mergeinfo
+ /branches/TCHAIN/Makefile.am:12477-12516
/trunk/Makefile.am:12873,12878-12879,12885,12887,12891-12894,12897-12898,12923,12947,12964,12983
Modified: branches/VALGRIND_3_8_BRANCH/Makefile.am (+3 -1)
===================================================================
--- branches/VALGRIND_3_8_BRANCH/Makefile.am 2012-09-17 18:17:00 +01:00 (rev 12983)
+++ branches/VALGRIND_3_8_BRANCH/Makefile.am 2012-09-17 18:47:58 +01:00 (rev 12984)
@@ -99,11 +99,13 @@
README_MISSING_SYSCALL_OR_IOCTL \
README.s390 \
README.android \
+ README.android_emulator \
README.mips \
NEWS.old \
valgrind.pc.in \
valgrind.spec.in \
- valgrind.spec
+ valgrind.spec \
+ autogen.sh
dist_noinst_SCRIPTS = \
vg-in-place
|