[oe-commits] Bian Naimeng : cyrus-sasl: remove trailing slash from plugin directory path

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: 7b3d4803b42f1afcdceab0e29cf8eda14fcd4a87
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=7b3d4803b42f1afcdceab0e29cf8eda14fcd4a87

Author: Bian Naimeng <biannm at cn.fujitsu.com>
Date:   Sun Feb 15 16:58:22 2015 +0800

cyrus-sasl: remove trailing slash from  plugin directory path

Specifying the plugin directory with a trailing '/' hit this failure in
the install rule:

  ... snip ...

  install-exec-local: $(INSTALLOSX)
        @if test "$(plugindir)" != "$(prefix)/lib/sasl2"; then \
          echo "********************************************************"; \
          echo "* WARNING:"; \
          echo "* Plugins are being installed into $(prefix)/lib/sasl2,"; \
          echo "* but the library will look for them in $(plugindir)."; \
          echo "* You need to make sure that the plugins will eventually"; \
          echo "* be in $(plugindir) -- the easiest way is to make a"; \
          echo "* symbolic link from $(plugindir) to $(prefix)/lib/sasl2,"; \
          echo "* but this may not be appropriate for your site, so this"; \
          echo "* installation procedure won't do it for you."; \
          echo "*"; \
          echo "* If you don't want to do this for some reason, you can"; \
          echo "* set the location where the library will look for plugins"; \
          echo "* by setting the environment variable SASL_PATH to the path"; \
          echo "* the library should use."; \
          echo "********************************************************"; \
        fi

Work around that.

Signed-off-by: Bian Naimeng <biannm at cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald at mentor.com>

---

 meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb
index ea9cd1c..491ecdb 100644
--- a/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb
+++ b/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb
@@ -18,7 +18,7 @@ EXTRA_OECONF += "--with-dblib=berkeley \
                  --with-bdb-libdir=${STAGING_LIBDIR} \
                  --with-bdb-incdir=${STAGING_INCDIR} \
                  --with-bdb=db-5.3 \
-                 --with-plugindir="${libdir}/sasl2/" \
+                 --with-plugindir="${libdir}/sasl2" \
                  andrew_cv_runpath_switch=none"
 
 PACKAGECONFIG ??= "ntlm \