Skip to contentSkip to conversation

configure: only add CONFIG_RDMA to config-host.h once

PATCH Applied Daniel P. Berrange 2 participants 2 messages Jul 31, 2015

lore
Share & tools
lore

Daniel P. Berrange

author
#0 lore raw

PATCH 1/1 configure: only add CONFIG_RDMA to config-host.h once

For unknown reasons (probably a git rebase merge mistake)

commit 2da776db4846eadcb808598a5d3484d149773c05
Author: Michael R. Hines <[email protected]>
Date: Mon Jul 22 10:01:54 2013 -0400

rdma: core logic

Adds CONFIG_RDMA to config-host.h twice, as can be seen in the generated file:

 $ grep CONFIG_RDMA config-host.h
 #define CONFIG_RDMA 1
 #define CONFIG_RDMA 1
Signed-off-by Daniel P. Berrange <[email protected]>
---
 configure | 4 ----
 1 file changed, 4 deletions(-)
configure +0 -4
index a14dc44..8f35400b 100755
@@ -5635,10 +5635,6 @@ if [ "$pixman" = "internal" ]; then
   echo "config-host.h: subdir-pixman" >> $config_host_mak
 fi
 
-if test "$rdma" = "yes" ; then
-echo "CONFIG_RDMA=y" >> $config_host_mak
-fi
-
 if [ "$dtc_internal" = "yes" ]; then
   echo "config-host.h: subdir-dtc" >> $config_host_mak
 fi
Signature · 1 line
2.4.3
Applied
#1 lore raw
Quoted 26 lines · Daniel P. Berrange

For unknown reasons (probably a git rebase merge mistake)

commit 2da776db4846eadcb808598a5d3484d149773c05
Author: Michael R. Hines <[email protected]>
Date: Mon Jul 22 10:01:54 2013 -0400

rdma: core logic

Adds CONFIG_RDMA to config-host.h twice, as can be seen in the generated file:

 $ grep CONFIG_RDMA config-host.h
 #define CONFIG_RDMA 1
 #define CONFIG_RDMA 1
Signed-off-by Daniel P. Berrange <[email protected]>
---
 configure | 4 ----
 1 file changed, 4 deletions(-)
configure +0 -0
index a14dc44..8f35400b 100755

configure if [ "$pixman" = "internal" ]; then · line 5640

Quoted 10 lines
configure +0 -4
@@ -5635,10 +5635,6 @@ if [ "$pixman" = "internal" ]; then
   echo "config-host.h: subdir-pixman" >> $config_host_mak
 fi
 
-if test "$rdma" = "yes" ; then
-echo "CONFIG_RDMA=y" >> $config_host_mak
-fi
-
 if [ "$dtc_internal" = "yes" ]; then
   echo "config-host.h: subdir-dtc" >> $config_host_mak
 fi

Picked up for 2.5, thanks.

Paolo