Fix libpmem configuration option

[PATCH] Fix libpmem configuration option

Posted by Miroslav Rezanina 4 years, 7 months ago

For some reason, libpmem option setting was set to work in an opposite
way (--enable-libpmem disabled it and vice versa). Fixing this so
configuration works properly.

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
---
 configure | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 7994bdee92..ffa93cc5fd 100755
--- a/configure
+++ b/configure
@@ -1501,9 +1501,9 @@ for opt do
   ;;
   --disable-debug-mutex) debug_mutex=no
   ;;
-  --enable-libpmem) libpmem=disabled
+  --enable-libpmem) libpmem="enabled"
   ;;
-  --disable-libpmem) libpmem=enabled
+  --disable-libpmem) libpmem="disabled"
   ;;
   --enable-xkbcommon) xkbcommon="enabled"
   ;;
-- 
2.27.0

Re: [PATCH] Fix libpmem configuration option

Posted by Connor Kuehl 4 years, 7 months ago

On Wed Jul 7, 2021 at 12:51 AM PDT, Miroslav Rezanina wrote:
> For some reason, libpmem option setting was set to work in an opposite
> way (--enable-libpmem disabled it and vice versa). Fixing this so
> configuration works properly.
>
> Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
> ---
> configure | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/configure b/configure
> index 7994bdee92..ffa93cc5fd 100755
> --- a/configure
> +++ b/configure
> @@ -1501,9 +1501,9 @@ for opt do
> ;;
> --disable-debug-mutex) debug_mutex=no
> ;;
> - --enable-libpmem) libpmem=disabled
> + --enable-libpmem) libpmem="enabled"
> ;;
> - --disable-libpmem) libpmem=enabled
> + --disable-libpmem) libpmem="disabled"
> ;;
> --enable-xkbcommon) xkbcommon="enabled"
> ;;
> --
> 2.27.0

Good catch.

Reviewed-by: Connor Kuehl <ckuehl@redhat.com>

or

Tested-by: Connor Kuehl <ckuehl@redhat.com>

Re: [PATCH] Fix libpmem configuration option

Posted by Pankaj Gupta 4 years, 7 months ago

> For some reason, libpmem option setting was set to work in an opposite
> way (--enable-libpmem disabled it and vice versa). Fixing this so
> configuration works properly.
>
> Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
> ---
>  configure | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/configure b/configure
> index 7994bdee92..ffa93cc5fd 100755
> --- a/configure
> +++ b/configure
> @@ -1501,9 +1501,9 @@ for opt do
>    ;;
>    --disable-debug-mutex) debug_mutex=no
>    ;;
> -  --enable-libpmem) libpmem=disabled
> +  --enable-libpmem) libpmem="enabled"
>    ;;
> -  --disable-libpmem) libpmem=enabled
> +  --disable-libpmem) libpmem="disabled"
>    ;;
>    --enable-xkbcommon) xkbcommon="enabled"
>    ;;

Reviewed-by: Pankaj Gupta <pankaj.gupta@ionos.com>

Re: [PATCH] Fix libpmem configuration option

Posted by Li 4 years, 7 months ago

i have to apply below extra changes

 From a8d027d3dfe70fb33363ad5934e163999fc29eec Mon Sep 17 00:00:00 2001
From: Li Zhijian <lizhijian@cn.fujitsu.com>
Date: Thu, 8 Jul 2021 17:52:40 +0800
Subject: [PATCH] fix libpmem configuration

Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
---
  configure | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index a172c83e150..0a3a4610f27 100755
--- a/configure
+++ b/configure
@@ -4818,7 +4818,7 @@ elif test "$pthread_setname_np_wo_tid" = "yes" ; then
    echo "CONFIG_PTHREAD_SETNAME_NP_WO_TID=y" >> $config_host_mak
  fi
  
-if test "$libpmem" = "yes" ; then
+if test "$libpmem" = "enabled" ; then
    echo "CONFIG_LIBPMEM=y" >> $config_host_mak
    echo "LIBPMEM_LIBS=$libpmem_libs" >> $config_host_mak
    echo "LIBPMEM_CFLAGS=$libpmem_cflags" >> $config_host_mak
-- 
2.31.1

On 2021/7/7 15:51, Miroslav Rezanina wrote:
> For some reason, libpmem option setting was set to work in an opposite
> way (--enable-libpmem disabled it and vice versa). Fixing this so
> configuration works properly.
>
> Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
> ---
>   configure | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/configure b/configure
> index 7994bdee92..ffa93cc5fd 100755
> --- a/configure
> +++ b/configure
> @@ -1501,9 +1501,9 @@ for opt do
>     ;;
>     --disable-debug-mutex) debug_mutex=no
>     ;;
> -  --enable-libpmem) libpmem=disabled
> +  --enable-libpmem) libpmem="enabled"
>     ;;
> -  --disable-libpmem) libpmem=enabled
> +  --disable-libpmem) libpmem="disabled"
>     ;;
>     --enable-xkbcommon) xkbcommon="enabled"
>     ;;

Re: [PATCH] Fix libpmem configuration option

Posted by Philippe Mathieu-Daudé 4 years, 7 months ago

On 7/7/21 9:51 AM, Miroslav Rezanina wrote:
> For some reason, libpmem option setting was set to work in an opposite
> way (--enable-libpmem disabled it and vice versa). Fixing this so
> configuration works properly.
> 
> Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
> ---
>  configure | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/configure b/configure
> index 7994bdee92..ffa93cc5fd 100755
> --- a/configure
> +++ b/configure
> @@ -1501,9 +1501,9 @@ for opt do
>    ;;
>    --disable-debug-mutex) debug_mutex=no
>    ;;
> -  --enable-libpmem) libpmem=disabled
> +  --enable-libpmem) libpmem="enabled"
>    ;;
> -  --disable-libpmem) libpmem=enabled
> +  --disable-libpmem) libpmem="disabled"
>    ;;
>    --enable-xkbcommon) xkbcommon="enabled"
>    ;;
> 

Fixes: e36e8c70f6d ("configure, meson: convert libpmem detection to meson")
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>