Imported Upstream version 3.8.0
Former-commit-id: 6a76a29bd07d86e57c6c8da45c65ed5447d38a61
This commit is contained in:
parent
a575963da9
commit
fe777c5c82
@ -1,5 +1,7 @@
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
|
||||
AM_CFLAGS = $(WERROR_CFLAGS)
|
||||
|
||||
MONOTOUCH_SUBDIRS = $(libgc_dir) eglib/src mono
|
||||
|
||||
if CROSS_COMPILING
|
||||
@ -48,7 +50,9 @@ GIT_DIR ?= $(srcdir)/.git
|
||||
dist-hook:
|
||||
test -d $(distdir)/mcs || mkdir $(distdir)/mcs
|
||||
d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) distdir=$$d dist-recursive
|
||||
rm -rf `find $(top_distdir)/external -path '*\.git' -and -type d`
|
||||
rm -rf `find $(top_distdir)/external -path '*\.git'`
|
||||
rm -f `find $(top_distdir)/external -path '*\.exe'`
|
||||
rm -f `find $(top_distdir)/external -path '*\.dll'`
|
||||
cp mcs/class/lib/basic/System.Configuration.dll mcs/class/lib/monolite/
|
||||
cp mcs/class/lib/basic/System.Security.dll mcs/class/lib/monolite/
|
||||
# Disable this for now because it is very slow and causes wrench to timeout:
|
||||
|
11
Makefile.in
11
Makefile.in
@ -85,7 +85,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
|
||||
$(srcdir)/config.h.in mkinstalldirs \
|
||||
$(srcdir)/mono-core.spec.in $(srcdir)/mono-uninstalled.pc.in \
|
||||
AUTHORS COPYING.LIB ChangeLog NEWS compile config.guess \
|
||||
config.rpath config.sub install-sh missing ltmain.sh
|
||||
config.rpath config.sub depcomp install-sh missing ltmain.sh
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/m4/iconv.m4 \
|
||||
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
|
||||
@ -246,6 +246,7 @@ ECHO_T = @ECHO_T@
|
||||
EGREP = @EGREP@
|
||||
EXEEXT = @EXEEXT@
|
||||
FGREP = @FGREP@
|
||||
GDKX11 = @GDKX11@
|
||||
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
|
||||
GLIB_CFLAGS = @GLIB_CFLAGS@
|
||||
GLIB_LIBS = @GLIB_LIBS@
|
||||
@ -254,6 +255,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
|
||||
GMSGFMT = @GMSGFMT@
|
||||
GMSGFMT_015 = @GMSGFMT_015@
|
||||
GREP = @GREP@
|
||||
GTKX11 = @GTKX11@
|
||||
HAVE_MSGFMT = @HAVE_MSGFMT@
|
||||
HOST_CC = @HOST_CC@
|
||||
INSTALL = @INSTALL@
|
||||
@ -320,6 +322,7 @@ SQLITE3 = @SQLITE3@
|
||||
STRIP = @STRIP@
|
||||
USE_NLS = @USE_NLS@
|
||||
VERSION = @VERSION@
|
||||
WERROR_CFLAGS = @WERROR_CFLAGS@
|
||||
X11 = @X11@
|
||||
XATTR_LIB = @XATTR_LIB@
|
||||
XGETTEXT = @XGETTEXT@
|
||||
@ -369,6 +372,7 @@ install_sh = @install_sh@
|
||||
libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
libgc_dir = @libgc_dir@
|
||||
libgdiplus_install_loc = @libgdiplus_install_loc@
|
||||
libgdiplus_loc = @libgdiplus_loc@
|
||||
libmono_cflags = @libmono_cflags@
|
||||
libmono_ldflags = @libmono_ldflags@
|
||||
@ -403,6 +407,7 @@ top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
AM_CFLAGS = $(WERROR_CFLAGS)
|
||||
MONOTOUCH_SUBDIRS = $(libgc_dir) eglib/src mono
|
||||
@CROSS_COMPILING_FALSE@@ONLY_MONOTOUCH_FALSE@@ONLY_XAMMAC_FALSE@SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir)
|
||||
@CROSS_COMPILING_FALSE@@ONLY_MONOTOUCH_FALSE@@ONLY_XAMMAC_TRUE@SUBDIRS = $(libgc_dir) eglib/src mono runtime
|
||||
@ -936,7 +941,9 @@ GIT_DIR ?= $(srcdir)/.git
|
||||
dist-hook:
|
||||
test -d $(distdir)/mcs || mkdir $(distdir)/mcs
|
||||
d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) distdir=$$d dist-recursive
|
||||
rm -rf `find $(top_distdir)/external -path '*\.git' -and -type d`
|
||||
rm -rf `find $(top_distdir)/external -path '*\.git'`
|
||||
rm -f `find $(top_distdir)/external -path '*\.exe'`
|
||||
rm -f `find $(top_distdir)/external -path '*\.dll'`
|
||||
cp mcs/class/lib/basic/System.Configuration.dll mcs/class/lib/monolite/
|
||||
cp mcs/class/lib/basic/System.Security.dll mcs/class/lib/monolite/
|
||||
.PHONY: get-monolite-latest
|
||||
|
@ -1,6 +1,8 @@
|
||||
Mono is a software platform designed to allow developers to easily create cross platform applications.
|
||||
Mono is an open source implementation of Microsoft's .NET Framework based on the ECMA standards for C# and the Common Language Runtime.
|
||||
|
||||
[![Build Status](http://monojenkins.cloudapp.net/job/Mono/badge/icon)](http://monojenkins.cloudapp.net/job/Mono/)
|
||||
|
||||
1. [Installation](#compilation-and-installation)
|
||||
2. [Using Mono](#using-mono)
|
||||
3. [Directory Roadmap](#directory-roadmap)
|
||||
@ -34,6 +36,10 @@ a. Build Requirements
|
||||
* libzlib - This library and the development headers are required for compression
|
||||
file support in the 2.0 profile.
|
||||
|
||||
4. Mono is required to build Mono. Use a system package or monolite (explained further below)
|
||||
|
||||
5. If you have a system Mono (not monolite), you will need to read this: http://mono-project.com/Parallel_Mono_Environments#Setting_up_a_Build_Environment
|
||||
|
||||
b. Building the Software
|
||||
------------------------
|
||||
|
||||
|
@ -22,7 +22,7 @@ if test x$GCC != xyes; then
|
||||
dolt_supported=no
|
||||
fi
|
||||
case $host in
|
||||
i?86-*-linux*|x86_64-*-linux*|powerpc-*-linux*|powerpc64-*-linux* \
|
||||
i?86-*-linux*|i?86-apple-darwin*|x86_64-*-linux*|powerpc-*-linux*|powerpc64-*-linux* \
|
||||
|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*|arm*-*-linux*|sparc*-*-linux*|mips*-*-linux*|x86_64-apple-darwin*|aarch64*)
|
||||
pic_options='-fPIC'
|
||||
;;
|
||||
@ -158,7 +158,7 @@ modeok=false
|
||||
tagok=false
|
||||
for arg in "$[]@"; do
|
||||
case "$arg" in
|
||||
--silent) ;;
|
||||
--silent) ;;
|
||||
--mode=compile) modeok=true ;;
|
||||
--tag=CC|--tag=CXX) tagok=true ;;
|
||||
--quiet) ;;
|
||||
|
@ -320,7 +320,7 @@
|
||||
/* Define to 1 if you have the `getpriority' function. */
|
||||
#undef HAVE_GETPRIORITY
|
||||
|
||||
/* Define to 1 if you have the `GetProcessId' function. */
|
||||
/* Define if GetProcessId is available */
|
||||
#undef HAVE_GETPROCESSID
|
||||
|
||||
/* Define to 1 if you have the `getpwent' function. */
|
||||
@ -924,9 +924,6 @@
|
||||
/* native types */
|
||||
#undef MONO_NATIVE_TYPES
|
||||
|
||||
/* Sizeof sock_un.sun_path */
|
||||
#undef MONO_SIZEOF_SUNPATH
|
||||
|
||||
/* Reduce runtime requirements (and capabilities) */
|
||||
#undef MONO_SMALL_CONFIG
|
||||
|
||||
|
@ -1 +1 @@
|
||||
9f9229ff6a1b6a8b0e8d4e4cb7632a66927b37d3
|
||||
e2d46ae5f394ada396886d241225ad895d4fa194
|
@ -1 +1 @@
|
||||
8be4fb39c41e5d71d787a6c58748fed22d78f9eb
|
||||
9ad91a3e3e9b4a437dedfc1a32a3c9092d967f5e
|
@ -270,6 +270,7 @@ ECHO_T = @ECHO_T@
|
||||
EGREP = @EGREP@
|
||||
EXEEXT = @EXEEXT@
|
||||
FGREP = @FGREP@
|
||||
GDKX11 = @GDKX11@
|
||||
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
|
||||
GLIB_CFLAGS = @GLIB_CFLAGS@
|
||||
GLIB_LIBS = @GLIB_LIBS@
|
||||
@ -278,6 +279,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
|
||||
GMSGFMT = @GMSGFMT@
|
||||
GMSGFMT_015 = @GMSGFMT_015@
|
||||
GREP = @GREP@
|
||||
GTKX11 = @GTKX11@
|
||||
HAVE_MSGFMT = @HAVE_MSGFMT@
|
||||
HOST_CC = @HOST_CC@
|
||||
INSTALL = @INSTALL@
|
||||
@ -344,6 +346,7 @@ SQLITE3 = @SQLITE3@
|
||||
STRIP = @STRIP@
|
||||
USE_NLS = @USE_NLS@
|
||||
VERSION = @VERSION@
|
||||
WERROR_CFLAGS = @WERROR_CFLAGS@
|
||||
X11 = @X11@
|
||||
XATTR_LIB = @XATTR_LIB@
|
||||
XGETTEXT = @XGETTEXT@
|
||||
@ -393,6 +396,7 @@ install_sh = @install_sh@
|
||||
libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
libgc_dir = @libgc_dir@
|
||||
libgdiplus_install_loc = @libgdiplus_install_loc@
|
||||
libgdiplus_loc = @libgdiplus_loc@
|
||||
libmono_cflags = @libmono_cflags@
|
||||
libmono_ldflags = @libmono_ldflags@
|
||||
|
@ -10,12 +10,14 @@
|
||||
<dllmap dll="i:odbc32.dll" target="libiodbc.dylib" os="osx"/>
|
||||
<dllmap dll="oci" target="libclntsh@libsuffix@" os="!windows"/>
|
||||
<dllmap dll="db2cli" target="libdb2_36@libsuffix@" os="!windows"/>
|
||||
<dllmap dll="MonoPosixHelper" target="libMonoPosixHelper@libsuffix@" os="!windows" />
|
||||
<dllmap dll="MonoPosixHelper" target="@prefix@/lib/libMonoPosixHelper@libsuffix@" os="!windows" />
|
||||
<dllmap dll="i:msvcrt" target="@LIBC@" os="!windows"/>
|
||||
<dllmap dll="i:msvcrt.dll" target="@LIBC@" os="!windows"/>
|
||||
<dllmap dll="sqlite" target="@SQLITE@" os="!windows"/>
|
||||
<dllmap dll="sqlite3" target="@SQLITE3@" os="!windows"/>
|
||||
<dllmap dll="libX11" target="@X11@" os="!windows" />
|
||||
<dllmap dll="libgdk-x11-2.0" target="@GDKX11@" os="!windows"/>
|
||||
<dllmap dll="libgtk-x11-2.0" target="@GTKX11@" os="!windows"/>
|
||||
<dllmap dll="libXinerama" target="@XINERAMA@" os="!windows" />
|
||||
<dllmap dll="libcairo-2.dll" target="libcairo.so.2" os="!windows"/>
|
||||
<dllmap dll="libcairo-2.dll" target="libcairo.2.dylib" os="osx"/>
|
||||
@ -27,8 +29,8 @@
|
||||
<dllentry dll="__Internal" name="MoveMemory" target="mono_win32_compat_MoveMemory"/>
|
||||
<dllentry dll="__Internal" name="ZeroMemory" target="mono_win32_compat_ZeroMemory"/>
|
||||
</dllmap>
|
||||
<dllmap dll="gdiplus" target="@prefix@/lib/libgdiplus@libsuffix@" os="!windows"/>
|
||||
<dllmap dll="gdiplus.dll" target="@prefix@/lib/libgdiplus@libsuffix@" os="!windows"/>
|
||||
<dllmap dll="gdi32" target="@prefix@/lib/libgdiplus@libsuffix@" os="!windows"/>
|
||||
<dllmap dll="gdi32.dll" target="@prefix@/lib/libgdiplus@libsuffix@" os="!windows"/>
|
||||
<dllmap dll="gdiplus" target="@libgdiplus_install_loc@" os="!windows"/>
|
||||
<dllmap dll="gdiplus.dll" target="@libgdiplus_install_loc@" os="!windows"/>
|
||||
<dllmap dll="gdi32" target="@libgdiplus_install_loc@" os="!windows"/>
|
||||
<dllmap dll="gdi32.dll" target="@libgdiplus_install_loc@" os="!windows"/>
|
||||
</configuration>
|
||||
|
@ -191,6 +191,7 @@ ECHO_T = @ECHO_T@
|
||||
EGREP = @EGREP@
|
||||
EXEEXT = @EXEEXT@
|
||||
FGREP = @FGREP@
|
||||
GDKX11 = @GDKX11@
|
||||
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
|
||||
GLIB_CFLAGS = @GLIB_CFLAGS@
|
||||
GLIB_LIBS = @GLIB_LIBS@
|
||||
@ -199,6 +200,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
|
||||
GMSGFMT = @GMSGFMT@
|
||||
GMSGFMT_015 = @GMSGFMT_015@
|
||||
GREP = @GREP@
|
||||
GTKX11 = @GTKX11@
|
||||
HAVE_MSGFMT = @HAVE_MSGFMT@
|
||||
HOST_CC = @HOST_CC@
|
||||
INSTALL = @INSTALL@
|
||||
@ -265,6 +267,7 @@ SQLITE3 = @SQLITE3@
|
||||
STRIP = @STRIP@
|
||||
USE_NLS = @USE_NLS@
|
||||
VERSION = @VERSION@
|
||||
WERROR_CFLAGS = @WERROR_CFLAGS@
|
||||
X11 = @X11@
|
||||
XATTR_LIB = @XATTR_LIB@
|
||||
XGETTEXT = @XGETTEXT@
|
||||
@ -314,6 +317,7 @@ install_sh = @install_sh@
|
||||
libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
libgc_dir = @libgc_dir@
|
||||
libgdiplus_install_loc = @libgdiplus_install_loc@
|
||||
libgdiplus_loc = @libgdiplus_loc@
|
||||
libmono_cflags = @libmono_cflags@
|
||||
libmono_ldflags = @libmono_ldflags@
|
||||
|
@ -251,6 +251,7 @@ ECHO_T = @ECHO_T@
|
||||
EGREP = @EGREP@
|
||||
EXEEXT = @EXEEXT@
|
||||
FGREP = @FGREP@
|
||||
GDKX11 = @GDKX11@
|
||||
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
|
||||
GLIB_CFLAGS = @GLIB_CFLAGS@
|
||||
GLIB_LIBS = @GLIB_LIBS@
|
||||
@ -259,6 +260,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
|
||||
GMSGFMT = @GMSGFMT@
|
||||
GMSGFMT_015 = @GMSGFMT_015@
|
||||
GREP = @GREP@
|
||||
GTKX11 = @GTKX11@
|
||||
HAVE_MSGFMT = @HAVE_MSGFMT@
|
||||
HOST_CC = @HOST_CC@
|
||||
INSTALL = @INSTALL@
|
||||
@ -325,6 +327,7 @@ SQLITE3 = @SQLITE3@
|
||||
STRIP = @STRIP@
|
||||
USE_NLS = @USE_NLS@
|
||||
VERSION = @VERSION@
|
||||
WERROR_CFLAGS = @WERROR_CFLAGS@
|
||||
X11 = @X11@
|
||||
XATTR_LIB = @XATTR_LIB@
|
||||
XGETTEXT = @XGETTEXT@
|
||||
@ -374,6 +377,7 @@ install_sh = @install_sh@
|
||||
libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
libgc_dir = @libgc_dir@
|
||||
libgdiplus_install_loc = @libgdiplus_install_loc@
|
||||
libgdiplus_loc = @libgdiplus_loc@
|
||||
libmono_cflags = @libmono_cflags@
|
||||
libmono_ldflags = @libmono_ldflags@
|
||||
|
@ -191,6 +191,7 @@ ECHO_T = @ECHO_T@
|
||||
EGREP = @EGREP@
|
||||
EXEEXT = @EXEEXT@
|
||||
FGREP = @FGREP@
|
||||
GDKX11 = @GDKX11@
|
||||
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
|
||||
GLIB_CFLAGS = @GLIB_CFLAGS@
|
||||
GLIB_LIBS = @GLIB_LIBS@
|
||||
@ -199,6 +200,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
|
||||
GMSGFMT = @GMSGFMT@
|
||||
GMSGFMT_015 = @GMSGFMT_015@
|
||||
GREP = @GREP@
|
||||
GTKX11 = @GTKX11@
|
||||
HAVE_MSGFMT = @HAVE_MSGFMT@
|
||||
HOST_CC = @HOST_CC@
|
||||
INSTALL = @INSTALL@
|
||||
@ -265,6 +267,7 @@ SQLITE3 = @SQLITE3@
|
||||
STRIP = @STRIP@
|
||||
USE_NLS = @USE_NLS@
|
||||
VERSION = @VERSION@
|
||||
WERROR_CFLAGS = @WERROR_CFLAGS@
|
||||
X11 = @X11@
|
||||
XATTR_LIB = @XATTR_LIB@
|
||||
XGETTEXT = @XGETTEXT@
|
||||
@ -314,6 +317,7 @@ install_sh = @install_sh@
|
||||
libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
libgc_dir = @libgc_dir@
|
||||
libgdiplus_install_loc = @libgdiplus_install_loc@
|
||||
libgdiplus_loc = @libgdiplus_loc@
|
||||
libmono_cflags = @libmono_cflags@
|
||||
libmono_ldflags = @libmono_ldflags@
|
||||
|
@ -251,6 +251,7 @@ ECHO_T = @ECHO_T@
|
||||
EGREP = @EGREP@
|
||||
EXEEXT = @EXEEXT@
|
||||
FGREP = @FGREP@
|
||||
GDKX11 = @GDKX11@
|
||||
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
|
||||
GLIB_CFLAGS = @GLIB_CFLAGS@
|
||||
GLIB_LIBS = @GLIB_LIBS@
|
||||
@ -259,6 +260,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
|
||||
GMSGFMT = @GMSGFMT@
|
||||
GMSGFMT_015 = @GMSGFMT_015@
|
||||
GREP = @GREP@
|
||||
GTKX11 = @GTKX11@
|
||||
HAVE_MSGFMT = @HAVE_MSGFMT@
|
||||
HOST_CC = @HOST_CC@
|
||||
INSTALL = @INSTALL@
|
||||
@ -325,6 +327,7 @@ SQLITE3 = @SQLITE3@
|
||||
STRIP = @STRIP@
|
||||
USE_NLS = @USE_NLS@
|
||||
VERSION = @VERSION@
|
||||
WERROR_CFLAGS = @WERROR_CFLAGS@
|
||||
X11 = @X11@
|
||||
XATTR_LIB = @XATTR_LIB@
|
||||
XGETTEXT = @XGETTEXT@
|
||||
@ -374,6 +377,7 @@ install_sh = @install_sh@
|
||||
libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
libgc_dir = @libgc_dir@
|
||||
libgdiplus_install_loc = @libgdiplus_install_loc@
|
||||
libgdiplus_loc = @libgdiplus_loc@
|
||||
libmono_cflags = @libmono_cflags@
|
||||
libmono_ldflags = @libmono_ldflags@
|
||||
|
@ -191,6 +191,7 @@ ECHO_T = @ECHO_T@
|
||||
EGREP = @EGREP@
|
||||
EXEEXT = @EXEEXT@
|
||||
FGREP = @FGREP@
|
||||
GDKX11 = @GDKX11@
|
||||
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
|
||||
GLIB_CFLAGS = @GLIB_CFLAGS@
|
||||
GLIB_LIBS = @GLIB_LIBS@
|
||||
@ -199,6 +200,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
|
||||
GMSGFMT = @GMSGFMT@
|
||||
GMSGFMT_015 = @GMSGFMT_015@
|
||||
GREP = @GREP@
|
||||
GTKX11 = @GTKX11@
|
||||
HAVE_MSGFMT = @HAVE_MSGFMT@
|
||||
HOST_CC = @HOST_CC@
|
||||
INSTALL = @INSTALL@
|
||||
@ -265,6 +267,7 @@ SQLITE3 = @SQLITE3@
|
||||
STRIP = @STRIP@
|
||||
USE_NLS = @USE_NLS@
|
||||
VERSION = @VERSION@
|
||||
WERROR_CFLAGS = @WERROR_CFLAGS@
|
||||
X11 = @X11@
|
||||
XATTR_LIB = @XATTR_LIB@
|
||||
XGETTEXT = @XGETTEXT@
|
||||
@ -314,6 +317,7 @@ install_sh = @install_sh@
|
||||
libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
libgc_dir = @libgc_dir@
|
||||
libgdiplus_install_loc = @libgdiplus_install_loc@
|
||||
libgdiplus_loc = @libgdiplus_loc@
|
||||
libmono_cflags = @libmono_cflags@
|
||||
libmono_ldflags = @libmono_ldflags@
|
||||
|
@ -251,6 +251,7 @@ ECHO_T = @ECHO_T@
|
||||
EGREP = @EGREP@
|
||||
EXEEXT = @EXEEXT@
|
||||
FGREP = @FGREP@
|
||||
GDKX11 = @GDKX11@
|
||||
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
|
||||
GLIB_CFLAGS = @GLIB_CFLAGS@
|
||||
GLIB_LIBS = @GLIB_LIBS@
|
||||
@ -259,6 +260,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
|
||||
GMSGFMT = @GMSGFMT@
|
||||
GMSGFMT_015 = @GMSGFMT_015@
|
||||
GREP = @GREP@
|
||||
GTKX11 = @GTKX11@
|
||||
HAVE_MSGFMT = @HAVE_MSGFMT@
|
||||
HOST_CC = @HOST_CC@
|
||||
INSTALL = @INSTALL@
|
||||
@ -325,6 +327,7 @@ SQLITE3 = @SQLITE3@
|
||||
STRIP = @STRIP@
|
||||
USE_NLS = @USE_NLS@
|
||||
VERSION = @VERSION@
|
||||
WERROR_CFLAGS = @WERROR_CFLAGS@
|
||||
X11 = @X11@
|
||||
XATTR_LIB = @XATTR_LIB@
|
||||
XGETTEXT = @XGETTEXT@
|
||||
@ -374,6 +377,7 @@ install_sh = @install_sh@
|
||||
libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
libgc_dir = @libgc_dir@
|
||||
libgdiplus_install_loc = @libgdiplus_install_loc@
|
||||
libgdiplus_loc = @libgdiplus_loc@
|
||||
libmono_cflags = @libmono_cflags@
|
||||
libmono_ldflags = @libmono_ldflags@
|
||||
|
@ -191,6 +191,7 @@ ECHO_T = @ECHO_T@
|
||||
EGREP = @EGREP@
|
||||
EXEEXT = @EXEEXT@
|
||||
FGREP = @FGREP@
|
||||
GDKX11 = @GDKX11@
|
||||
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
|
||||
GLIB_CFLAGS = @GLIB_CFLAGS@
|
||||
GLIB_LIBS = @GLIB_LIBS@
|
||||
@ -199,6 +200,7 @@ GMODULE_LIBS = @GMODULE_LIBS@
|
||||
GMSGFMT = @GMSGFMT@
|
||||
GMSGFMT_015 = @GMSGFMT_015@
|
||||
GREP = @GREP@
|
||||
GTKX11 = @GTKX11@
|
||||
HAVE_MSGFMT = @HAVE_MSGFMT@
|
||||
HOST_CC = @HOST_CC@
|
||||
INSTALL = @INSTALL@
|
||||
@ -265,6 +267,7 @@ SQLITE3 = @SQLITE3@
|
||||
STRIP = @STRIP@
|
||||
USE_NLS = @USE_NLS@
|
||||
VERSION = @VERSION@
|
||||
WERROR_CFLAGS = @WERROR_CFLAGS@
|
||||
X11 = @X11@
|
||||
XATTR_LIB = @XATTR_LIB@
|
||||
XGETTEXT = @XGETTEXT@
|
||||
@ -314,6 +317,7 @@ install_sh = @install_sh@
|
||||
libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
libgc_dir = @libgc_dir@
|
||||
libgdiplus_install_loc = @libgdiplus_install_loc@
|
||||
libgdiplus_loc = @libgdiplus_loc@
|
||||
libmono_cflags = @libmono_cflags@
|
||||
libmono_ldflags = @libmono_ldflags@
|
||||
|
@ -1,5 +1,7 @@
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
|
||||
AM_CFLAGS = $(WERROR_CFLAGS)
|
||||
|
||||
if HOST_WIN32
|
||||
SUBDIRS = m4 src
|
||||
else
|
||||
|
@ -291,6 +291,7 @@ SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
STRIP = @STRIP@
|
||||
VERSION = @VERSION@
|
||||
WERROR_CFLAGS = @WERROR_CFLAGS@
|
||||
abs_builddir = @abs_builddir@
|
||||
abs_srcdir = @abs_srcdir@
|
||||
abs_top_builddir = @abs_top_builddir@
|
||||
@ -348,6 +349,7 @@ top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
AM_CFLAGS = $(WERROR_CFLAGS)
|
||||
@CROSS_COMPILING_FALSE@@HOST_WIN32_FALSE@@PLATFORM_DARWIN_FALSE@SUBDIRS = m4 src test
|
||||
@CROSS_COMPILING_TRUE@@HOST_WIN32_FALSE@@PLATFORM_DARWIN_FALSE@SUBDIRS = m4 src
|
||||
@HOST_WIN32_FALSE@@PLATFORM_DARWIN_TRUE@SUBDIRS = m4 src
|
||||
|
@ -22,8 +22,8 @@ if test x$GCC != xyes; then
|
||||
dolt_supported=no
|
||||
fi
|
||||
case $host in
|
||||
i?86-*-linux*|x86_64-*-linux*|powerpc-*-linux*|powerpc64-*-linux* \
|
||||
|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*|arm*-*-linux*|sparc*-*-linux*|mips*-*-linux*)
|
||||
i?86-*-linux*|i?86-apple-darwin*|x86_64-*-linux*|powerpc-*-linux*|powerpc64-*-linux* \
|
||||
|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*|arm*-*-linux*|sparc*-*-linux*|mips*-*-linux*|x86_64-apple-darwin*|aarch64*)
|
||||
pic_options='-fPIC'
|
||||
;;
|
||||
?86-pc-cygwin*|i?86-pc-cygwin*)
|
||||
|
@ -60,6 +60,9 @@
|
||||
/* Define to 1 if you have the `strtok_r' function. */
|
||||
#undef HAVE_STRTOK_R
|
||||
|
||||
/* Define to 1 if you have the <sys/select.h> header file. */
|
||||
#undef HAVE_SYS_SELECT_H
|
||||
|
||||
/* Define to 1 if you have the <sys/stat.h> header file. */
|
||||
#undef HAVE_SYS_STAT_H
|
||||
|
||||
|
@ -1 +1 @@
|
||||
14cd313adbe67ed6c268aa152076066abd759556
|
||||
8efa2ac8877cc4d116d3625738612cdba7e474a4
|
@ -179,7 +179,7 @@ if test "x$have_iso_varargs" = "xyes"; then
|
||||
fi
|
||||
AC_SUBST(G_HAVE_ISO_VARARGS)
|
||||
|
||||
AC_CHECK_HEADERS(getopt.h sys/time.h sys/wait.h pwd.h langinfo.h iconv.h localcharset.h sys/types.h)
|
||||
AC_CHECK_HEADERS(getopt.h sys/select.h sys/time.h sys/wait.h pwd.h langinfo.h iconv.h localcharset.h sys/types.h)
|
||||
AC_CHECK_HEADER(alloca.h, [HAVE_ALLOCA_H=1], [HAVE_ALLOCA_H=0])
|
||||
AC_SUBST(HAVE_ALLOCA_H)
|
||||
|
||||
@ -235,6 +235,12 @@ AC_ARG_WITH(crosspkgdir, [ --with-crosspkgdir=/path/to/pkg-config/dir Chan
|
||||
fi
|
||||
)
|
||||
|
||||
AC_ARG_ENABLE(werror, [ --enable-werror Pass -Werror to the C compiler], werror_flag=$enableval, werror_flag=no)
|
||||
if test x$werror_flag = xyes; then
|
||||
WERROR_CFLAGS="-Werror"
|
||||
fi
|
||||
AC_SUBST([WERROR_CFLAGS])
|
||||
|
||||
AC_SUBST(GPOINTER_TO_INT)
|
||||
AC_SUBST(GPOINTER_TO_UINT)
|
||||
AC_SUBST(GINT_TO_POINTER)
|
||||
|
@ -205,6 +205,7 @@ SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
STRIP = @STRIP@
|
||||
VERSION = @VERSION@
|
||||
WERROR_CFLAGS = @WERROR_CFLAGS@
|
||||
abs_builddir = @abs_builddir@
|
||||
abs_srcdir = @abs_srcdir@
|
||||
abs_top_builddir = @abs_top_builddir@
|
||||
|
@ -1,5 +1,7 @@
|
||||
noinst_LTLIBRARIES = libeglib.la libeglib-static.la
|
||||
|
||||
AM_CFLAGS = $(WERROR_CFLAGS)
|
||||
|
||||
win_files = \
|
||||
eglib-config.hw \
|
||||
gdate-win32.c gdir-win32.c gfile-win32.c gmisc-win32.c \
|
||||
@ -30,6 +32,7 @@ libeglib_la_SOURCES = \
|
||||
garray.c \
|
||||
gbytearray.c \
|
||||
gerror.c \
|
||||
vasprintf.h \
|
||||
ghashtable.c \
|
||||
giconv.c \
|
||||
gmem.c \
|
||||
|
@ -1 +1 @@
|
||||
46a89f9f9808c4792e331b8cbb738a6d8db1c519
|
||||
155511dfa6f6ef3805f7a5fad5fe5c9a6dbe2a8b
|
@ -30,6 +30,8 @@
|
||||
#include <string.h>
|
||||
#include <glib.h>
|
||||
|
||||
#include "vasprintf.h"
|
||||
|
||||
GError *
|
||||
g_error_new (gpointer domain, gint code, const char *format, ...)
|
||||
{
|
||||
|
@ -49,12 +49,6 @@
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
/* MSC and Cross-compilatin will use this */
|
||||
int vasprintf (char **strp, const char *fmt, va_list ap);
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
* Basic data types
|
||||
*/
|
||||
@ -727,8 +721,16 @@ GUnicodeBreakType g_unichar_break_type (gunichar c);
|
||||
#define G_UNLIKELY(x) (x)
|
||||
#endif
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
#define eg_unreachable() __assume(0)
|
||||
#elif defined(__GNUC__) && ((__GNUC__ > 4) || (__GNUC__ == 4 && (__GNUC_MINOR__ >= 5)))
|
||||
#define eg_unreachable() __builtin_unreachable()
|
||||
#else
|
||||
#define eg_unreachable()
|
||||
#endif
|
||||
|
||||
#define g_assert(x) G_STMT_START { if (G_UNLIKELY (!(x))) g_assertion_message ("* Assertion at %s:%d, condition `%s' not met\n", __FILE__, __LINE__, #x); } G_STMT_END
|
||||
#define g_assert_not_reached() G_STMT_START { g_assertion_message ("* Assertion: should not be reached at %s:%d\n", __FILE__, __LINE__); } G_STMT_END
|
||||
#define g_assert_not_reached() G_STMT_START { g_assertion_message ("* Assertion: should not be reached at %s:%d\n", __FILE__, __LINE__); eg_unreachable(); } G_STMT_END
|
||||
|
||||
/*
|
||||
* Unicode conversion
|
||||
@ -1008,19 +1010,6 @@ glong g_utf8_pointer_to_offset (const gchar *str, const gchar *pos);
|
||||
#define G_PRIORITY_DEFAULT 0
|
||||
#define G_PRIORITY_DEFAULT_IDLE 200
|
||||
|
||||
/*
|
||||
* Empty thread functions, not used by eglib
|
||||
*/
|
||||
#define g_thread_supported() TRUE
|
||||
#define g_thread_init(x) G_STMT_START { if (x != NULL) { g_error ("No vtable supported in g_thread_init"); } } G_STMT_END
|
||||
|
||||
#define G_LOCK_DEFINE(name) int name;
|
||||
#define G_LOCK_DEFINE_STATIC(name) static int name;
|
||||
#define G_LOCK_EXTERN(name)
|
||||
#define G_LOCK(name)
|
||||
#define G_TRYLOCK(name)
|
||||
#define G_UNLOCK(name)
|
||||
|
||||
#define GUINT16_SWAP_LE_BE_CONSTANT(x) ((((guint16) x) >> 8) | ((((guint16) x) << 8)))
|
||||
|
||||
#define GUINT16_SWAP_LE_BE(x) ((guint16) (((guint16) x) >> 8) | ((((guint16)(x)) & 0xff) << 8))
|
||||
|
@ -31,6 +31,8 @@
|
||||
#include <stdlib.h>
|
||||
#include <glib.h>
|
||||
|
||||
#include "vasprintf.h"
|
||||
|
||||
/* The current fatal levels, error is always fatal */
|
||||
static GLogLevelFlags fatal = G_LOG_LEVEL_ERROR;
|
||||
|
||||
|
@ -41,6 +41,10 @@
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_SYS_SELECT_H
|
||||
#include <sys/select.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_SYS_TIME_H
|
||||
#include <sys/time.h>
|
||||
#endif
|
||||
|
@ -32,6 +32,8 @@
|
||||
#include <ctype.h>
|
||||
#include <glib.h>
|
||||
|
||||
#include "vasprintf.h"
|
||||
|
||||
/* This is not a macro, because I dont want to put _GNU_SOURCE in the glib.h header */
|
||||
gchar *
|
||||
g_strndup (const gchar *str, gsize n)
|
||||
|
@ -88,12 +88,24 @@ merge_lists (list_node *first, list_node *second, GCompareFunc func)
|
||||
static inline list_node *
|
||||
sweep_up (struct sort_info *si, list_node *list, int upto)
|
||||
{
|
||||
#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 406)
|
||||
/*
|
||||
* GCC incorrectly thinks we're writing below si->ranks array bounds.
|
||||
*/
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Warray-bounds"
|
||||
#endif
|
||||
|
||||
int i;
|
||||
for (i = si->min_rank; i < upto; ++i) {
|
||||
list = merge_lists (si->ranks [i], list, si->func);
|
||||
si->ranks [i] = NULL;
|
||||
}
|
||||
return list;
|
||||
|
||||
#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 406)
|
||||
#pragma GCC diagnostic pop
|
||||
#endif
|
||||
}
|
||||
|
||||
/*
|
||||
@ -124,6 +136,14 @@ sweep_up (struct sort_info *si, list_node *list, int upto)
|
||||
static inline void
|
||||
insert_list (struct sort_info *si, list_node* list, int rank)
|
||||
{
|
||||
#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 406)
|
||||
/*
|
||||
* GCC incorrectly thinks we're writing below si->ranks array bounds.
|
||||
*/
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Warray-bounds"
|
||||
#endif
|
||||
|
||||
int i;
|
||||
|
||||
if (rank > si->n_ranks) {
|
||||
@ -149,6 +169,10 @@ insert_list (struct sort_info *si, list_node* list, int rank)
|
||||
si->n_ranks = i + 1;
|
||||
si->min_rank = i;
|
||||
si->ranks [i] = list;
|
||||
|
||||
#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 406)
|
||||
#pragma GCC diagnostic pop
|
||||
#endif
|
||||
}
|
||||
|
||||
#undef stringify2
|
||||
|
11
eglib/src/vasprintf.h
Normal file
11
eglib/src/vasprintf.h
Normal file
@ -0,0 +1,11 @@
|
||||
#ifndef __VASPRINTF_H
|
||||
#define __VASPRINTF_H
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <config.h>
|
||||
|
||||
#ifndef HAVE_VASPRINTF
|
||||
int vasprintf(char **ret, const char *fmt, va_list ap);
|
||||
#endif
|
||||
|
||||
#endif /* __VASPRINTF_H */
|
@ -267,6 +267,7 @@ SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
STRIP = @STRIP@
|
||||
VERSION = @VERSION@
|
||||
WERROR_CFLAGS = @WERROR_CFLAGS@
|
||||
abs_builddir = @abs_builddir@
|
||||
abs_srcdir = @abs_srcdir@
|
||||
abs_top_builddir = @abs_top_builddir@
|
||||
|
@ -115,7 +115,7 @@ test_file ()
|
||||
|
||||
#ifndef G_OS_WIN32 /* FIXME */
|
||||
gchar *sympath;
|
||||
gint ignored;
|
||||
gint ignored G_GNUC_UNUSED;
|
||||
#endif
|
||||
|
||||
res = g_file_test (NULL, 0);
|
||||
|
@ -1 +0,0 @@
|
||||
0fc198aa785b43ebc2084334bc85336072e00bfe
|
Binary file not shown.
Binary file not shown.
@ -1 +0,0 @@
|
||||
ba0226882e0c101eda00edc3c2592a4cfdc741f8
|
Binary file not shown.
Binary file not shown.
@ -1 +0,0 @@
|
||||
0a54a97411a94bf84325a7eeecc6d68133be7b6f
|
@ -1 +0,0 @@
|
||||
77d563f7a5afa344ab5bcfb0e57fb31f808ae111
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1 +0,0 @@
|
||||
6f431b8505b8348131ed37de7a9aa343dab2a78e
|
Binary file not shown.
@ -1 +0,0 @@
|
||||
df4dffecb0b55c9e0049c912026f8c24cc5b7366
|
Binary file not shown.
Binary file not shown.
@ -1 +0,0 @@
|
||||
4f186ae17e811b7bd6986fa77ffc0eb45ae77a13
|
Binary file not shown.
Binary file not shown.
@ -1 +0,0 @@
|
||||
3086a94e2bc35d3497101cf5056f1152cc913e14
|
@ -1 +0,0 @@
|
||||
1d605ae71204d982dca8135529b2fc9c90019391
|
Binary file not shown.
Binary file not shown.
@ -1 +0,0 @@
|
||||
47aff41a048919977a977658bcd0c110a0f87632
|
Binary file not shown.
@ -1 +0,0 @@
|
||||
09a5b5c0474cced4d4a2181078cbd1e4707f0ae9
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1 +0,0 @@
|
||||
5e9fcc037e7bad10a1afcaa0ce5a179d135b4413
|
Binary file not shown.
@ -1 +0,0 @@
|
||||
875e0984208d52e5c96a409b52996547198af17a
|
Binary file not shown.
@ -1 +0,0 @@
|
||||
b31beef4192f37a66e51642a372cd7cfacf60f17
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1 +0,0 @@
|
||||
233ab1af3ce0f3e446ff1052a91faf4902ea7200
|
@ -1 +0,0 @@
|
||||
a95bc11a9e33e89c280fe5bd69814db68ad2cbbd
|
Binary file not shown.
@ -1 +0,0 @@
|
||||
779d237c0bd808b0a3f0772f7782e02dde67b717
|
@ -1 +0,0 @@
|
||||
7a60a3629461cf02494cecaed937b5b1976c6fb4
|
Binary file not shown.
@ -1 +0,0 @@
|
||||
dd42cc64c5a6cffaee63d6fa9b699ec4847c61cb
|
@ -1 +0,0 @@
|
||||
e829ebf4baa5601ed650a56b821e266ef0c0d9cc
|
@ -1 +0,0 @@
|
||||
105213c67c9ef3d0aa0997306d0c941b293029e2
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1 +0,0 @@
|
||||
20a2e1c47dea6ee52dc38cfd4eee0cfde7894faa
|
Binary file not shown.
@ -1 +0,0 @@
|
||||
5eb61245eb8e23d7c68480d77573ac59e8c82045
|
Binary file not shown.
Binary file not shown.
@ -1 +0,0 @@
|
||||
9f4bace96a58a56cdd68e8c19335f397710c3da5
|
Binary file not shown.
Binary file not shown.
@ -1 +0,0 @@
|
||||
105213c67c9ef3d0aa0997306d0c941b293029e2
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user