Browse code

Fixed autoconf make check failure

Change-Id: I7b48963846751e732e285ae6f15115abd3d90a6f
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1863
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Divya Thaluru <dthaluru@vmware.com>

DheerajSShetty authored on 2016/12/07 07:21:55
Showing 2 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,12 @@
0
+diff -rupr a/bin/autoscan.in b/bin/autoscan.in
1
+--- a/bin/autoscan.in	2012-04-24 19:37:26.000000000 -0700
2
+@@ -358,7 +358,7 @@ sub scan_sh_file ($)
3
+     {
4
+       # Strip out comments and variable references.
5
+       s/#.*//;
6
+-      s/\${[^\}]*}//g;
7
++      s/\$\{[^\}]*}//g;
8
+       s/@[^@]*@//g;
9
+ 
10
+       # Tokens in the code.
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:	The package automatically configure source code
2 2
 Name:		autoconf
3 3
 Version:	2.69
4
-Release:	4%{?dist}
4
+Release:	5%{?dist}
5 5
 License:	GPLv2
6 6
 URL:		http://www.gnu.org/software/autoconf
7 7
 Group:		System Environment/Base
... ...
@@ -9,6 +9,8 @@ Vendor:		VMware, Inc.
9 9
 Distribution: 	Photon
10 10
 Source0:	http://ftp.gnu.org/gnu/autoconf/%{name}-%{version}.tar.xz
11 11
 %define sha1 autoconf=e891c3193029775e83e0534ac0ee0c4c711f6d23
12
+Patch0:		autoconf-make-check.patch
13
+
12 14
 Requires:	perl
13 15
 BuildRequires:	m4
14 16
 Requires:	m4
... ...
@@ -17,6 +19,7 @@ The package contains programs for producing shell scripts that can
17 17
 automatically configure source code.
18 18
 %prep
19 19
 %setup -q
20
+%patch0 -p1
20 21
 %build
21 22
 ./configure \
22 23
 	--prefix=%{_prefix} \
... ...
@@ -35,6 +38,8 @@ make -k check %{?_smp_mflags}  TESTSUITEFLAGS="1-500"
35 35
 %{_mandir}/*/*
36 36
 %{_datarootdir}/autoconf/*
37 37
 %changelog
38
+*	Tue Dec 6 2016 Dheeraj Shetty <dheerajs@vmware.com> 2.69-5
39
+-	Fixed Bug 1718089 make check failure
38 40
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.69-4
39 41
 -	GA - Bump release of all rpms
40 42
 *	Fri Jun 5 2015 Divya Thaluru <dthaluru@vmware.com> 2.69-3