[ldc/f16] latest release
MERCIER Jonathan
bioinfornatics at fedoraproject.org
Thu Nov 10 18:46:09 UTC 2011
commit b7d39b83c16768eff917150191a9c8c29184fb06
Author: Jonathan MERCIER <bioinfornatics at gmail.com>
Date: Thu Nov 10 19:14:17 2011 +0100
latest release
.gitignore | 3 ++
ldc.spec | 70 +++++++++++++++++++++++++++--------------------------------
macros.ldc | 4 +-
sources | 9 +++----
4 files changed, 41 insertions(+), 45 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1a882d6..bc28781 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,6 @@ ldc-20100804hg1655.tar.xz
/ldc-druntime-20110915gitfba10fa.tar.xz
/ldc-phobos-20110915gita8106d9.tar.xz
/macros.ldc
+/ldc-20110911git3cf958a.xz
+/ldc-druntime-20110911git367dbb7.xz
+/ldc-phobos-20110911gita8106d9.xz
diff --git a/ldc.spec b/ldc.spec
index e265f0e..bedcece 100644
--- a/ldc.spec
+++ b/ldc.spec
@@ -1,8 +1,8 @@
#%global debug_package %{nil}
-%global snapdate 20110915
-%global ldc_rev 423076d
+%global snapdate 20110911
+%global ldc_rev 3cf958a
%global phobos_rev a8106d9
-%global druntime_rev fba10fa
+%global druntime_rev 367dbb7
%global alphatag %{snapdate}git%{ldc_rev}
%global phobostag %{snapdate}git%{phobos_rev}
%global druntimetag %{snapdate}git%{druntime_rev}
@@ -13,19 +13,19 @@
# cd ldc/phobos; git rev-parse --short HEAD -> for phobos_rev
# cd ldc/druntime/; git rev-parse --short HEAD -> for druntime_rev
# git clone https://github.com/ldc-developers/ldc.git
-# (cd ldc; git checkout 423076d; git submodule init; git submodule update; \
-# git archive --prefix=ldc-%%{alphatag}/ HEAD \
-# ) | xz > ldc-%%{alphatag}.xz
-# (cd ldc/druntime; \
-# git archive --prefix=druntime/ HEAD \
-# ) | xz > ldc-druntime-%%{druntimetag}.xz
-# (cd ldc/phobos; \
-# git archive --prefix=phobos/ HEAD \
-# ) | xz > ldc-phobos-%%{phobostag}.xz
+# (cd ldc; git checkout 3cf958a; git submodule init; git submodule update; \
+# git archive --prefix=ldc-%%{alphatag}/ HEAD | xz > ../ldc-%%{alphatag}.xz \
+# )
+# (cd ldc/druntime; \
+# git archive --prefix=druntime/ HEAD | xz > ../../ldc-druntime-%%{druntimetag}.xz \
+# )
+# (cd ldc/phobos; \
+# git archive --prefix=phobos/ HEAD | xz > ../../ldc-phobos-%%{phobostag}.xz \
+# )
Name: ldc
Version: 2
-Release: 4.%{alphatag}%{?dist}
+Release: 5.%{alphatag}%{?dist}
Summary: A compiler for the D programming language
Group: Development/Languages
@@ -33,15 +33,13 @@ Group: Development/Languages
# The files gen/asmstmt.cpp and gen/asm-*.hG PL version 2+ or artistic license
License: BSD
URL: http://www.dsource.org/projects/ldc
-Source0: %{name}-%{alphatag}.tar.xz
-Source1: %{name}-phobos-%{phobostag}.tar.xz
-Source2: %{name}-druntime-%{druntimetag}.tar.xz
+Source0: %{name}-%{alphatag}.xz
+Source1: %{name}-phobos-%{phobostag}.xz
+Source2: %{name}-druntime-%{druntimetag}.xz
Source3: macros.%{name}
-# fix current build system report to upstream done
-Patch0: %{name}_fix_build.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#BuildRequires: llvm-devel >= 2.9
+BuildRequires: llvm-devel >= 2.9
BuildRequires: libconfig, libconfig-devel
BuildRequires: cmake
BuildRequires: gc, gcc-c++, gcc
@@ -157,7 +155,6 @@ Active l'autocompletion pour pour la bibliothèque phobos dans geany (IDE)
%setup -q -n %{name}-%{alphatag}
%setup -q -T -D -a 1 -n %{name}-%{alphatag}
%setup -q -T -D -a 2 -n %{name}-%{alphatag}
-%patch0 -p1 -b .fix
find . -type f -exec sed -i 's/\r//g' {} \;
# temp geany config directory for allow geany to generate tags
mkdir geany_config
@@ -167,6 +164,7 @@ mkdir geany_config
-DCONF_INST_DIR:PATH=%{_sysconfdir} \
-DRUNTIME_DIR=./druntime \
-DPHOBOS2_DIR=./phobos \
+ -DBUILD_SHARED_LIBS:BOOL=ON \
-DD_FLAGS:STRING="-O2;-g;-w;-d;-release" \
-DLLVM_CONFIG_HEADER=config-%{__isa_bits}.h \
-DINCLUDE_INSTALL_DIR:PATH=%{_includedir}/d \
@@ -181,28 +179,21 @@ rm -rf %{buildroot}
make %{?_smp_mflags} install DESTDIR=%{buildroot}
mkdir -p %{buildroot}/%{_sysconfdir}/rpm
mkdir -p %{buildroot}/%{_includedir}/d/ldc
+mkdir -p %{buildroot}/%{_datadir}/geany/tags/
+# macros for D package
install --mode=0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/rpm/macros.ldc
-
-sed -i \
- -e "10a \ \ \ \ \ \ \ \"-I%{_includedir}\/d\"," \
- -e "11a \ \ \ \ \ \ \ \"-I%{_includedir}\/d\/phobos\","\
- -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
+# geany tags
+install -m0755 phobos.d.tags %{buildroot}/%{_datadir}/geany/tags/
%clean
rm -rf %{buildroot}
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-%post druntime -p /sbin/ldconfig
-%postun druntime -p /sbin/ldconfig
-%post phobos -p /sbin/ldconfig
-%postun phobos -p /sbin/ldconfig
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+%post druntime -p /sbin/ldconfig
+%postun druntime -p /sbin/ldconfig
+%post phobos -p /sbin/ldconfig
+%postun phobos -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
@@ -210,7 +201,7 @@ rm -rf %{buildroot}
%config(noreplace) %{_sysconfdir}/ldc2.rebuild.conf
%config(noreplace) %{_sysconfdir}/ldc2.conf
%config %{_sysconfdir}/rpm/macros.ldc
-%{_bindir}/ldc
+%{_sysconfdir}/bash_completion.d/ldc
%{_bindir}/ldc2
%{_bindir}/ldmd2
%{_includedir}/d/core
@@ -238,6 +229,9 @@ rm -rf %{buildroot}
%{_datadir}/geany/tags/phobos.d.tags
%changelog
+* Thu Nov 9 2011 Jonathan MERCIER <bioinfornatics at fedoraproject.org> - 2-5.20110911git3cf958ad
+- Update to latest revision
+
* Sat Sep 17 2011 Jonathan MERCIER <bioinfornatics at fedoraproject.org> - 2-4.20110915git423076d
- Update to latest revision
diff --git a/macros.ldc b/macros.ldc
index 60132c6..076cf7d 100644
--- a/macros.ldc
+++ b/macros.ldc
@@ -4,6 +4,6 @@
# Include directory where all .di or .d file are installed.
%_d_includedir %{_includedir}/d
# Compile options for ldc and make file
-%_d_optflags -release -w -g -O2
+%_d_optflags -release -w -g -O3
# Lib directory path
-%_d_libdir %{_libdir}/d
+%_d_libdir %{_libdir}/d/
diff --git a/sources b/sources
index 4cfab3c..ba330b7 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,4 @@
-933b6891b9d7079984d69a0c5e5bb908 ldc_fix_build.patch
-6f58232c2a7553dd25ee10cc5290bd19 ldc-20110915git423076d.tar.xz
-bddc6dc464f0be3cfd887400052de9d4 ldc-druntime-20110915gitfba10fa.tar.xz
-651c18c92efe41b42ecbc1e44ddc0218 ldc-phobos-20110915gita8106d9.tar.xz
-79c203a287c764bed1e612d7b77e1901 macros.ldc
+054783bb633047d6e85881df33e0573f ldc-20110911git3cf958a.xz
+99ea029c82f345c041cac5f9548fa46b ldc-druntime-20110911git367dbb7.xz
+651c18c92efe41b42ecbc1e44ddc0218 ldc-phobos-20110911gita8106d9.xz
+2207fd2545a5fc62c93e3ba72c89c4ca macros.ldc
More information about the scm-commits
mailing list