From 77a95fb7b27e4333d14d092dba5d1ba341177f69 Mon Sep 17 00:00:00 2001 From: Jonathan MERCIER Date: Wed, 15 Feb 2012 17:18:48 +0100 Subject: [PATCH] DMDFE 2.058 --- .gitignore | 4 ++++ ldc.spec | 54 ++++++++++++++++++++++++++++++++++-------------------- sources | 8 ++++---- 3 files changed, 42 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index f9658ca..bd20d2b 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,7 @@ ldc-20100804hg1655.tar.xz /ldc-201210207git72d510c.xz /ldc-phobos-201210207git1f6264e.xz /ldc-druntime-201210207git4db79c7.xz +/ldc-201210215git5af48ed.xz +/ldc-druntime-201210215git3645d7e.xz +/ldc-phobos-201210215git2cc90b1.xz +/ldc_versionned.patch diff --git a/ldc.spec b/ldc.spec index 48cb7bb..0b0bfd6 100644 --- a/ldc.spec +++ b/ldc.spec @@ -1,8 +1,8 @@ # debug info seem not works with D compiler -%global snapdate 201210207 -%global ldc_rev 72d510c -%global phobos_rev 1f6264e -%global druntime_rev 4db79c7 +%global snapdate 201210215 +%global ldc_rev 5af48ed +%global phobos_rev 2cc90b1 +%global druntime_rev 3645d7e %global alphatag %{snapdate}git%{ldc_rev} %global phobostag %{snapdate}git%{phobos_rev} %global druntimetag %{snapdate}git%{druntime_rev} @@ -12,9 +12,10 @@ # cd ldc; git rev-parse --short HEAD -> for ldc_rev # 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 submodule update -i; git checkout %%ldc_rev +# git clone https://github.com/ldc-developers/ldc.git ldc_checkout +# cd ldc_checkout; git checkout %%ldc_rev # git archive --prefix=ldc-%%{alphatag}/ HEAD | xz > ../ldc-%%{alphatag}.xz +# git submodule update -i; # cd runtime/druntime # git archive --prefix=runtime/druntime/ HEAD | xz > ../../../ldc-druntime-%%{druntimetag}.xz # cd ../phobos @@ -22,7 +23,7 @@ Name: ldc Version: 2 -Release: 11.%{alphatag}%{?dist} +Release: 12.%{alphatag}%{?dist} Summary: A compiler for the D programming language Group: Development/Languages @@ -35,6 +36,8 @@ Source1: %{name}-phobos-%{phobostag}.xz Source2: %{name}-druntime-%{druntimetag}.xz Source3: macros.%{name} Source4: DdocToDevhelp +# https://github.com/ldc-developers/ldc/pull/80 +Patch0: ldc_versionned.patch BuildRequires: llvm-devel >= 3.0 BuildRequires: libconfig, libconfig-devel @@ -72,7 +75,7 @@ implémenter. Summary: Runtime library for D Group: Development/Tools License: Boost -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description druntime Druntime is the minimum library required to support the D programming @@ -90,8 +93,8 @@ démarage/extinction, etc %package druntime-devel Summary: Support for developing D application Group: Development/Tools -Requires: %{name} = %{version}-%{release} -Requires: %{name}-druntime +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-druntime = %{version}-%{release} %description druntime-devel @@ -106,8 +109,8 @@ des applications en D utilisant druntime. Summary: Standard Runtime Library Group: Development/Tools License: Boost -Requires: %{name} = %{version}-%{release} -Requires: %{name}-druntime +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-druntime = %{version}-%{release} %description phobos Each module in Phobos conforms as much as possible to the following design @@ -126,8 +129,8 @@ situations, et les programmeurs doivent implémenter d'une certaines manière. %package phobos-devel Summary: Support for developing D application Group: Development/Tools -Requires: %{name} = %{version}-%{release} -Requires: %{name}-phobos +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-phobos = %{version}-%{release} Requires: %{name}-druntime-devel %description phobos-devel @@ -142,6 +145,7 @@ des applications en D utilisant phobos. Summary: Support for enable autocompletion in geany Group: Development/Tools Requires: %{name} = %{version}-%{release} +BuildArch: noarch BuildRequires: geany Requires: geany @@ -154,7 +158,7 @@ Active l'autocompletion pour pour la bibliothèque phobos dans geany (IDE) %package phobos-devhelp Summary: Phobos user and reference manuals Group: Development/Tools -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} BuildArch: noarch BuildRequires: python, python-BeautifulSoup Requires: devhelp @@ -171,6 +175,7 @@ devhelp pour le parcourir. %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 find . -type f -exec sed -i 's/\r//g' {} \; # temp geany config directory for allow geany to generate tags mkdir geany_config @@ -197,8 +202,6 @@ install -m0644 phobos.d.tags %{buildroot}/%{_datadir}/geany/tags/ python %{SOURCE4} -n Phobos -s %{buildroot}%{_includedir}/d/std/ -p %{buildroot}/%{_datadir} find %{buildroot}/%{_datadir}/devhelp/books/Phobos -name "*.html" | xargs sed -i "s|%{buildroot}||g" -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig %post druntime -p /sbin/ldconfig %postun druntime -p /sbin/ldconfig %post phobos -p /sbin/ldconfig @@ -209,26 +212,30 @@ find %{buildroot}/%{_datadir}/devhelp/books/Phobos -name "*.html" | xargs sed -i %config(noreplace) %{_sysconfdir}/ldc2.rebuild.conf %config(noreplace) %{_sysconfdir}/ldc2.conf %config %{_sysconfdir}/rpm/macros.ldc -%{_sysconfdir}/bash_completion.d/ldc +%config %{_sysconfdir}/bash_completion.d/ldc %{_bindir}/ldc2 %{_bindir}/ldmd2 %files druntime %doc runtime/druntime/LICENSE_1_0.txt runtime/druntime/README.txt -%{_libdir}/libdruntime-ldc.so +%{_libdir}/libdruntime-ldc.so.2.0.57 +%{_libdir}/libdruntime-ldc.so.57 %files druntime-devel %{_includedir}/d/ldc %{_includedir}/d/core +%{_libdir}/libdruntime-ldc.so %files phobos %doc runtime/phobos/LICENSE_1_0.txt -%{_libdir}/libphobos2-ldc.so +%{_libdir}/libphobos-ldc.so.2.0.57 +%{_libdir}/libphobos-ldc.so.57 %files phobos-devel %{_includedir}/d/crc32.d %{_includedir}/d/std %{_includedir}/d/etc +%{_libdir}/libphobos-ldc.so %files phobos-geany-tags %{_datadir}/geany/tags/phobos.d.tags @@ -237,6 +244,13 @@ find %{buildroot}/%{_datadir}/devhelp/books/Phobos -name "*.html" | xargs sed -i %{_datadir}/devhelp/books/Phobos %changelog +* Wed Feb 15 2012 Jonathan MERCIER - 2-12.201210215git5af48ed +- Update to latest revision +- update dmdfe to 2.058 +- ldc has new parameter -soname +- fix library creation when multiple object files +- fix phobos and druntime soname + * Mon Feb 13 2012 Jonathan MERCIER - 2-11.201210207git72d510c - update to latest revision - update dmdfe to 2.057 diff --git a/sources b/sources index 85271cf..900053f 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ +aea66011f7e4826e7d802d8e026934e4 ldc-201210215git5af48ed.xz +0be4ca181944f2c49efc079b2752436e ldc-druntime-201210215git3645d7e.xz +0df35bf7409bfab54348b14927329305 ldc-phobos-201210215git2cc90b1.xz 2207fd2545a5fc62c93e3ba72c89c4ca macros.ldc -d4589c353570552e2d5b8adf87e492f7 DdocToDevhelp -bdb0a731806cab553a32c8f19a4d4271 ldc-201210207git72d510c.xz -eb7bbeadcd08a1160cae3c32f22ded05 ldc-phobos-201210207git1f6264e.xz -e698b955fbb5385e7f319119cfe48839 ldc-druntime-201210207git4db79c7.xz +b5dbc125fa91a20efa047889494005aa ldc_versionned.patch