From: Vladimir Sokolovsky <vlad@mellanox.com>
Date: Thu, 16 Feb 2017 09:32:29 +0000 (+0200)
Subject: install.pl: Set __arch_install_post to nil
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fofed_3_18;p=~tnikolova%2Fofed_scripts%2F.git

install.pl: Set __arch_install_post to nil

This is to avoid rpmbuild failure in case of redefinition of this macro by user.
issue: http://bugs.openfabrics.org/show_bug.cgi?id=2598

Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>
---

diff --git a/install.pl b/install.pl
index 54b5b4f..c7acd6d 100755
--- a/install.pl
+++ b/install.pl
@@ -3451,7 +3451,6 @@ sub build_rpm
             $cmd .= " --define '_sysconfdir $sysconfdir'";
             $cmd .= " --define '_usr $prefix'";
             $cmd .= " --define 'build_ibmgtsim 1'";
-            $cmd .= " --define '__arch_install_post %{nil}'";
         }
         elsif ( $parent eq "mvapich") {
             my $compiler = (split('_', $name))[1];
@@ -3460,7 +3459,6 @@ sub build_rpm
             $cmd .= " --define 'openib_prefix $prefix'";
             $cmd .= " --define '_usr $prefix'";
             $cmd .= " --define 'use_mpi_selector 1'";
-            $cmd .= " --define '__arch_install_post %{nil}'";
             if ($packages_info{'mvapich'}{'configure_options'}) {
                 $cmd .= " --define 'configure_options $packages_info{'mvapich'}{'configure_options'}'";
             }
@@ -3750,6 +3748,7 @@ sub build_rpm
             $cmd .= " --define 'configure_options $packages_info{$parent}{'configure_options'} $user_configure_options'";
         }
 
+        $cmd .= " --define '__arch_install_post %{nil}'";
         $cmd .= " $main_packages{$parent}{'srpmpath'}";
 
         print "Running $cmd\n" if ($verbose);