[ldc] Update to latest revision
MERCIER Jonathan
bioinfornatics at fedoraproject.org
Tue Oct 4 17:42:37 UTC 2011
commit f844d0f24e8e33340dacdc64608d945bf83c1845
Author: Jonathan MERCIER <bioinfornatics at gmail.com>
Date: Tue Oct 4 19:35:34 2011 +0200
Update to latest revision
ldc.spec | 34 ++++++++--------------------------
sources | 2 +-
2 files changed, 9 insertions(+), 27 deletions(-)
---
diff --git a/ldc.spec b/ldc.spec
index bfd5d6d..aa70d4a 100644
--- a/ldc.spec
+++ b/ldc.spec
@@ -1,3 +1,4 @@
+#%global debug_package %{nil}
%global snapdate 20110915
%global ldc_rev 423076d
%global phobos_rev a8106d9
@@ -153,6 +154,7 @@ find . -type f -exec sed -i 's/\r//g' {} \;
-DPHOBOS2_DIR=./phobos \
-DD_FLAGS:STRING="-O2;-g;-w;-d;-release" \
-DLLVM_CONFIG_HEADER=config-%{__isa_bits}.h \
+ -DINCLUDE_INSTALL_DIR:PATH=%{_includedir}/d \
.
make VERBOSE=2 phobos2
@@ -166,32 +168,14 @@ install --mode=0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/rpm/macros.ldc
sed -i \
-e "10a \ \ \ \ \ \ \ \"-I%{_includedir}\/d\"," \
-e "11a \ \ \ \ \ \ \ \"-I%{_includedir}\/d\/phobos\","\
- -e "/^.*-I.*%{name}-%{alphatag}%{git_revision}.*$/d" \
- -e "s/-L-L.*lib/-L-L$(%{_libdir})\/druntime.so/" bin/ldc2.conf
+ -e "12a \ \ \ \ \ \ \ \"-I%{_includedir}\/d\/ldc\"," \
+ -e "/^.*-I.*%{name}-%{alphatag}.*$/d" \
+ -e "s|-L-L.*lib|-L-L%{_libdir}/druntime.so|" %{buildroot}/%{_sysconfdir}/ldc2.conf
sed -i "s|DFLAGS.*|DFLAGS=-I%{_includedir}/d -L-L%{_libdir} -d-version=Phobos -defaultlib=phobos2 -debuglib=phobos2|" bin/ldc2.rebuild.conf
ln %{buildroot}%{_bindir}/ldc2 %{buildroot}%{_bindir}/ldc
-# fix install
- # lib for 64bits
-%ifarch x86_64 sparc64
- mv %{buildroot}/%{_prefix}/lib %{buildroot}/%{_libdir}/
-%endif
-
- # devel file
-ls %{buildroot}/%{_prefix}
-mv %{buildroot}/%{_prefix}/src/debug/%{name}-%{alphatag} %{buildroot}/%{_includedir}/d/
-rm -fr %{buildroot}/%{_includedir}/d/runtime
- # druntime
-mv %{buildroot}/%{_includedir}/d/druntime/src/* %{buildroot}/%{_includedir}/d/druntime:
-rm -fr %{buildroot}/%{_includedir}/d/druntime/src
- # phobos
-
- # ldc
-mv %{buildroot}/%{_includedir}/d/dmd2 %{buildroot}/%{_includedir}/d/ldc/dmd2
-mv %{buildroot}/%{_includedir}/d/gen %{buildroot}/%{_includedir}/d/ldc/gen
-mv %{buildroot}/%{_includedir}/d/ir %{buildroot}/%{_includedir}/d/ldc/ir
%clean
rm -rf %{buildroot}
@@ -204,7 +188,7 @@ rm -rf %{buildroot}
%{_bindir}/ldc
%{_bindir}/ldc2
%{_bindir}/ldmd2
-%{_includedir}/d/ldc
+%{_includedir}/d/core
%files druntime
%defattr(-,root,root,-)
@@ -213,8 +197,7 @@ rm -rf %{buildroot}
%files druntime-devel
%defattr(-,root,root,-)
-%{_includedir}/d/druntime
-%{_includedir}/d/object.di
+%{_includedir}/d/ldc
%files phobos
%defattr(-,root,root,-)
@@ -223,8 +206,7 @@ rm -rf %{buildroot}
%files phobos-devel
%defattr(-,root,root,-)
-%{_includedir}/d/std
-%{_includedir}/d/etc
+%{_includedir}/d/phobos
%changelog
* Sat Sep 17 2011 Jonathan MERCIER <bioinfornatics at fedoraproject.org> - 2-4.20110915git423076d
diff --git a/sources b/sources
index 311f82d..4cfab3c 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-39989ff6e8b79ab66cc63965f15872cc ldc_fix_build.patch
+933b6891b9d7079984d69a0c5e5bb908 ldc_fix_build.patch
6f58232c2a7553dd25ee10cc5290bd19 ldc-20110915git423076d.tar.xz
bddc6dc464f0be3cfd887400052de9d4 ldc-druntime-20110915gitfba10fa.tar.xz
651c18c92efe41b42ecbc1e44ddc0218 ldc-phobos-20110915gita8106d9.tar.xz
More information about the scm-commits
mailing list