summaryrefslogtreecommitdiff
path: root/recipes
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2009-04-08 10:01:48 +0000
committerJeremy Lainé <jeremy.laine@m4x.org>2009-04-08 10:01:48 +0000
commitac0e1bd19cec64b5194175e168a6efb256cc9261 (patch)
tree9528994216a0ec7101df50cc092c160ae5693742 /recipes
parent846330c96c871b0b4116581fa195a6ad1932a439 (diff)
flite-1.3: fix LDFLAGS breakage
Diffstat (limited to 'recipes')
-rw-r--r--recipes/flite/flite-1.3/flite-1.3-Makefile.patch2
-rw-r--r--recipes/flite/flite_1.3.bb2
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 5b532fd7a8..f186706a97 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 b553689a4e..d9f1e6c128 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"