Imported Upstream version 6.8.0.84

Former-commit-id: 958ad50c990339a6af3272acac61d64bf77068b6
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-12-31 08:37:01 +00:00
parent c4971f013f
commit 76568287a2
51 changed files with 60 additions and 49 deletions

View File

@@ -63,7 +63,11 @@ if !ENABLE_MSVC_ONLY
eglibdir=$(datadir)/mono-$(API_VER)/mono/eglib
eglib_DATA = eglib-config.h
libeglib_la_CFLAGS = -g -Wall -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE
libeglib_la_CFLAGS = -g -Wall -D_GNU_SOURCE
if !HOST_WIN32
libeglib_la_CFLAGS += -D_FORTIFY_SOURCE=2
endif
AM_CPPFLAGS = -I$(srcdir)

View File

@@ -90,6 +90,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
@ENABLE_MSVC_ONLY_FALSE@@HOST_WIN32_FALSE@am__append_1 = -D_FORTIFY_SOURCE=2
subdir = mono/eglib
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/apple-target.m4 \
@@ -625,7 +626,8 @@ MAKEFLAGS := $(MAKEFLAGS) --no-builtin-rules
@ENABLE_MSVC_ONLY_FALSE@eglibdir = $(datadir)/mono-$(API_VER)/mono/eglib
@ENABLE_MSVC_ONLY_FALSE@eglib_DATA = eglib-config.h
@ENABLE_MSVC_ONLY_FALSE@libeglib_la_CFLAGS = -g -Wall -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE
@ENABLE_MSVC_ONLY_FALSE@libeglib_la_CFLAGS = -g -Wall -D_GNU_SOURCE \
@ENABLE_MSVC_ONLY_FALSE@ $(am__append_1)
@ENABLE_MSVC_ONLY_FALSE@AM_CPPFLAGS = -I$(srcdir)
@ENABLE_MSVC_ONLY_FALSE@@HOST_ANDROID_FALSE@@HOST_WIN32_FALSE@libeglib_la_LIBADD = -lm $(LTLIBICONV)
@ENABLE_MSVC_ONLY_FALSE@@HOST_ANDROID_FALSE@@HOST_WIN32_TRUE@libeglib_la_LIBADD = -lm -lpsapi $(LTLIBICONV)

View File

@@ -34,7 +34,10 @@ SOURCES = \
test_eglib_SOURCES = $(SOURCES)
GLIB_TEST_FLAGS_COMMON = -Wall -DEGLIB_TESTS=1 -D_FORTIFY_SOURCE=2 -I$(srcdir)/.. -I.. -DDRIVER_NAME=\"EGlib\"
GLIB_TEST_FLAGS_COMMON = -Wall -DEGLIB_TESTS=1 -I$(srcdir)/.. -I.. -DDRIVER_NAME=\"EGlib\"
if !HOST_WIN32
GLIB_TEST_FLAGS_COMMON += -D_FORTIFY_SOURCE=2
endif
CFLAGS += $(GLIB_TEST_FLAGS_COMMON)
CXXFLAGS += $(GLIB_TEST_FLAGS_COMMON) @CXXFLAGS_COMMON@

View File

@@ -89,6 +89,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
@HOST_WIN32_FALSE@am__append_1 = -D_FORTIFY_SOURCE=2
@DISABLE_EXECUTABLES_FALSE@@HOST_WIN32_FALSE@noinst_PROGRAMS = test-eglib$(EXEEXT) \
@DISABLE_EXECUTABLES_FALSE@@HOST_WIN32_FALSE@ assertf$(EXEEXT)
subdir = mono/eglib/test
@@ -508,7 +509,8 @@ SOURCES = \
memory.c
test_eglib_SOURCES = $(SOURCES)
GLIB_TEST_FLAGS_COMMON = -Wall -DEGLIB_TESTS=1 -D_FORTIFY_SOURCE=2 -I$(srcdir)/.. -I.. -DDRIVER_NAME=\"EGlib\"
GLIB_TEST_FLAGS_COMMON = -Wall -DEGLIB_TESTS=1 -I$(srcdir)/.. -I.. \
-DDRIVER_NAME=\"EGlib\" $(am__append_1)
test_eglib_LDADD = ../libeglib.la $(LTLIBICONV)
assertf_LDADD = ../libeglib.la $(LTLIBICONV)
MAINTAINERCLEANFILES = Makefile.in