| Message ID | 1449785931-6944-1-git-send-email-aserdean@cloudbasesolutions.com |
|---|---|
| State | Accepted |
| Headers | show |
On Thu, Dec 10, 2015 at 10:18:51PM +0000, Alin Serdean wrote: > Patch 43000bc introduced a portability improvement. > > This patch adds the command for $SED 's' and also changes to x86 for 32 bit > instead of x64. > > Signed-off-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com> This is partly my fault because I reviewed that commit without seeing the bugs it introduced. My apologies. I applied this to master and branch-2.5.
diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4 index 683a6a7..0cfaae6 100644 --- a/m4/openvswitch.m4 +++ b/m4/openvswitch.m4 @@ -109,11 +109,11 @@ AC_DEFUN([OVS_CHECK_WIN32], fi if test "$cl_cv_x64" = yes; then PTHREAD_WIN32_DIR=$withval/lib/x64 - PTHREAD_WIN32_DIR_DLL=/$(echo ${withval} | ${SED} -e '/://')/dll/x64 + PTHREAD_WIN32_DIR_DLL=/$(echo ${withval} | ${SED} -e 's/://')/dll/x64 PTHREAD_WIN32_DIR_DLL_WIN_FORM=$withval/dll/x64 else PTHREAD_WIN32_DIR=$withval/lib/x86 - PTHREAD_WIN32_DIR_DLL=/$(echo ${withval} | ${SED} -e '/://')/dll/x64 + PTHREAD_WIN32_DIR_DLL=/$(echo ${withval} | ${SED} -e 's/://')/dll/x86 PTHREAD_WIN32_DIR_DLL_WIN_FORM=$withval/dll/x86 fi PTHREAD_INCLUDES=-I$withval/include
Patch 43000bc introduced a portability improvement. This patch adds the command for $SED 's' and also changes to x86 for 32 bit instead of x64. Signed-off-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com> --- m4/openvswitch.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)