From 151b07735f1a8131b5c076a385860821957a3b0b9fcdb29e0c0ad1e7c528aeff Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 11 Apr 2008 21:31:21 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mono-core?expand=0&rev=21 --- mono-core-arg_max.diff | 11 +++++++++++ mono-core.changes | 11 +++++++++++ mono-core.spec | 11 ++++++++++- mono-libtool.diff | 11 +++++++++++ 4 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 mono-core-arg_max.diff create mode 100644 mono-libtool.diff diff --git a/mono-core-arg_max.diff b/mono-core-arg_max.diff new file mode 100644 index 0000000..b00a02e --- /dev/null +++ b/mono-core-arg_max.diff @@ -0,0 +1,11 @@ +--- mono/io-layer/wapi_glob.c ++++ mono/io-layer/wapi_glob.c +@@ -300,7 +300,7 @@ + pathv[pglob->gl_offs + pglob->gl_pathc] = NULL; + + if ((pglob->gl_flags & WAPI_GLOB_LIMIT) && +- newsize + *limitp >= ARG_MAX) { ++ newsize + *limitp >= sysconf (_SC_ARG_MAX)) { + errno = 0; + return(WAPI_GLOB_NOSPACE); + } diff --git a/mono-core.changes b/mono-core.changes index b78b3db..cf8bf55 100644 --- a/mono-core.changes +++ b/mono-core.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Apr 11 15:45:33 CEST 2008 - schwab@suse.de + +- Work around broken configure script. + +------------------------------------------------------------------- +Fri Apr 11 10:00:20 CEST 2008 - aj@suse.de + +- glibc does not define ARG_MAX anymore, use sysconf (_SC_ARG_MAX) + instead. + ------------------------------------------------------------------- Thu Apr 10 12:54:45 CEST 2008 - ro@suse.de diff --git a/mono-core.spec b/mono-core.spec index 92ddf1c..5f57405 100644 --- a/mono-core.spec +++ b/mono-core.spec @@ -17,9 +17,11 @@ Group: Development/Languages/Mono Summary: A .NET Runtime Environment Url: http://go-mono.org/ Version: 1.9 -Release: 6 +Release: 7 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: mono-%{version}.tar.bz2 +Patch: mono-core-arg_max.diff +Patch1: mono-libtool.diff ExclusiveArch: %ix86 x86_64 ppc hppa armv4l sparc s390 ia64 s390x BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: mono = %{version}-%{release} @@ -1005,6 +1007,8 @@ Authors: %prep %setup -q -n mono-%{version} +%patch +%patch1 %build # These are only needed if there are patches to the runtime @@ -1093,6 +1097,11 @@ rm -f $RPM_BUILD_ROOT/usr/lib/mono/1.0/transform.exe rm -rf ${RPM_BUILD_ROOT} %changelog +* Fri Apr 11 2008 schwab@suse.de +- Work around broken configure script. +* Fri Apr 11 2008 aj@suse.de +- glibc does not define ARG_MAX anymore, use sysconf (_SC_ARG_MAX) + instead. * Thu Apr 10 2008 ro@suse.de - added baselibs.conf file to build xxbit packages for multilib support diff --git a/mono-libtool.diff b/mono-libtool.diff new file mode 100644 index 0000000..ed689b5 --- /dev/null +++ b/mono-libtool.diff @@ -0,0 +1,11 @@ +--- configure.in ++++ configure.in +@@ -44,7 +44,7 @@ libmono_cflags="" + libmono_ldflags="" + AC_SUBST(libmono_cflags) + AC_SUBST(libmono_ldflags) +-export_ldflags=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` ++export_ldflags=`(if test -x libtool; then ./libtool --config; then libtool --config; fi; echo eval echo \\$export_dynamic_flag_spec) | sh` + AC_SUBST(export_ldflags) + + # Variable to have relocatable .pc files (lib, or lib64)