From 86a03ae71ac9fbcfca87ae363f14556268627080 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hadrian=20W=C4=99grzynowski?=
 <hadrianw@users.noreply.github.com>
Date: Sat, 24 Dec 2016 09:43:30 +0100
Subject: [PATCH] Fix handling of package options in packages with '+'
 character in name. (#5385)

Substitute '+' character with '_', because eval treats '+' character
as not a part of variable name.
---
 common/xbps-src/shutils/common.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index 0e3ab7822c..ab3a546ab1 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -98,6 +98,7 @@ set_build_options() {
 
     for f in ${build_options}; do
         _pkgname=${pkgname//\-/\_}
+        _pkgname=${_pkgname//\+/\_}
         eval pkgopts="\$XBPS_PKG_OPTIONS_${_pkgname}"
         if [ -z "$pkgopts" -o "$pkgopts" = "" ]; then
             pkgopts=${XBPS_PKG_OPTIONS}