[PATCH] Revert "lmbench: Obey ranlib"

[PATCH] Revert "lmbench: Obey ranlib"

[Paul Menzel]

[-- Attachment #1: Type: text/plain, Size: 8420 bytes --]

Date: Thu, 2 Jun 2011 19:33:38 +0200

This reverts commit 1a1f68d70af9054d8e8216c02f5debf83c1544b0 [1].

Task install fails with the following error message using `minimal{,-uclibc}` for `MACHINE = "beagleboard"`.

	+ cd /oe/build-minimal-eglibc/minimal-dev/work/armv7a-oe-linux-gnueabi/lmbench-3.0-a9-r5/lmbench-3.0-a9
	+ do_install
	+ install -d /oe/build-minimal-eglibc/minimal-dev/work/armv7a-oe-linux-gnueabi/lmbench-3.0-a9-r5/image/var/run/lmbench /oe/build-minimal-eglibc/minimal-dev/work/armv7a-oe-linux-gnueabi/lmbench-3.0-a9-r5/image/usr/bin /oe/build-minimal-eglibc/minimal-dev/work/armv7a-oe-linux-gnueabi/lmbench-3.0-a9-r5/image/usr/share/man /home/paul/oe/build-minimal-eglibc/minimal-dev/work/armv7a-oe-linux-gnueabi/lmbench-3.0-a9-r5/image/usr/lib/lmbench /oe/build-minimal-eglibc/minimal-dev/work/armv7a-oe-linux-gnueabi/lmbench-3.0-a9-r5/image/usr/share/lmbench/scripts
	+ oe_runmake BASE=/oe/build-minimal-eglibc/minimal-dev/work/armv7a-oe-linux-gnueabi/lmbench-3.0-a9-r5/image/usr -C src install
	+ oenote make 'CC=arm-oe-linux-gnueabi-gcc -march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp -mthumb-interwork -mno-thumb --sysroot=/oe/build-minimal-eglibc/minimal-dev/sysroots/armv7a-oe-linux-gnueabi' AR=arm-oe-linux-gnueabi-ar 'RANLIB=arm-oe-linux-gnueabi-ranlib CFLAGS=' -fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os '-g              LDFLAGS=-Wl,-O1' '-Wl,--hash-style=gnu LD=arm-oe-linux-gnueabi-ld' '--sysroot=/oe/build-minimal-eglibc/minimal-dev/sysroots/armv7a-oe-linux-gnueabi OS=arm-oe-linux-gnueabi           TARGET=linux-gnueabi BASE=/usr BASE=/oe/build-minimal-eglibc/minimal-dev/work/armv7a-oe-linux-gnueabi/lmbench-3.0-a9-r5/image/usr' -C src 'install
		      make CC=arm-oe-linux-gnueabi-gcc' -march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp -mthumb-interwork -mno-thumb '--sysroot=/oe/build-minimal-eglibc/minimal-dev/sysroots/armv7a-oe-linux-gnueabi AR=arm-oe-linux-gnueabi-ar RANLIB=arm-oe-linux-gnueabi-ranlib' 'CFLAGS= -fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os -g' 'LDFLAGS=-Wl,-O1 -Wl,--hash-style=gnu' 'LD=arm-oe-linux-gnueabi-ld --sysroot=/oe/build-minimal-eglibc/minimal-dev/sysroots/armv7a-oe-linux-gnueabi' OS=arm-oe-linux-gnueabi TARGET=linux-gnueabi BASE=/usr BASE=/oe/build-minimal-eglibc/minimal-dev/work/armv7a-oe-linux-gnueabi/lmbench-3.0-a9-r5/image/usr -C src install
	+ echo NOTE: 'make CC=arm-oe-linux-gnueabi-gcc -march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp -mthumb-interwork -mno-thumb --sysroot=/oe/build-minimal-eglibc/minimal-dev/sysroots/armv7a-oe-linux-gnueabi AR=arm-oe-linux-gnueabi-ar RANLIB=arm-oe-linux-gnueabi-ranlib CFLAGS= -fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os -g              LDFLAGS=-Wl,-O1 -Wl,--hash-style=gnu LD=arm-oe-linux-gnueabi-ld --sysroot=/oe/build-minimal-eglibc/minimal-dev/sysroots/armv7a-oe-linux-gnueabi OS=arm-oe-linux-gnueabi               TARGET=linux-gnueabi BASE=/usr BASE=/oe/build-minimal-eglibc/minimal-dev/work/armv7a-oe-linux-gnueabi/lmbench-3.0-a9-r5/image/usr -C src install
		      make CC=arm-oe-linux-gnueabi-gcc -march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp -mthumb-interwork -mno-thumb --sysroot=/oe/build-minimal-eglibc/minimal-dev/sysroots/armv7a-oe-linux-gnueabi AR=arm-oe-linux-gnueabi-ar RANLIB=arm-oe-linux-gnueabi-ranlib CFLAGS= -fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os -g LDFLAGS=-Wl,-O1 -Wl,--hash-style=gnu LD=arm-oe-linux-gnueabi-ld --sysroot=/oe/build-minimal-eglibc/minimal-dev/sysroots/armv7a-oe-linux-gnueabi OS=arm-oe-linux-gnueabi TARGET=linux-gnueabi BASE=/usr BASE=/oe/build-minimal-eglibc/minimal-dev/work/armv7a-oe-linux-gnueabi/lmbench-3.0-a9-r5/image/usr -C src install'
	NOTE: make CC=arm-oe-linux-gnueabi-gcc -march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp -mthumb-interwork -mno-thumb --sysroot=/oe/build-minimal-eglibc/minim
	al-dev/sysroots/armv7a-oe-linux-gnueabi AR=arm-oe-linux-gnueabi-ar RANLIB=arm-oe-linux-gnueabi-ranlib CFLAGS= -fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os -g              LDFLAGS=-Wl,-O1 -Wl,--hash-style=gnu LD=arm-oe-linux-gnueabi-ld --sysroot=/oe/build-minimal-eglibc/minimal-dev/sysroots/armv7a-oe-linux-gnueabi OS=arm-oe-linux-gnueabi           TARGET=linux-gnueabi BASE=/usr BASE=/oe/build-minimal-eglibc/minimal-dev/work/armv7a-oe-linux-gnueabi/lmbench-3.0-a9-r5/image/usr -C src install
	ERROR: Function 'do_install' failed (see /oe/build-minimal-eglibc/minimal-dev/work/armv7a-oe-linux-gnueabi/lmbench-3.0-a9-r5/temp/log.do_install.20097 for further information)
		      make CC=arm-oe-linux-gnueabi-gcc -march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp -mthumb-interwork -mno-thumb --sysroot=/oe/build-minimal-eglibc/minimal-dev/sysroots/armv7a-oe-linux-gnueabi AR=arm-oe-linux-gnueabi-ar RANLIB=arm-oe-linux-gnueabi-ranlib CFLAGS= -fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os -g LDFLAGS=-Wl,-O1 -Wl,--hash-style=gnu LD=arm-oe-linux-gnueabi-ld --sysroot=/oe/build-minimal-eglibc/minimal-dev/sysroots/armv7a-oe-linux-gnueabi OS=arm-oe-linux-gnueabi TARGET=linux-gnueabi BASE=/usr BASE=/oe/build-minimal-eglibc/minimal-dev/work/armv7a-oe-linux-gnueabi/lmbench-3.0-a9-r5/image/usr -C src install
	+ mv /oe/build-minimal-eglibc/minimal-dev/work/armv7a-oe-linux-gnueabi/lmbench-3.0-a9-r5/image/usr/bin/line /oe/build-minimal-eglibc/minimal-dev/work/armv7a-oe-linux-gnueabi/lmbench-3.0-a9-r5/image/usr/bin/lm_line
	mv: cannot stat `/oe/build-minimal-eglibc/minimal-dev/work/armv7a-oe-linux-gnueabi/lmbench-3.0-a9-r5/image/usr/bin/line': No such file or directory

Reverting that commit gets rid of the error.

Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
CC: Tom Rini <tom_rini@mentor.com>

[1] http://cgit.openembedded.org/cgit.cgi/openembedded/commit/recipes/lmbench/lmbench_3.0-a9.bb?id=48433b13bf3a26e9ccb83bf8e7344ee3e37f6139
---
Dear Tom,


as always a fix is preferred. I have no time to look into it.


Thanks,

Paul
---
 recipes/lmbench/lmbench-3.0-a9/obey-ranlib.patch |   25 ----------------------
 recipes/lmbench/lmbench_3.0-a9.bb                |    7 ++---
 2 files changed, 3 insertions(+), 29 deletions(-)
 delete mode 100644 recipes/lmbench/lmbench-3.0-a9/obey-ranlib.patch

diff --git a/recipes/lmbench/lmbench-3.0-a9/obey-ranlib.patch b/recipes/lmbench/lmbench-3.0-a9/obey-ranlib.patch
deleted file mode 100644
index 5ce6e15..0000000
--- a/recipes/lmbench/lmbench-3.0-a9/obey-ranlib.patch
+++ /dev/null
@@ -1,25 +0,0 @@
----
- src/Makefile |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-Index: lmbench-3.0-a9/src/Makefile
-===================================================================
---- lmbench-3.0-a9.orig/src/Makefile
-+++ lmbench-3.0-a9/src/Makefile
-@@ -38,6 +38,7 @@ CC=`../scripts/compiler`
- MAKE=`../scripts/make`
- AR=ar
- ARCREATE=cr
-+RANLIB=ranlib
- 
- # base of installation location
- BASE=/usr/local
-@@ -217,7 +218,7 @@ $O/lmbench : ../scripts/lmbench version.
- $O/lmbench.a: $(LIBOBJS)
- 	/bin/rm -f $O/lmbench.a
- 	$(AR) $(ARCREATE) $O/lmbench.a $(LIBOBJS)
--	-ranlib $O/lmbench.a
-+	-$(RANLIB) $O/lmbench.a
- 
- $O/lib_timing.o : lib_timing.c $(INCS)
- 	$(COMPILE) -c lib_timing.c -o $O/lib_timing.o
diff --git a/recipes/lmbench/lmbench_3.0-a9.bb b/recipes/lmbench/lmbench_3.0-a9.bb
index e84ab47..ce6d1a8 100644
--- a/recipes/lmbench/lmbench_3.0-a9.bb
+++ b/recipes/lmbench/lmbench_3.0-a9.bb
@@ -3,21 +3,20 @@ DESCRIPTION = "Tools for performance analysis."
 LICENSE = "GPL"
 RDEPENDS_${PN} = "debianutils"
 
-PR = "r5"
+PR = "r4"
 
 inherit autotools
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \
 	   file://lmbench-run \
 	   file://rename-line-binary.patch \
-	   file://update-results-script.patch \
-	   file://obey-ranlib.patch"
+	   file://update-results-script.patch"
 SRC_URI[md5sum] = "b3351a3294db66a72e2864a199d37cbf"
 SRC_URI[sha256sum] = "cbd5777d15f44eab7666dcac418054c3c09df99826961a397d9acf43d8a2a551"
 
 S = "${WORKDIR}/lmbench-${PV}"
 
-EXTRA_OEMAKE = 'CC="${CC}" AR="${AR}" RANLIB="${RANLIB} CFLAGS="${CFLAGS}" \
+EXTRA_OEMAKE = 'CC="${CC}" AR="${AR}" CFLAGS="${CFLAGS}" \
 		LDFLAGS="${LDFLAGS}" LD="${LD}" OS="${TARGET_SYS}" \
 		TARGET="${TARGET_OS}" BASE="${prefix}"'
 
-- 
1.7.5.3

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]