Browse Source

flex: added patches from OE to disable build tests

tc-work
Nagy Károly Gábriel 9 years ago
parent
commit
f5fe4a5391
3 changed files with 70 additions and 1 deletions
  1. +35
    -0
      base/flex/disable-tests.patch
  2. +33
    -0
      base/flex/do_not_create_pdf_doc.patch
  3. +2
    -1
      base/flex/flex.conf

+ 35
- 0
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

+ 33
- 0
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 \

+ 2
- 1
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"

Loading…
Cancel
Save