Thanks, applied as 9d6c29779f20ef343340ace386b43a3bfc405b4c. Michael
[sent from post-receive hook] On Fri, 26 Jun 2020 13:00:52 +0200, Roland Hieber <[email protected]> wrote: > Signed-off-by: Roland Hieber <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git > a/patches/mono-3.2.8/0001-Applied-patch-from-Kyle-Edwards-kyleedwardsny-gmail..patch > > b/patches/mono-3.2.8/0001-Applied-patch-from-Kyle-Edwards-kyleedwardsny-gmail..patch > deleted file mode 100644 > index c6652bcde744..000000000000 > --- > a/patches/mono-3.2.8/0001-Applied-patch-from-Kyle-Edwards-kyleedwardsny-gmail..patch > +++ /dev/null > @@ -1,22 +0,0 @@ > -From: Zoltan Varga <[email protected]> > -Date: Tue, 3 Jun 2014 16:07:40 +0200 > -Subject: [PATCH] Applied patch from Kyle Edwards <[email protected]>. > - Fix isinf () check with clang. Fixes #20244. > - > ---- > - configure.in | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/configure.in b/configure.in > -index 493f671c2a7d..0a390788d125 100644 > ---- a/configure.in > -+++ b/configure.in > -@@ -475,7 +475,7 @@ AC_CHECK_HEADERS(wchar.h) > - AC_CHECK_HEADERS(ieeefp.h) > - AC_MSG_CHECKING(for isinf) > - AC_TRY_LINK([#include <math.h>], [ > -- int f = isinf (1); > -+ int f = isinf (1.0); > - ], [ > - AC_MSG_RESULT(yes) > - AC_DEFINE(HAVE_ISINF, 1, [isinf available]) > diff --git a/patches/mono-3.2.8/autogen.sh b/patches/mono-3.2.8/autogen.sh > deleted file mode 120000 > index 9f8a4cb7ddcb..000000000000 > --- a/patches/mono-3.2.8/autogen.sh > +++ /dev/null > @@ -1 +0,0 @@ > -../autogen.sh > \ No newline at end of file > diff --git a/patches/mono-3.2.8/series b/patches/mono-3.2.8/series > deleted file mode 100644 > index 4c270b930294..000000000000 > --- a/patches/mono-3.2.8/series > +++ /dev/null > @@ -1,4 +0,0 @@ > -# generated by git-ptx-patches > -#tag:base --start-number 1 > -0001-Applied-patch-from-Kyle-Edwards-kyleedwardsny-gmail..patch > -# d06d73e43cdc6dae035f536c6595128b - git-ptx-patches magic > diff --git a/rules/mono.in b/rules/mono.in > deleted file mode 100644 > index 386616b648e0..000000000000 > --- a/rules/mono.in > +++ /dev/null > @@ -1,14 +0,0 @@ > -## SECTION=staging > -## old section: > -### SECTION=bytecode_engines > - > -config MONO > - tristate > - select GLIB > - prompt "mono" > - help > - mono is a runtime implementation of the ECMA Common Language > - Infrastructure. It can be used to run ECMA and .NET applications. > - > - STAGING: remove in ptxdist-2020.06.0 > - Old version that need to be updated. Fails to build with glibc-2.28. > diff --git a/rules/mono.make b/rules/mono.make > deleted file mode 100644 > index 4c014ff05ae5..000000000000 > --- a/rules/mono.make > +++ /dev/null > @@ -1,153 +0,0 @@ > -# -*-makefile-*- > -# > -# Copyright (C) 2010 by Robert Schwebel <[email protected]> > -# > -# For further information about the PTXdist project and license conditions > -# see the README file. > -# > - > -# > -# We provide this package > -# > -ifndef PTXCONF_ARCH_ARM64 > -PACKAGES-$(PTXCONF_MONO) += mono > -endif > - > -# > -# Paths and names > -# > -MONO_VERSION := 3.2.8 > -MONO_MD5 := 1075f99bd8a69890af9e30309728e684 > -MONO := mono-$(MONO_VERSION) > -MONO_SUFFIX := tar.bz2 > -MONO_URL := > http://download.mono-project.com/sources/mono/$(MONO).$(MONO_SUFFIX) > -MONO_SOURCE := $(SRCDIR)/$(MONO).$(MONO_SUFFIX) > -MONO_DIR := $(BUILDDIR)/$(MONO) > -MONO_LICENSE := unknown > -MONO_DEVPKG := NO > - > -# > ---------------------------------------------------------------------------- > -# Extract > -# > ---------------------------------------------------------------------------- > - > -$(STATEDIR)/mono.extract: > - @$(call targetinfo) > - @$(call clean, $(MONO_DIR)) > - @$(call extract, MONO) > -# # The mono archive has some stray .git files in it's externals-subdirs > - @find $(MONO_DIR) -name .git -print0 | xargs -0 rm -v > - @$(call patchin, MONO) > - @$(call touch) > - > -# > ---------------------------------------------------------------------------- > -# Prepare > -# > ---------------------------------------------------------------------------- > - > -MONO_CONF_ENV := \ > - $(CROSS_ENV) \ > - CPPFLAGS="$(CROSS_CPPFLAGS) $(call ptx/ifdef, > PTXCONF_HAS_HARDFLOAT,,-DARM_FPU_NONE)" \ > - mono_cv_uscore=yes > -# > -# autoconf > -# > -MONO_CONF_TOOL := autoconf > -MONO_CONF_OPT := \ > - $(CROSS_AUTOCONF_USR) \ > - --disable-solaris-tar-check \ > - --disable-nls \ > - --disable-mcs-build \ > - --enable-silent-rules \ > - --disable-parallel-mark \ > - --disable-dev-random \ > - --enable-shared-handles \ > - --disable-nunit-tests \ > - --disable-big-arrays \ > - --disable-dtrace \ > - --disable-llvm \ > - --disable-loadedllvm \ > - --disable-llvm-version-check \ > - --with-libgdiplus=installed \ > - --with-gc=included \ > - --with-tls=pthread \ > - --with-sigaltstack=no \ > - --with-static_mono=no \ > - --with-shared_mono=yes \ > - --with-xen_opt=no \ > - --with-large-heap=no \ > - --with-ikvm-native=yes \ > - --with-profile2=no \ > - --with-profile4=no \ > - --with-profile4_5=no \ > - --with-monodroid=no \ > - --with-monotouch=no \ > - --with-mobile=no \ > - --with-oprofile=no \ > - --with-malloc-mempools=no \ > - --with-mcs-docs=no \ > - --with-lazy-gc-thread-creation=no \ > - --enable-libraries \ > - --enable-executables \ > - --disable-extension-module \ > - --disable-small-config \ > - --enable-system-aot \ > - --enable-boehm \ > - --disable-nacl-codegen \ > - --disable-nacl-gc \ > - --disable-icall-symbol-map \ > - --enable-icall-export \ > - --disable-icall-tables \ > - --with-jumptables=no \ > - --with-sgen=yes > - > -# --enable-minimal=LIST drop support for LIST subsystems. > -# --with-crosspkgdir=/path/to/pkg-config/dir Change pkg-config dir to > custom dir > -# > -# LIST is a comma-separated list from: aot, profiler, decimal, pinvoke, > debug, > -# appdomains, verifier, reflection_emit, reflection_emit_save, large_code, > -# logging, com, ssa, generics, attach, jit, simd, soft_debug, perfcounters, > -# normalization, assembly_remapping, shared_perfcounters, remoting, security, > -# sgen_remset, sgen_marksweep_par, sgen_marksweep_fixed, > -# sgen_marksweep_fixed_par, sgen_copying.], > - > -# > ---------------------------------------------------------------------------- > -# Target-Install > -# > ---------------------------------------------------------------------------- > - > -$(STATEDIR)/mono.targetinstall: > - @$(call targetinfo) > - > - @$(call install_init, mono) > - @$(call install_fixup, mono,PACKAGE,mono) > - @$(call install_fixup, mono,PRIORITY,optional) > - @$(call install_fixup, mono,VERSION,$(MONO_VERSION)) > - @$(call install_fixup, mono,SECTION,base) > - @$(call install_fixup, mono,AUTHOR,"Robert Schwebel > <[email protected]>") > - @$(call install_fixup, mono,DEPENDS,) > - @$(call install_fixup, mono,DESCRIPTION,missing) > - > - @$(call install_copy, mono, 0, 0, 0644, -, /etc/mono/2.0/machine.config) > - > - @$(call install_copy, mono, 0, 0, 0644, -, > /etc/mono/2.0/DefaultWsdlHelpGenerator.aspx) > - @$(call install_copy, mono, 0, 0, 0644, -, > /etc/mono/2.0/Browsers/Compat.browser) > - @$(call install_copy, mono, 0, 0, 0644, -, > /etc/mono/2.0/DefaultWsdlHelpGenerator.aspx) > - @$(call install_copy, mono, 0, 0, 0644, -, /etc/mono/2.0/machine.config) > - @$(call install_copy, mono, 0, 0, 0644, -, /etc/mono/2.0/settings.map) > - @$(call install_copy, mono, 0, 0, 0644, -, /etc/mono/2.0/web.config) > - @$(call install_copy, mono, 0, 0, 0644, -, /etc/mono/browscap.ini) > - @$(call install_copy, mono, 0, 0, 0644, -, /etc/mono/config) > - > - @$(call install_tree, mono, -, -, $(MONO_PKGDIR)/usr/bin, /usr/bin) > - @$(call install_tree, mono, -, -, $(MONO_PKGDIR)/usr/lib, /usr/lib) > - > - @$(call install_copy, mono, 0, 0, 0644, -, > /usr/share/mono-2.0/mono/cil/cil-opcodes.xml) > - > - # looks like we have to install this, otherwhise not even helloworld.cs > does work > - @$(call install_copy, mono, 0, 0, 0755, \ > - $(MONO_DIR)/mcs/class/lib/monolite/mscorlib.dll, \ > - /usr/lib/mono/1.0/mscorlib.dll) > - > - @$(call install_finish, mono) > - > - @$(call touch) > - > -# vim: syntax=make _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
