Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/open-vm-tools/, app-emulation/open-vm-tools/files/
Date: Sat, 26 Nov 2016 17:02:46
Message-Id: 1480179762.482f930798ce03109dd63f9279735d336697ac3d.floppym@gentoo
1 commit: 482f930798ce03109dd63f9279735d336697ac3d
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Sat Nov 26 17:00:34 2016 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 26 17:02:42 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=482f9307
7
8 app-emulation/open-vm-tools: patch -Werror out of configure.ac
9
10 This is less fragile than sed-ing all the Makefiles.
11
12 Bug: https://bugs.gentoo.org/600886
13 Package-Manager: portage-2.3.2_p8
14
15 .../open-vm-tools/files/10.1.0-Werror.patch | 24 ++++++++++++++++++++++
16 .../open-vm-tools/open-vm-tools-10.1.0.ebuild | 5 +----
17 2 files changed, 25 insertions(+), 4 deletions(-)
18
19 diff --git a/app-emulation/open-vm-tools/files/10.1.0-Werror.patch b/app-emulation/open-vm-tools/files/10.1.0-Werror.patch
20 new file mode 100644
21 index 00000000..b79865e
22 --- /dev/null
23 +++ b/app-emulation/open-vm-tools/files/10.1.0-Werror.patch
24 @@ -0,0 +1,24 @@
25 +From fdf599994d58ef47b73dc94d21d3556a2ec5d9da Mon Sep 17 00:00:00 2001
26 +From: Mike Gilbert <floppym@g.o>
27 +Date: Sat, 26 Nov 2016 11:54:33 -0500
28 +Subject: [PATCH] build: drop -Werror
29 +
30 +---
31 + open-vm-tools/configure.ac | 1 -
32 + 1 file changed, 1 deletion(-)
33 +
34 +diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
35 +index 8d4604e8..4d925f22 100644
36 +--- a/open-vm-tools/configure.ac
37 ++++ b/open-vm-tools/configure.ac
38 +@@ -1137,7 +1137,6 @@ AC_C_VOLATILE
39 +
40 + ### General flags / actions
41 + CFLAGS="$CFLAGS -Wall"
42 +-CFLAGS="$CFLAGS -Werror"
43 +
44 + # -Wno-unknown-pragmas is due to gcc not understanding '#pragma ident'
45 + # in Xlib.h on OpenSolaris.
46 +--
47 +2.11.0.rc2
48 +
49
50 diff --git a/app-emulation/open-vm-tools/open-vm-tools-10.1.0.ebuild b/app-emulation/open-vm-tools/open-vm-tools-10.1.0.ebuild
51 index a7835d2..55c652f 100644
52 --- a/app-emulation/open-vm-tools/open-vm-tools-10.1.0.ebuild
53 +++ b/app-emulation/open-vm-tools/open-vm-tools-10.1.0.ebuild
54 @@ -49,7 +49,6 @@ COMMON_DEPEND="
55 DEPEND="${COMMON_DEPEND}
56 doc? ( app-doc/doxygen )
57 virtual/pkgconfig
58 - sys-apps/findutils
59 "
60
61 RDEPEND="${COMMON_DEPEND}
62 @@ -60,6 +59,7 @@ S="${WORKDIR}/${MY_P}/open-vm-tools"
63 PATCHES=(
64 "${FILESDIR}/10.1.0-mount.vmhgfs.patch"
65 "${FILESDIR}/10.1.0-vgauth.patch"
66 + "${FILESDIR}/10.1.0-Werror.patch"
67 )
68
69 pkg_setup() {
70 @@ -107,9 +107,6 @@ src_configure() {
71 )
72
73 econf "${myeconfargs[@]}"
74 -
75 - # Bugs 260878, 326761
76 - find . -name Makefile -exec sed -i -e 's/-Werror//g' '{}' + || die "sed out Werror failed"
77 }
78
79 src_compile() {