From 6ea7f59d1afd33c78c3f3542b3f3e419dbb65127 Mon Sep 17 00:00:00 2001
From: Leon Woestenberg <leon.woestenberg@gmail.com>
Date: Sat, 1 Mar 2008 00:29:47 +0000
Subject: ltp: 2008-02-29 release. Patched to build. ballista test still fails
 detecting native perl. Not tested on any target yet.

---
 packages/ltp/ltp-20080229/ballista.patch      | 22 ++++++++++++++++++++
 packages/ltp/ltp-20080229/cross-compile.patch | 30 +++++++++++++++++++++++++--
 packages/ltp/ltp_20080229.bb                  |  3 ++-
 3 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 packages/ltp/ltp-20080229/ballista.patch

(limited to 'packages/ltp')

diff --git a/packages/ltp/ltp-20080229/ballista.patch b/packages/ltp/ltp-20080229/ballista.patch
new file mode 100644
index 0000000000..d318480208
--- /dev/null
+++ b/packages/ltp/ltp-20080229/ballista.patch
@@ -0,0 +1,22 @@
+Index: ltp-full-20080229/testcases/ballista/Makefile
+===================================================================
+--- ltp-full-20080229.orig/testcases/ballista/Makefile	2008-02-29 08:55:46.000000000 +0100
++++ ltp-full-20080229/testcases/ballista/Makefile	2008-03-01 01:21:16.000000000 +0100
+@@ -1,4 +1,4 @@
+-ifeq ($(shell perl -v &> /dev/null && echo yes),yes)
++ifeq ($(shell perl -v > /dev/null && echo yes),yes)
+ 
+ all: bal
+ 
+Index: ltp-full-20080229/testcases/ballista/ballista/Makefile
+===================================================================
+--- ltp-full-20080229.orig/testcases/ballista/ballista/Makefile	2008-03-01 01:21:16.000000000 +0100
++++ ltp-full-20080229/testcases/ballista/ballista/Makefile	2008-03-01 01:22:22.000000000 +0100
+@@ -37,6 +37,7 @@
+ 
+ # build everything by default
+ all : callGen callGen_standAlone genCodeCreator replacer ballista
++	rm blexer bparser mut.out
+ 
+ # run-of-of-the-mill rules for utility programs
+ callGen: callGen.cpp
diff --git a/packages/ltp/ltp-20080229/cross-compile.patch b/packages/ltp/ltp-20080229/cross-compile.patch
index 4aa4eefd18..456bf4f135 100644
--- a/packages/ltp/ltp-20080229/cross-compile.patch
+++ b/packages/ltp/ltp-20080229/cross-compile.patch
@@ -1,7 +1,7 @@
 Index: ltp-full-20080229/Makefile
 ===================================================================
 --- ltp-full-20080229.orig/Makefile	2008-02-29 08:55:41.000000000 +0100
-+++ ltp-full-20080229/Makefile	2008-03-01 00:27:33.000000000 +0100
++++ ltp-full-20080229/Makefile	2008-03-01 01:14:35.000000000 +0100
 @@ -33,11 +33,12 @@
  endif
  ifdef CROSS_COMPILER
@@ -19,7 +19,7 @@ Index: ltp-full-20080229/Makefile
 Index: ltp-full-20080229/testcases/ballista/ballista/Makefile
 ===================================================================
 --- ltp-full-20080229.orig/testcases/ballista/ballista/Makefile	2008-02-29 08:55:46.000000000 +0100
-+++ ltp-full-20080229/testcases/ballista/ballista/Makefile	2008-03-01 00:27:33.000000000 +0100
++++ ltp-full-20080229/testcases/ballista/ballista/Makefile	2008-03-01 01:14:35.000000000 +0100
 @@ -24,7 +24,7 @@
  ########################
  
@@ -29,3 +29,29 @@ Index: ltp-full-20080229/testcases/ballista/ballista/Makefile
  CFLAGS = -w -O ${TARGET_DEF}
  CLIBS = -lpthread -ldl -lnsl -rdynamic
  TEST_MAN_FILE = selfHost
+Index: ltp-full-20080229/testcases/kernel/security/filecaps/Makefile
+===================================================================
+--- ltp-full-20080229.orig/testcases/kernel/security/filecaps/Makefile	2008-03-01 01:14:49.000000000 +0100
++++ ltp-full-20080229/testcases/kernel/security/filecaps/Makefile	2008-03-01 01:15:05.000000000 +0100
+@@ -20,7 +20,6 @@
+ 
+ SCRIPTS = filecapstest.sh checkforlibcap.sh checkforfilecaps.sh
+ ifeq ($(shell sh checkforlibcap.sh yesno),yes)
+-CC=gcc
+ 
+ CFLAGS += -I../../../../include -Wall
+ LDLIBS += -L../../../../lib -lltp -lcap
+@@ -29,11 +28,11 @@
+ TARGETS = $(patsubst %.c,%,$(SRCS))
+ INSTALLTARGETS = $(TARGETS) $(SCRIPTS)
+ all: $(TARGETS)
+-	gcc -o checkforlibcap gotlibcap.c
++	$(CC) -o checkforlibcap gotlibcap.c
+ else
+ all:
+ 	@echo "setcap or xattr headers not installed.  Please install libcap from"; echo "ftp://ftp.kernel.org/pub/linux/libs/security/linux-privs/libcap2"; echo "Then make clean in ltp or ltp/testcases/kernel/security/filecaps, and recompile ltp."
+-	gcc -o checkforlibcap nolibcap.c
++	$(CC) -o checkforlibcap nolibcap.c
+ TARGETS =
+ endif
+ 
diff --git a/packages/ltp/ltp_20080229.bb b/packages/ltp/ltp_20080229.bb
index d23b5d7188..6ad102023b 100644
--- a/packages/ltp/ltp_20080229.bb
+++ b/packages/ltp/ltp_20080229.bb
@@ -7,7 +7,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/ltp/ltp-full-${PV}.tgz \
            file://cross-compile.patch;patch=1 \
            file://runltp-path.patch;patch=1 \
            file://ltp-run \
-           file://posix_shell_compat.patch;patch=1"
+           file://posix_shell_compat.patch;patch=1 \
+           file://ballista.patch;patch=1"
 
 S = "${WORKDIR}/ltp-full-${PV}"
 
-- 
cgit v1.2.3