[oe-commits] Jeremy Lainé : flite-1.3: fix LDFLAGS breakage

[GIT User account]

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

Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Wed Apr  8 10:01:48 2009 +0000

flite-1.3: fix LDFLAGS breakage

---

 recipes/flite/flite-1.3/flite-1.3-Makefile.patch |    2 +-
 recipes/flite/flite_1.3.bb                       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes/flite/flite-1.3/flite-1.3-Makefile.patch b/recipes/flite/flite-1.3/flite-1.3-Makefile.patch
index 5b532fd..f186706 100644
--- a/recipes/flite/flite-1.3/flite-1.3-Makefile.patch
+++ b/recipes/flite/flite-1.3/flite-1.3-Makefile.patch
@@ -320,7 +320,7 @@ Index: config/common_make_rules
 -	@ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os)
 -	@ ln -s $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION}
 -	@ ln -s $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} $(LIBDIR)/$@
-+	@ (cd shared_os && $(CC) $(LDFLAGS) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os)
++	@ (cd shared_os && $(CC) $(filter-out -lflite, $(LDFLAGS)) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os)
 +	#@ ln -s $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION}
 +	#@ ln -s $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} $(LIBDIR)/$@
 +	@ ln -s $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION}
diff --git a/recipes/flite/flite_1.3.bb b/recipes/flite/flite_1.3.bb
index b553689..d9f1e6c 100644
--- a/recipes/flite/flite_1.3.bb
+++ b/recipes/flite/flite_1.3.bb
@@ -1,6 +1,6 @@
 require flite.inc
 
-PR = "r4"
+PR = "r5"
 
 EXTRA_OECONF = "--with-audio=oss --enable-shared"