[DRE-commits] [diaspora-installer] 02/12: set sigar build flags correctly

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository diaspora-installer.

commit fa970f41b6d0c67160b146356cfdca5f48c5a1d8
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Aug 27 23:15:21 2016 +0530

    set sigar build flags correctly
---
 debian/changelog | 1 +
 debian/postinst  | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b1c14af..9dee77a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 diaspora-installer (0.6.0.0+debian1) unstable; urgency=medium
 
   * Install 0.6.0.0 version
+  * Make sure sigar build flags are set always
 
  -- Pirate Praveen <praveen at debian.org>  Sat, 27 Aug 2016 12:05:03 +0530
 
diff --git a/debian/postinst b/debian/postinst
index ecbb84d..ab4cc24 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -43,6 +43,8 @@ install_gems() {
 # Needs eye for init script
         gem install bundler
 	ln -sf /usr/local/bin/bundle ${diaspora_home}/bin/bundle
+	# https://github.com/hyperic/sigar/issues/60
+        su diaspora -s /bin/sh -c "bundle config --local build.sigar '--with-cppflags=\"-fgnu89-inline\"'"
 }
 
 case "$1" in
@@ -68,8 +70,6 @@ case "$1" in
 
                 install_gems
 
-		# https://github.com/hyperic/sigar/issues/60
-                su diaspora -s /bin/sh -c "bundle config --local build.sigar '--with-cppflags=\"-fgnu89-inline\"'"
                 su diaspora -s /bin/sh -c 'bundle install'
                 su diaspora -s /bin/sh -c "sed -i s/Rails.application.config.secret_token/Diaspora::Application.config.secret_key_base/ ${diaspora_home}/config/initializers/secret_token.rb"
 		migrate
@@ -84,8 +84,6 @@ case "$1" in
                     . ${diaspora_conf}
 		    install_gems
 
-		    # https://github.com/hyperic/sigar/issues/60
-                    su diaspora -s /bin/sh -c "bundle config --local build.sigar '--with-cppflags=\"-fgnu89-inline\"'"
                     su diaspora -s /bin/sh -c 'bundle install --without development test'
 		    migrate
                 else

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora-installer.git