From 6b43dc3f9fe3ee29ee7728c1818dd0534bb63f0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nagy=20K=C3=A1roly=20G=C3=A1briel?=
 <nagy.karoly@opensde.org>
Date: Wed, 24 Feb 2016 15:18:40 +0000
Subject: [PATCH] flex: added patches from OE to disable build tests

---
 base/flex/disable-tests.patch         | 35 +++++++++++++++++++++++++++
 base/flex/do_not_create_pdf_doc.patch | 33 +++++++++++++++++++++++++
 base/flex/flex.conf                   |  3 ++-
 3 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 base/flex/disable-tests.patch
 create mode 100644 base/flex/do_not_create_pdf_doc.patch

diff --git a/base/flex/disable-tests.patch b/base/flex/disable-tests.patch
new file mode 100644
index 000000000..ffe536e17
--- /dev/null
+++ b/base/flex/disable-tests.patch
@@ -0,0 +1,35 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# Filename: package/.../flex/disable-tests.patch
+# Copyright (C) 2016 The OpenSDE Project
+#
+# More information can be found in the files COPYING and README.
+#
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+Due to automake stupidity the Makefile in tests/ has an 'all' target that
+depends on $(BUILD_SOURCES), which means when building flex parts of the test
+suite are built even if they're not needed, resulting in flex needing
+flex-native and bison-native to build.
+
+This patch removes the tests directory from SUBDIRS and will be conditionally
+applied by the recipe.
+
+Upstream-Status: Inappropriate
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
+diff --git a/Makefile.am b/Makefile.am
+index 076ccad..0574d7b 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -55,3 +55,2 @@ SUBDIRS = \
+ 	po \
+-	tests \
+ 	tools
diff --git a/base/flex/do_not_create_pdf_doc.patch b/base/flex/do_not_create_pdf_doc.patch
new file mode 100644
index 000000000..46a941774
--- /dev/null
+++ b/base/flex/do_not_create_pdf_doc.patch
@@ -0,0 +1,33 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# Filename: package/.../flex/do_not_create_pdf_doc.patch
+# Copyright (C) 2016 The OpenSDE Project
+#
+# More information can be found in the files COPYING and README.
+#
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+Upstream-Status: Inappropriate (embedded specific)
+
+Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
+
+Index: flex-2.5.37/doc/Makefile.am
+===================================================================
+--- flex-2.5.37.orig/doc/Makefile.am	2012-07-21 04:18:27.000000000 +0300
++++ flex-2.5.37/doc/Makefile.am	2013-07-30 17:57:09.834834531 +0300
+@@ -2,7 +2,7 @@
+ 
+ info_TEXINFOS =	flex.texi
+ dist_man_MANS = flex.1
+-dist_doc_DATA= flex.pdf
++EXTRA_DIST= flex.pdf
+ 
+ CLEANFILES = \
+ 	flex.hks \
diff --git a/base/flex/flex.conf b/base/flex/flex.conf
index ddff7c6ac..d72c7b247 100644
--- a/base/flex/flex.conf
+++ b/base/flex/flex.conf
@@ -2,6 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../flex/flex.conf
+# Copyright (C) 2016 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # Copyright (C) 1998 - 2004 Clifford Wolf
 #
@@ -20,7 +21,7 @@ pkg_flex_postmake() {
 }
 
 hook_add postmake 5 "pkg_flex_postmake"
-
+hook_add preconf 5 "sed -i -e '/test-bison-yylloc/d' -e '/test-bison-yylval/d' tests/Makefile.in"
 # don't mix with host system
 var_append GCC_WRAPPER_REMOVE ' ' "-I/usr/include"