[oe-commits] Henry von Tresckow : sg3-utils: Updated Makefile patch to deal with cross-compiling

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: c0bada03550651d41d2d735fd7890a548dc5219d
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=c0bada03550651d41d2d735fd7890a548dc5219d

Author: Henry von Tresckow <hvontres at gmail.com>
Date:   Wed Feb 25 16:54:09 2009 +0000

sg3-utils: Updated Makefile patch to deal with cross-compiling

Signed-off-by: Henry von Tresckow <hvontres at gmail.com>
Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
Acked-by: Koen Kooi <koen at openembedded.org>

---

 .../files/{Makefile.patch => Makefile-r1.patch}    |   31 +++++++++++++++----
 recipes/sg3-utils/sg3-utils_1.24.bb                |    7 +++-
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/recipes/sg3-utils/files/Makefile.patch b/recipes/sg3-utils/files/Makefile-r1.patch
similarity index 94%
rename from recipes/sg3-utils/files/Makefile.patch
rename to recipes/sg3-utils/files/Makefile-r1.patch
index cc5babf..d43b51d 100644
--- a/recipes/sg3-utils/files/Makefile.patch
+++ b/recipes/sg3-utils/files/Makefile-r1.patch
@@ -1,8 +1,8 @@
 Index: sg3-utils-1.24/Makefile
 ===================================================================
---- sg3-utils-1.24.orig/Makefile	2009-01-27 16:29:26.000000000 -0800
-+++ sg3-utils-1.24/Makefile	2009-01-27 22:31:04.000000000 -0800
-@@ -1,6 +1,6 @@
+--- sg3-utils-1.24.orig/Makefile	2007-05-07 11:59:19.000000000 -0700
++++ sg3-utils-1.24/Makefile	2009-02-02 16:37:35.000000000 -0800
+@@ -1,13 +1,15 @@
  SHELL = /bin/sh
  
 -PREFIX=/usr/local
@@ -10,15 +10,32 @@ Index: sg3-utils-1.24/Makefile
  LIBDIR=$(DESTDIR)/$(PREFIX)/lib
  INSTDIR=$(DESTDIR)/$(PREFIX)/bin
  MANDIR=$(DESTDIR)/$(PREFIX)/share/man
-@@ -8,6 +8,8 @@
+ INCLUDEDIR=$(DESTDIR)/$(PREFIX)/include
  
- CC = gcc
- LD = gcc
-+LIBTOOL = libtool
+-CC = gcc
+-LD = gcc
++CC ?= gcc
++LD = ${CC}
++LIBTOOL ?= libtool
 +LT_EXTRA = --tag=CC
  
  EXECS = sg_dd sgp_dd sgm_dd sg_read sg_map sg_scan sg_rbuf \
    	sginfo sg_readcap sg_turs sg_inq sg_test_rwbuf \
+@@ -37,12 +39,12 @@
+ S_CFLAGS = $(OS_FLAGS) $(LARGE_FILE_FLAGS)
+ 
+ # CFLAGS = -O2 -Wall -W
+-CFLAGS = -g -O2 -Wall -W
++CFLAGS ?= -g -O2 -Wall -W
+ # CFLAGS = -g -O2 -Wall -W -pedantic -std=c99
+ 
+ CFLAGS_PTHREADS = -D_REENTRANT
+ 
+-LDFLAGS = 
++LDFLAGS ?= 
+ # LDFLAGS = -v -lm
+ 
+ LIB_VINFO = 1:0:0
 @@ -64,164 +66,164 @@
  	$(CC) $(INCLUDES) $(CFLAGS) $(S_CFLAGS) -c -o $@ $<
  
diff --git a/recipes/sg3-utils/sg3-utils_1.24.bb b/recipes/sg3-utils/sg3-utils_1.24.bb
index 135ba0f..4a2c378 100644
--- a/recipes/sg3-utils/sg3-utils_1.24.bb
+++ b/recipes/sg3-utils/sg3-utils_1.24.bb
@@ -3,11 +3,14 @@ AUTHOR = "Eric Schwartz (Skif) <emschwar at debian.org>"
 HOMEPAGE = "http://packages.qa.debian.org/s/sg3-utils.html"
 SECTION = "console/admin"
 LICENSE = "GPLv2"
-PR = "r0"
+AUTHOR = "Eric Schwartz (Skif) <emschwar at debian.org>"
+PR = "r1"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/s/sg3-utils/sg3-utils_${PV}.orig.tar.gz \
-           file://Makefile.patch;patch=1"
+	file://Makefile-r1.patch;patch=1"
 
 S = "${WORKDIR}/sg3-utils-${PV}"
 
 inherit autotools
+
+EXTRA_OEMAKE='"LIBTOOL=${STAGING_BINDIR_NATIVE}/${HOST_SYS}-libtool"'