rpms/llvm/devel llvm.spec,1.18,1.19
Michel Alexandre Salim
salimma at fedoraproject.org
Sun Sep 6 20:32:54 UTC 2009
Author: salimma
Update of /cvs/pkgs/rpms/llvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31178
Modified Files:
llvm.spec
Log Message:
Restore previous directory layout. This is hopefully the final 2.5-series
spec
Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/devel/llvm.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- llvm.spec 6 Sep 2009 19:31:08 -0000 1.18
+++ llvm.spec 6 Sep 2009 20:32:54 -0000 1.19
@@ -166,6 +166,7 @@ for developing applications that use %{n
mkdir obj && cd obj
../configure \
--prefix=%{_prefix} \
+ --libdir=%{_libdir}/llvm \
--disable-assertions \
--enable-debug-runtime \
--enable-jit \
@@ -174,7 +175,7 @@ mkdir obj && cd obj
%endif
# configure does not properly specify libdir
-sed -i 's|(PROJ_prefix)/lib|(PROJ_prefix)/%{_lib}|g' Makefile.config
+sed -i 's|(PROJ_prefix)/lib|(PROJ_prefix)/%{_lib}/llvm|g' Makefile.config
make %{_smp_mflags} OPTIMIZE_OPTION='%{optflags}'
@@ -220,7 +221,7 @@ chmod -x examples/Makefile
# OVERRIDE_libdir used by our patched Makefile.ocaml:
# see http://llvm.org/bugs/show_bug.cgi?id=3153
make install DESTDIR=%{buildroot} \
- OVERRIDE_libdir=%{_libdir} \
+ OVERRIDE_libdir=%{_libdir}/llvm \
PROJ_docsdir=`pwd`/../moredocs
#make install \
@@ -237,7 +238,7 @@ find %{buildroot} -name .dir -print0 | x
file %{buildroot}/%{_bindir}/* | awk -F: '$2~/ELF/{print $1}' | xargs -r chrpath -d
# Get rid of erroneously installed example files.
-rm %{buildroot}%{_libdir}/LLVMHello.*
+rm %{buildroot}%{_libdir}/llvm/LLVMHello.*
# And OCaml .o files
rm %{buildroot}%{_libdir}/ocaml/*.o
@@ -311,8 +312,7 @@ rm -rf %{buildroot}
%{_bindir}/llvm-config
%{_includedir}/%{name}
%{_includedir}/%{name}-c
-%exclude %{_libdir}/ocaml
-%{_libdir}/*
+%{_libdir}/llvm
%files ocaml
More information about the fedora-extras-commits
mailing list