[haskell-platform] also need to chrpath alex; fix quoting in RPATH sed

Jens Petersen petersen at fedoraproject.org
Fri Jun 8 03:42:50 UTC 2012


commit 35ba98b0d1e4c628712f10ab7f3bc88db1d09fdc
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Jun 8 12:42:44 2012 +0900

    also need to chrpath alex; fix quoting in RPATH sed

 haskell-platform.spec |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/haskell-platform.spec b/haskell-platform.spec
index b83086a..ab67b8f 100644
--- a/haskell-platform.spec
+++ b/haskell-platform.spec
@@ -261,9 +261,9 @@ cd ..
 
 # fix RPATHs in programs linking to HP user libs
 %if %{undefined ghc_without_dynamic}
-for i in cabal happy; do
+for i in alex cabal happy; do
   PROG=%{buildroot}%{_bindir}/$i
-  RPATH=$(chrpath $PROG| sed -e "s/^$PROG: RPATH=//")
+  RPATH=$(chrpath $PROG| sed -e "s!^$PROG: RPATH=!!")
   case $RPATH in
     $PACKAGES_DIR*)
       NEWRPATH=$(echo $RPATH | sed -e "s!$PACKAGES_DIR!%{ghclibdir}!g" -e "s!/dist/build!!g")
@@ -328,7 +328,7 @@ done
 - no longer need to unset debug_package
 - make sure all the dynamically linked files get stripped
 - needs ghc-rpm-macros 0.95.1 or later to build
-- use chrpath to fix RPATHs of cabal and happy dynamically linked to HP libs
+- use chrpath to fix the program RPATHs when dynamically linked to HP libs
 
 * Wed May  9 2012 Jens Petersen <petersen at redhat.com> - 2011.4.0.741-2
 - update cabal-install to 0.14.0


More information about the scm-commits mailing list