[idris/f18] fix install of libraries: backport support for TARGET envvar to Package.hs

Jens Petersen petersen at fedoraproject.org
Thu Aug 29 08:02:22 UTC 2013


commit 259f195ea22c5c33b4bb130e829142b992304b1a
Author: Jens Petersen <petersen at redhat.com>
Date:   Thu Aug 29 15:43:07 2013 +0900

    fix install of libraries: backport support for TARGET envvar to Package.hs

 idris-0.9.4.1-Package-TARGET.patch |   12 ++++++++++++
 idris.spec                         |    7 +++----
 2 files changed, 15 insertions(+), 4 deletions(-)
---
diff --git a/idris-0.9.4.1-Package-TARGET.patch b/idris-0.9.4.1-Package-TARGET.patch
new file mode 100644
index 0000000..03389df
--- /dev/null
+++ b/idris-0.9.4.1-Package-TARGET.patch
@@ -0,0 +1,12 @@
+--- idris-0.9.4.1/src/Pkg/Package.hs~	2012-10-08 04:32:22.000000000 +0900
++++ idris-0.9.4.1/src/Pkg/Package.hs	2013-08-29 16:56:53.259316489 +0900
+@@ -106,7 +106,8 @@
+ 
+ installIBC :: String -> Name -> IO ()
+ installIBC p m = do let f = toIBCFile m
+-                    d <- getDataDir
++                    target <- environment "TARGET"
++                    d <- maybe getDataDir return target
+                     let destdir = d ++ "/" ++ p ++ "/" ++ getDest m
+                     putStrLn $ "Installing " ++ f ++ " to " ++ destdir
+                     system $ "mkdir -p " ++ destdir 
diff --git a/idris.spec b/idris.spec
index cd443d0..15cb4c2 100644
--- a/idris.spec
+++ b/idris.spec
@@ -8,6 +8,7 @@ Summary:        Functional Programming Language with Dependent Types
 License:        BSD
 URL:            http://hackage.haskell.org/package/%{name}
 Source0:        http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
+Patch0:         idris-0.9.4.1-Package-TARGET.patch
 
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
@@ -53,6 +54,7 @@ closely related to Epigram and Agda. There is a tutorial at
 
 %prep
 %setup -q
+%patch0 -p1 -b .orig
 
 
 %build
@@ -62,12 +64,9 @@ cabal_configure_extra_options=--datadir=%{_libdir}
 export LANG=en_US.utf8
 %ghc_bin_build
 
-
 %install
 %ghc_bin_install
 
-make -C lib install TARGET=%{buildroot}/%{_datadir}/%{name}-%{version} IDRIS=%{buildroot}%{_bindir}/idris
-
 
 %files
 %doc LICENSE tutorial
@@ -77,7 +76,7 @@ make -C lib install TARGET=%{buildroot}/%{_datadir}/%{name}-%{version} IDRIS=%{b
 
 %changelog
 * Thu Aug 29 2013 Jens Petersen <petersen at redhat.com> - 0.9.4.1-2
-- need to compile and install libraries explicitly for older idris
+- fix install of libraries: backport support for TARGET envvar to Package.hs
 
 * Tue Aug 20 2013 Jens Petersen <petersen at redhat.com> - 0.9.4.1-1
 - use cabal_configure_extra_options to set datadir (#947819)


More information about the scm-commits mailing list