forked from pool/mono-core
This commit is contained in:
parent
270619f959
commit
9d14a48aa1
74
bug-237611_nov237611-fix-s390.diff
Normal file
74
bug-237611_nov237611-fix-s390.diff
Normal file
@ -0,0 +1,74 @@
|
||||
--- mono/io-layer/atomic.h.mm 2007-03-05 12:06:25.000000000 +0000
|
||||
+++ mono/io-layer/atomic.h 2007-03-05 14:40:32.794868433 +0000
|
||||
@@ -301,7 +301,7 @@ InterlockedCompareExchange(volatile gint
|
||||
__asm__ __volatile__ ("\tLA\t1,%0\n"
|
||||
"\tLR\t%1,%3\n"
|
||||
"\tCS\t%1,%2,0(1)\n"
|
||||
- : "+m" (*dest), "=r" (old)
|
||||
+ : "+m" (*dest), "=&r" (old)
|
||||
: "r" (exch), "r" (comp)
|
||||
: "1", "cc");
|
||||
return(old);
|
||||
@@ -317,7 +317,7 @@ InterlockedCompareExchangePointer(volati
|
||||
__asm__ __volatile__ ("\tLA\t1,%0\n"
|
||||
"\tLR\t%1,%3\n"
|
||||
"\tCS\t%1,%2,0(1)\n"
|
||||
- : "+m" (*dest), "=r" (old)
|
||||
+ : "+m" (*dest), "=&r" (old)
|
||||
: "r" (exch), "r" (comp)
|
||||
: "1", "cc");
|
||||
return(old);
|
||||
@@ -333,7 +333,7 @@ InterlockedCompareExchangePointer(volati
|
||||
__asm__ __volatile__ ("\tLA\t1,%0\n"
|
||||
"\tLGR\t%1,%3\n"
|
||||
"\tCSG\t%1,%2,0(1)\n"
|
||||
- : "+m" (*dest), "=r" (old)
|
||||
+ : "+m" (*dest), "=&r" (old)
|
||||
: "r" (exch), "r" (comp)
|
||||
: "1", "cc");
|
||||
|
||||
@@ -426,7 +426,7 @@ InterlockedExchange(volatile gint32 *val
|
||||
"0:\tL\t%1,%0\n"
|
||||
"\tCS\t%1,%2,0(1)\n"
|
||||
"\tJNZ\t0b"
|
||||
- : "+m" (*val), "=r" (ret)
|
||||
+ : "+m" (*val), "=&r" (ret)
|
||||
: "r" (new_val)
|
||||
: "1", "cc");
|
||||
|
||||
@@ -443,7 +443,7 @@ InterlockedExchangePointer(volatile gpoi
|
||||
"0:\tL\t%1,%0\n"
|
||||
"\tCS\t%1,%2,0(1)\n"
|
||||
"\tJNZ\t0b"
|
||||
- : "+m" (*val), "=r" (ret)
|
||||
+ : "+m" (*val), "=&r" (ret)
|
||||
: "r" (new_val)
|
||||
: "1", "cc");
|
||||
|
||||
@@ -459,7 +459,7 @@ InterlockedExchangePointer(volatile gpoi
|
||||
"0:\tLG\t%1,%0\n"
|
||||
"\tCSG\t%1,%2,0(1)\n"
|
||||
"\tJNZ\t0b"
|
||||
- : "+m" (*val), "=r" (ret)
|
||||
+ : "+m" (*val), "=&r" (ret)
|
||||
: "r" (new_val)
|
||||
: "1", "cc");
|
||||
|
||||
@@ -479,7 +479,7 @@ InterlockedExchangeAdd(volatile gint32 *
|
||||
"\tAR\t1,%2\n"
|
||||
"\tCS\t%0,1,0(2)\n"
|
||||
"\tJNZ\t0b"
|
||||
- : "=r" (ret), "+m" (*val)
|
||||
+ : "=&r" (ret), "+m" (*val)
|
||||
: "r" (add)
|
||||
: "1", "2", "cc");
|
||||
|
||||
@@ -497,7 +497,7 @@ InterlockedExchangeAdd(volatile gint32 *
|
||||
"\tAGR\t1,%2\n"
|
||||
"\tCS\t%0,1,0(2)\n"
|
||||
"\tJNZ\t0b"
|
||||
- : "=r" (ret), "+m" (*val)
|
||||
+ : "=&r" (ret), "+m" (*val)
|
||||
: "r" (add)
|
||||
: "1", "2", "cc");
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ef4c80e8c7a0647aedba1ebb915384362ef2358d3f1291abbb22b799de207461
|
||||
size 19982851
|
3
mono-1.2.3.1.tar.gz
Normal file
3
mono-1.2.3.1.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b177ced4e3ec0c2efc6a4e17f1f87f6e852f319332d4f138d25d4a68ffba2c78
|
||||
size 20694945
|
@ -1,3 +1,56 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 6 02:38:57 CET 2007 - wberrier@suse.de
|
||||
|
||||
- atomic fixes from Michael Matz for for s390 and s390x
|
||||
( bnc #237611 and bxc #80892 )
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 28 18:55:52 CET 2007 - wberrier@suse.de
|
||||
|
||||
- Turn off sigaltstack, as it's not safe (Requested by Paolo)
|
||||
- Remove obsolete patches
|
||||
|
||||
- Update to 1.2.3.1 (Various runtime and winforms crashers
|
||||
as well as a zmd crasher)
|
||||
|
||||
- 1.2.3 Changes:
|
||||
- 1,933 missing methods were implemented.
|
||||
- 164 methods with pending implementations were fixed.
|
||||
- Improved Winforms 2.0 Support, with additional controls, and
|
||||
reduced memory usage
|
||||
- API complete ASP.NET 2.0 implementation (except for WebParts).
|
||||
- System.Media implementation
|
||||
- Supports SOAP 1.2 as well as the WS-BasicProfile 1.1 checker
|
||||
- Many fixes to the XmlSerializer as well to support the new features
|
||||
- The mkbundle tool now allows the machine.config file to be embedded
|
||||
as well
|
||||
- HttpListener now also support HTTPS, to configure the certificates
|
||||
use the httpcfg tool
|
||||
- Completed the support for the 2.0 updates to the API in
|
||||
System.Net.Sockets
|
||||
- System.Drawing.SystemIcons are now implemented
|
||||
- Authenticode: Signcode now generates valid signature on PE
|
||||
files with extra data (e.g. debug information, installers)
|
||||
and for file length that aren't multiple of eight
|
||||
- SSL/TLS: Fix negotiation cache and added configurable cache
|
||||
timeout using the MONO_TLS_SESSION_CACHE_TIMEOUT environment variable
|
||||
- XML Signature and XML Encryption: several bug fixes, it now it
|
||||
support exclusive canonicalization (needed for ongoing Olive work)
|
||||
- Support for inherited key parameters in DSA certificates
|
||||
- Support for DSA certificates in PKCS#12 files
|
||||
- Better support for X.509 CRL (including stores & certmgr support)
|
||||
- xbuild improvements
|
||||
- Sqlite 2.0 API support
|
||||
- Array and multi-array access optimizations
|
||||
- Versioned header files
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Jan 20 07:08:52 CET 2007 - wberrier@suse.de
|
||||
|
||||
- Move libgdiplus requirement from mono-winforms to mono-core
|
||||
since System.Drawing (in mono-core) is useless without it
|
||||
(Won't affect mono-winforms, since it depends on mono-core)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 9 21:32:48 CET 2007 - wberrier@suse.de
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package mono-core (Version 1.2.2)
|
||||
# spec file for package mono-core (Version 1.2.3.1)
|
||||
#
|
||||
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
@ -16,8 +16,8 @@ License: GNU Library General Public License v. 2.0 and 2.1 (LGPL)
|
||||
Group: Development/Languages/Other
|
||||
Summary: A .NET Runtime Environment
|
||||
URL: http://go-mono.org/
|
||||
Version: 1.2.2
|
||||
Release: 11
|
||||
Version: 1.2.3.1
|
||||
Release: 1
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Source0: mono-%{version}.tar.gz
|
||||
# kdepatch patch won't work with the new relocatable Mono (Miguel)
|
||||
@ -26,7 +26,7 @@ Patch16: mono-warnings.patch
|
||||
Patch21: mono-monodis_cast.patch
|
||||
Patch25: mono-supportw.patch
|
||||
Patch26: mono-ppc.patch
|
||||
Patch27: mono-rpm_deps_error_handling_r70445.patch
|
||||
Patch27: bug-237611_nov237611-fix-s390.diff
|
||||
ExclusiveArch: %ix86 x86_64 ppc hppa armv4l sparc s390 ia64 s390x
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Provides: mono = %{version}-%{release}
|
||||
@ -38,6 +38,7 @@ Obsoletes: mono-xml-relaxng
|
||||
Obsoletes: mono-posix
|
||||
Obsoletes: mono-ziplib
|
||||
Obsoletes: mono-ikvm
|
||||
Requires: libgdiplus
|
||||
%ifarch s390 s390x
|
||||
PreReq: grep
|
||||
%endif
|
||||
@ -297,7 +298,6 @@ Authors:
|
||||
Summary: Mono's Windows Forms implementation
|
||||
Group: Development/Languages/Other
|
||||
Requires: mono-core == %version-%release
|
||||
Requires: libgdiplus
|
||||
Provides: mono-window-forms
|
||||
Obsoletes: mono-window-forms
|
||||
|
||||
@ -712,6 +712,7 @@ Authors:
|
||||
# exes
|
||||
%_prefix/lib/mono/1.0/makecert.exe*
|
||||
%_prefix/lib/mono/1.0/al.exe*
|
||||
%_prefix/lib/mono/2.0/al.exe*
|
||||
%_prefix/lib/mono/1.0/caspol.exe*
|
||||
%_prefix/lib/mono/1.0/cert2spc.exe*
|
||||
%_prefix/lib/mono/1.0/dtd2xsd.exe*
|
||||
@ -732,9 +733,16 @@ Authors:
|
||||
%_prefix/lib/mono/1.0/prj2make.exe*
|
||||
%_prefix/lib/mono/1.0/macpack.exe*
|
||||
%_prefix/lib/mono/1.0/mono-shlib-cop.exe*
|
||||
%_prefix/lib/mono/2.0/xbuild.exe*
|
||||
%_prefix/lib/mono/1.0/dtd2rng.exe*
|
||||
%_prefix/lib/mono/1.0/mono-xmltool.exe*
|
||||
# xbuild related files
|
||||
%_prefix/lib/mono/2.0/xbuild.exe*
|
||||
%_prefix/lib/mono/2.0/Microsoft.Build.xsd
|
||||
%_prefix/lib/mono/2.0/Microsoft.Common.tasks
|
||||
%_prefix/lib/mono/2.0/Microsoft.Common.targets
|
||||
%_prefix/lib/mono/2.0/Microsoft.CSharp.targets
|
||||
%_prefix/lib/mono/2.0/MSBuild
|
||||
%_prefix/lib/mono/2.0/xbuild.rsp
|
||||
# man pages
|
||||
%_mandir/man1/cert2spc.1.gz
|
||||
%_mandir/man1/dtd2xsd.1.gz
|
||||
@ -755,6 +763,7 @@ Authors:
|
||||
%_mandir/man1/mono-xmltool.1.gz
|
||||
# Shell wrappers
|
||||
%_bindir/al
|
||||
%_bindir/al2
|
||||
%_bindir/caspol
|
||||
%_bindir/cert2spc
|
||||
%_bindir/dtd2xsd
|
||||
@ -783,7 +792,6 @@ Authors:
|
||||
%_bindir/sgen
|
||||
%_bindir/signcode
|
||||
%_bindir/xbuild
|
||||
%_prefix/lib/mono/xbuild
|
||||
%_prefix/lib/mono/gac/PEAPI
|
||||
%_prefix/lib/mono/1.0/PEAPI.dll
|
||||
%_prefix/lib/mono/2.0/PEAPI.dll
|
||||
@ -796,17 +804,18 @@ Authors:
|
||||
%_prefix/lib/mono/gac/Microsoft.Build.Engine
|
||||
%_prefix/lib/mono/2.0/Microsoft.Build.Engine.dll
|
||||
%_bindir/monograph
|
||||
%_prefix/include/mono
|
||||
%_prefix/include/mono-1.0
|
||||
%_libdir/libmono-profiler-cov.*
|
||||
%_libdir/libmono-profiler-aot.*
|
||||
%_libdir/pkgconfig/mono.pc
|
||||
%_libdir/pkgconfig/dotnet.pc
|
||||
%_libdir/pkgconfig/mono-cairo.pc
|
||||
%_mandir/man1/monoburg.*
|
||||
%_prefix/share/mono/cil/cil-opcodes.xml
|
||||
%_prefix/share/mono-1.0/mono/cil/cil-opcodes.xml
|
||||
# dirs
|
||||
%dir %_prefix/share/mono
|
||||
%dir %_prefix/share/mono/cil
|
||||
%dir %_prefix/share/mono-1.0
|
||||
%dir %_prefix/share/mono-1.0/mono
|
||||
%dir %_prefix/share/mono-1.0/mono/cil
|
||||
#%package -n mono-complete
|
||||
#Summary: This package contains all runtime Mono packages
|
||||
#Group: Development/Tools
|
||||
@ -857,7 +866,7 @@ export CFLAGS="$RPM_OPT_FLAGS -DKDE_ASSEMBLIES='\"/opt/kde3/%{_lib}\"' -fno-stri
|
||||
--sysconfdir=/etc \
|
||||
--with-jit=yes \
|
||||
--with-ikvm=yes \
|
||||
--with-sigaltstack
|
||||
--with-sigaltstack=no
|
||||
make
|
||||
|
||||
%install
|
||||
@ -926,11 +935,60 @@ rm -f $RPM_BUILD_ROOT/usr/%_lib/libMonoSupportW.so
|
||||
# 1.1.17 updates:
|
||||
# This file moved to mono-basic
|
||||
rm -f $RPM_BUILD_ROOT/usr/bin/mbas
|
||||
# From 1.2.3.1 update
|
||||
cd $RPM_BUILD_ROOT
|
||||
rm -f ./usr/lib/mono/2.0/Microsoft.VisualBasic.targets
|
||||
# Can add these later once httpcfg.exe is installed correctly
|
||||
rm -f ./usr/bin/httpcfg
|
||||
# Ugh, forgot that you can't specify man pages as .1.gz ...
|
||||
rm -f ./usr/share/man/man1/httpcfg.1
|
||||
|
||||
%clean
|
||||
rm -rf ${RPM_BUILD_ROOT}
|
||||
|
||||
%changelog -n mono-core
|
||||
%changelog
|
||||
* Tue Mar 06 2007 - wberrier@suse.de
|
||||
- atomic fixes from Michael Matz for for s390 and s390x
|
||||
( bnc #237611 and bxc #80892 )
|
||||
* Wed Feb 28 2007 - wberrier@suse.de
|
||||
- Turn off sigaltstack, as it's not safe (Requested by Paolo)
|
||||
- Remove obsolete patches
|
||||
- Update to 1.2.3.1 (Various runtime and winforms crashers
|
||||
as well as a zmd crasher)
|
||||
- 1.2.3 Changes:
|
||||
- 1,933 missing methods were implemented.
|
||||
- 164 methods with pending implementations were fixed.
|
||||
- Improved Winforms 2.0 Support, with additional controls, and
|
||||
reduced memory usage
|
||||
- API complete ASP.NET 2.0 implementation (except for WebParts).
|
||||
- System.Media implementation
|
||||
- Supports SOAP 1.2 as well as the WS-BasicProfile 1.1 checker
|
||||
- Many fixes to the XmlSerializer as well to support the new features
|
||||
- The mkbundle tool now allows the machine.config file to be embedded
|
||||
as well
|
||||
- HttpListener now also support HTTPS, to configure the certificates
|
||||
use the httpcfg tool
|
||||
- Completed the support for the 2.0 updates to the API in
|
||||
System.Net.Sockets
|
||||
- System.Drawing.SystemIcons are now implemented
|
||||
- Authenticode: Signcode now generates valid signature on PE
|
||||
files with extra data (e.g. debug information, installers)
|
||||
and for file length that aren't multiple of eight
|
||||
- SSL/TLS: Fix negotiation cache and added configurable cache
|
||||
timeout using the MONO_TLS_SESSION_CACHE_TIMEOUT environment variable
|
||||
- XML Signature and XML Encryption: several bug fixes, it now it
|
||||
support exclusive canonicalization (needed for ongoing Olive work)
|
||||
- Support for inherited key parameters in DSA certificates
|
||||
- Support for DSA certificates in PKCS#12 files
|
||||
- Better support for X.509 CRL (including stores & certmgr support)
|
||||
- xbuild improvements
|
||||
- Sqlite 2.0 API support
|
||||
- Array and multi-array access optimizations
|
||||
- Versioned header files
|
||||
* Sat Jan 20 2007 - wberrier@suse.de
|
||||
- Move libgdiplus requirement from mono-winforms to mono-core
|
||||
since System.Drawing (in mono-core) is useless without it
|
||||
(Won't affect mono-winforms, since it depends on mono-core)
|
||||
* Tue Jan 09 2007 - wberrier@suse.de
|
||||
- Move mono-find-provides/requires to mono-devel since they depend
|
||||
on monodis, which is in mono-devel
|
||||
|
@ -1,36 +0,0 @@
|
||||
Index: scripts/mono-find-provides.in
|
||||
===================================================================
|
||||
--- scripts/mono-find-provides.in (revision 70444)
|
||||
+++ scripts/mono-find-provides.in (revision 70445)
|
||||
@@ -27,8 +27,11 @@
|
||||
libdir=$prefix/@reloc_libdir@
|
||||
bindir=$d
|
||||
|
||||
-[ -x $bindir/monodis ] || exit 0;
|
||||
-[ -f $libdir/libmono.so ] || exit 0;
|
||||
+# Bail out if monodis or libmono is missing
|
||||
+if [ ! -x $bindir/monodis ] || [ ! -f $libdir/libmono.so ] ; then
|
||||
+ echo "monodis missing or unusable, exiting..."
|
||||
+ exit 1
|
||||
+fi
|
||||
|
||||
|
||||
# set LD_LIBRARY_PATH to ensure that libmono.so is found
|
||||
Index: scripts/mono-find-requires.in
|
||||
===================================================================
|
||||
--- scripts/mono-find-requires.in (revision 70444)
|
||||
+++ scripts/mono-find-requires.in (revision 70445)
|
||||
@@ -22,8 +22,11 @@
|
||||
libdir=$prefix/@reloc_libdir@
|
||||
bindir=$d
|
||||
|
||||
-[ -x $bindir/monodis ] || exit 0;
|
||||
-[ -f $libdir/libmono.so ] || exit 0;
|
||||
+# Bail out if monodis or libmono is missing
|
||||
+if [ ! -x $bindir/monodis ] || [ ! -f $libdir/libmono.so ] ; then
|
||||
+ echo "monodis missing or unusable, exiting..."
|
||||
+ exit 1
|
||||
+fi
|
||||
|
||||
|
||||
# set LD_LIBRARY_PATH to ensure that libmono.so is found
|
Loading…
Reference in New Issue
Block a user