rpms/mono
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed build problem

Browse Source
This commit is contained in:
Paul F. Johnson 2007-12-19 14:21:33 +00:00
parent 86ecf30b87
commit 2491bca2e9
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mono-mcs-config.patch
View File

@ -16,7 +16,7 @@
echo "exec_prefix=$exec_prefix" >> $srcdir/$mcsdir/build/config.make
echo "sysconfdir=$sysconfdir" >> $srcdir/$mcsdir/build/config.make
- echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$mcsdir/build/config.make
+ echo 'mono_libdir=/usr/lib64' >> $srcdir/$mcsdir/build/config.make
+ echo 'mono_libdir='$libdir' >> $srcdir/$mcsdir/build/config.make
echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$mcsdir/build/config.make
echo 'IL_FLAGS = /debug' >> $srcdir/$mcsdir/build/config.make
echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$mcsdir/build/config.make
@ -25,7 +25,7 @@
echo "prefix=$prefix" > $srcdir/$olivedir/build/config.make
echo "exec_prefix=$exec_prefix" >> $srcdir/$olivedir/build/config.make
- echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$olivedir/build/config.make
+ echo 'mono_libdir=/usr/lib64' >> $srcdir/$olivedir/build/config.make
+ echo 'mono_libdir=$libdir' >> $srcdir/$olivedir/build/config.make
echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$olivedir/build/config.make
echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$olivedir/build/config.make
echo "MONO_VERSION = $myver" >> $srcdir/$olivedir/build/config.make

12
mono.spec
View File

@ -1,6 +1,6 @@
Name: mono
Version: 1.2.6
Release: 5%{?dist}
Release: 6%{?dist}
Summary: a .NET runtime environment
Group: Development/Languages
@ -238,7 +238,6 @@ which is fully managed and actively maintained.
%prep
%setup -q
sed -i -e "s!@LIBDIR@!%{_libdir}!" %{PATCH8}
%patch8 -p1 -b .config
%patch1 -p1 -b .selinux-ia64
%patch2 -p1 -b .ppc-threading
@ -254,12 +253,12 @@ export CFLAGS="-O2 -fno-strict-aliasing"
%else
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%endif
autoreconf --force --install
autoreconf -f -i -s
gcc -o monodir %{SOURCE1} -DMONODIR=\"%{_libdir}/mono\"
%configure --with-ikvm=yes --with-jit=yes --with-xen_opt=yes
make
%configure --with-ikvm=yes --with-jit=yes --with-xen_opt=yes
make %{?_smp_mflags}
%install
@ -573,8 +572,9 @@ install monodir $RPM_BUILD_ROOT%{_bindir}
%gac_dll IBM.Data.DB2
%changelog
* Wed Dec 19 2007 Paul F. Johnson <paul@all-the-johnsons.co.uk> 1.2.6-5
* Wed Dec 19 2007 Paul F. Johnson <paul@all-the-johnsons.co.uk> 1.2.6-6
- added BR libunwind-devel for ia64 (bz426180)
- fix for LIBDIR problem
* Tue Dec 16 2007 Paul F. Johnson <paul@all-the-johnsons.co.uk> 1.2.6-4
- bump new version