rpms/llvm/devel llvm-2.5-Base.td-x86_32.patch, NONE, 1.1 llvm-2.5-tclsh_check.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 llvm.spec, 1.15, 1.16 sources, 1.6, 1.7
Michel Alexandre Salim
salimma at fedoraproject.org
Sun Sep 6 03:00:39 UTC 2009
- Previous message (by thread): rpms/vinagre/devel vinagre-prefs.patch, NONE, 1.1 vinagre.spec, 1.54, 1.55
- Next message (by thread): rpms/kernel/F-10 linux-2.6-ocfs2-handle-len-0.patch, NONE, 1.1.2.1 linux-2.6-slub-fix-destroy-by-rcu.patch, NONE, 1.1.2.1 kernel.spec, 1.1206.2.87, 1.1206.2.88
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: salimma
Update of /cvs/pkgs/rpms/llvm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26396
Modified Files:
.cvsignore llvm.spec sources
Added Files:
llvm-2.5-Base.td-x86_32.patch llvm-2.5-tclsh_check.patch
Log Message:
Commit llvm-gcc source
llvm-2.5-Base.td-x86_32.patch:
Base.td | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE llvm-2.5-Base.td-x86_32.patch ---
--- tools/llvmc/plugins/Base/Base.td.orig 2009-03-28 21:25:47.000000000 +0100
+++ tools/llvmc/plugins/Base/Base.td 2009-03-28 21:26:29.000000000 +0100
@@ -113,7 +113,7 @@
[(in_language "llvm-bitcode"),
(out_language "assembler"),
(output_suffix "s"),
- (cmd_line "llc -relocation-model=pic -f $INFILE -o $OUTFILE"),
+ (cmd_line "llc -f $INFILE -o $OUTFILE"),
(actions (case (switch_on "S"), (stop_compilation)))
]>;
llvm-2.5-tclsh_check.patch:
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE llvm-2.5-tclsh_check.patch ---
--- llvm-2.5/configure.tclsh_check 2009-02-03 00:29:49.000000000 -0500
+++ llvm-2.5/configure 2009-09-05 12:25:54.761389908 -0400
@@ -8032,7 +8032,7 @@
else
if test x"${with_tclinclude}" != x ; then
- if test -f ${with_tclinclude}/tclsh ; then
+ if test -f ${with_tclinclude}/tcl.h ; then
ac_cv_path_tclsh=`(cd ${with_tclinclude}; pwd)`
elif test -f ${with_tclinclude}/src/tclsh ; then
ac_cv_path_tclsh=`(cd ${with_tclinclude}/src; pwd)`
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore 5 Mar 2009 00:27:31 -0000 1.6
+++ .cvsignore 6 Sep 2009 03:00:38 -0000 1.7
@@ -1 +1,2 @@
llvm-2.5.tar.gz
+llvm-gcc-4.2-2.5.source.tar.gz
Index: llvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/devel/llvm.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- llvm.spec 22 Aug 2009 21:18:32 -0000 1.15
+++ llvm.spec 6 Sep 2009 03:00:39 -0000 1.16
@@ -7,15 +7,18 @@
# The llvm-gcc package doesn't currently build.
%define lgcc_version 4.2
+# attempt turning on llvm-gcc
+%define _with_gcc 1
# LLVM object files don't contain build IDs. I don't know why yet.
# Suppress their generation for now.
-%define debug_package %{nil}
+%define _missing_build_ids_terminate_build 0
+#define debug_package %{nil}
Name: llvm
Version: 2.5
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: The Low Level Virtual Machine
Group: Development/Languages
@@ -29,6 +32,8 @@ Patch0: llvm-2.1-fix-sed.patch
Patch1: llvm-2.4-fix-ocaml.patch
# http://llvm.org/bugs/show_bug.cgi?id=3726
Patch2: llvm-2.5-gcc44.patch
+Patch3: llvm-2.5-tclsh_check.patch
+Patch4: llvm-2.5-Base.td-x86_32.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -39,6 +44,8 @@ BuildRequires: gcc-c++ >= 3.4
BuildRequires: groff
BuildRequires: libtool-ltdl-devel
BuildRequires: ocaml-ocamldoc
+# for DejaGNU test suite
+BuildRequires: dejagnu tcl-devel
%if %{?_with_doxygen:1}%{!?_with_doxygen:0}
BuildRequires: doxygen graphviz
%endif
@@ -146,63 +153,75 @@ for developing applications that use %{n
%patch0 -p1 -b .fix-sed
%patch1 -p1 -b .fix-ocaml
%patch2 -p1 -b .gcc44
+%patch3 -p1 -b .tclsh_check
+
+%ifarch %{ix86}
+%patch4 -p0 -b .ix86pic
+%endif
%build
# Note: --enable-pic can be turned off when 2.6 comes out
# and up to 2.5, unsafe on 32-bit archs (in our case,
# anything but x86_64)
-%configure \
- --libdir=%{_libdir}/%{name} \
- --datadir=%{_datadir}/%{name}-%{version} \
- --disable-static \
- --enable-assertions \
+# Disabling assertions now, rec. by pure and needed for OpenGTL
+mkdir obj && cd obj
+../configure \
+ --prefix=%{_prefix} \
+ --disable-assertions \
--enable-debug-runtime \
--enable-jit \
- --enable-optimized \
-%ifnarch %ix86
+%ifnarch %{ix86}
--enable-pic
%endif
-# --enable-targets=host-only \
+
+# configure does not properly specify libdir
+sed -i 's|(PROJ_prefix)/lib|(PROJ_prefix)/%{_lib}|g' Makefile.config
make %{_smp_mflags} OPTIMIZE_OPTION='%{optflags}'
-# tools-only VERBOSE=1 OmitFramePointer='' REQUIRES_EH=1 \
-# OPTIMIZE_OPTION='%{optflags}'
%if %{?_with_gcc:1}%{!?_with_gcc:0}
# Build llvm-gcc.
-export PATH=%{_builddir}/%{?buildsubdir}/Release/bin:$PATH
-
-mkdir llvm-gcc%{lgcc_version}-%{version}.source/build
-cd llvm-gcc%{lgcc_version}-%{version}.source/build
+export PATH=%{_builddir}/obj/Release-Asserts/bin:$PATH
+cd ..
+mkdir gcc-obj
+cd gcc-obj
-../configure \
- --host=%{_host} \
- --build=%{_build} \
- --target=%{_target_platform} \
- --prefix=%{_libdir}/llvm-gcc \
- --libdir=%{_libdir}/llvm-gcc/%{_lib} \
- --enable-threads \
- --disable-nls \
+../llvm-gcc-%{lgcc_version}-%{version}.source/configure \
+ --prefix=%{_prefix} \
+ --libdir=%{_libdir} \
+ --enable-languages=ada,c,c++ \
+ --enable-checking \
+ --enable-llvm=$PWD/../obj \
+ --disable-bootstrap \
%ifarch x86_64
--disable-multilib \
--disable-shared \
%endif
- --enable-languages=c,c++ \
- --enable-llvm=%{_builddir}/%{?buildsubdir} \
--program-prefix=llvm-
+
make %{_smp_mflags} LLVM_VERSION_INFO=%{version}
%endif
+%check
+(cd obj && make check) 2>&1 | tee testlogs.txt ; true
+
+# Report failures and unexpected successes
+echo
+cat testlogs.txt | grep FAIL
+cat testlogs.txt | grep XPASS
+echo
+
+
%install
rm -rf %{buildroot}
+cd obj
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} \
- PROJ_libdir=%{buildroot}/%{_libdir}/%{name} \
- OVERRIDE_libdir=%{_libdir}/%{name}/%{name} \
- PROJ_docsdir=`pwd`/moredocs
+ OVERRIDE_libdir=%{_libdir} \
+ PROJ_docsdir=`pwd`/../moredocs
#make install \
# PROJ_prefix=%{buildroot}/%{_prefix} \
@@ -218,7 +237,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}/%{name}/LLVMHello.*
+rm %{buildroot}%{_libdir}/LLVMHello.*
# And OCaml .o files
rm %{buildroot}%{_libdir}/ocaml/*.o
@@ -234,7 +253,7 @@ rm %{buildroot}%{_bindir}/gcc{as,ld}
sed -i 's,ABS_RUN_DIR/lib",ABS_RUN_DIR/%{_lib}/%{name}",' \
%{buildroot}%{_bindir}/llvm-config
-chmod -x %{buildroot}%{_libdir}/%{name}/*.[oa]
+chmod -x %{buildroot}%{_libdir}/*.[oa]
# remove documentation makefiles:
# they require the build directory to work
@@ -270,7 +289,7 @@ rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
-%doc CREDITS.TXT LICENSE.TXT README.txt
+%doc CREDITS.TXT LICENSE.TXT README.txt testlogs.txt
%exclude %{_bindir}/llvm-config
%{_bindir}/bugpoint
%{_bindir}/llc
@@ -292,7 +311,8 @@ rm -rf %{buildroot}
%{_bindir}/llvm-config
%{_includedir}/%{name}
%{_includedir}/%{name}-c
-%{_libdir}/%{name}
+%exclude %{_libdir}/ocaml
+%{_libdir}/*
%files ocaml
@@ -352,6 +372,12 @@ rm -rf %{buildroot}
%changelog
+* Sat Sep 5 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-6
+- Disable assertions (needed by OpenGTL)
+- Align spec file with upstream build instructions
+- Enable llvm-gcc
+- Enable unit tests
+
* Sat Aug 22 2009 Michel Salim <salimma at fedoraproject.org> - 2.5-5
- Only disable PIC on %%ix86; ppc actually needs it
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/llvm/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources 5 Mar 2009 00:27:31 -0000 1.6
+++ sources 6 Sep 2009 03:00:39 -0000 1.7
@@ -1 +1,2 @@
55df2ea8665c8094ad2ef85187b9fc74 llvm-2.5.tar.gz
+c5800d85059fcf80429a86c536127595 llvm-gcc-4.2-2.5.source.tar.gz
- Previous message (by thread): rpms/vinagre/devel vinagre-prefs.patch, NONE, 1.1 vinagre.spec, 1.54, 1.55
- Next message (by thread): rpms/kernel/F-10 linux-2.6-ocfs2-handle-len-0.patch, NONE, 1.1.2.1 linux-2.6-slub-fix-destroy-by-rcu.patch, NONE, 1.1.2.1 kernel.spec, 1.1206.2.87, 1.1206.2.88
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list