Skip to content

Don't run make install in boehm submodule #17907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
directhex merged 3 commits into from
Jan 6, 2020
Merged

Don't run make install in boehm submodule #17907

directhex merged 3 commits into from
Jan 6, 2020

Conversation

@directhex
Copy link
Contributor

@directhex directhex commented Nov 25, 2019

Automake doesn't have a built-in noinst_SUBDIRS, because Automake doesn't add "much-needed features" which have only been asked for for 15 years.

So override make install with a custom rule to filter out entries.

Yes, I tested it.

--- makeinstall.files	2019-11-25 11:52:50.560157892 -0500
+++ makeinstall-with-patch.files	2019-11-25 11:32:12.487098228 -0500
@@ -107,25 +107,6 @@
 ./etc/mono/browscap.ini
 ./etc/mono/config
 ./etc/mono/mconfig/config.xml
-./include/gc/cord.h
-./include/gc/cord_pos.h
-./include/gc/ec.h
-./include/gc/gc_allocator.h
-./include/gc/gc_backptr.h
-./include/gc/gc_config_macros.h
-./include/gc/gc_disclaim.h
-./include/gc/gc_gcj.h
-./include/gc/gc.h
-./include/gc/gc_inline.h
-./include/gc/gc_mark.h
-./include/gc/gc_pthread_redirects.h
-./include/gc/gc_tiny_fl.h
-./include/gc/gc_typed.h
-./include/gc/gc_version.h
-./include/gc.h
-./include/gc/javaxfc.h
-./include/gc/leak_detector.h
-./include/gc/weakpointer.h
 ./include/mono-2.0/mono/cil/opcode.def
 ./include/mono-2.0/mono/jit/jit.h
 ./include/mono-2.0/mono/metadata/appdomain.h
@@ -3183,7 +3164,6 @@
 ./lib/mono/xbuild/Microsoft/VisualStudio/v16.0/WebApplications/Microsoft.WebApplication.targets
 ./lib/mono/xbuild/Microsoft/VisualStudio/v9.0/WebApplications/Microsoft.WebApplication.targets
 ./lib/pkgconfig/aspnetwebstack.pc
-./lib/pkgconfig/bdw-gc.pc
 ./lib/pkgconfig/cecil.pc
 ./lib/pkgconfig/dotnet35.pc
 ./lib/pkgconfig/dotnet.pc
@@ -3202,39 +3182,6 @@
 ./lib/pkgconfig/system.web.mvc.pc
 ./lib/pkgconfig/wcf.pc
 ./lib/pkgconfig/xbuild12.pc
-./share/doc/gc/AUTHORS
-./share/doc/gc/debugging.md
-./share/doc/gc/finalization.md
-./share/doc/gc/gcdescr.md
-./share/doc/gc/gcinterface.md
-./share/doc/gc/leak.md
-./share/doc/gc/overview.md
-./share/doc/gc/porting.md
-./share/doc/gc/README.amiga
-./share/doc/gc/README.arm.cross
-./share/doc/gc/README.autoconf
-./share/doc/gc/README.cmake
-./share/doc/gc/README.cords
-./share/doc/gc/README.darwin
-./share/doc/gc/README.DGUX386
-./share/doc/gc/README.environment
-./share/doc/gc/README.ews4800
-./share/doc/gc/README.hp
-./share/doc/gc/README.linux
-./share/doc/gc/README.Mac
-./share/doc/gc/README.macros
-./share/doc/gc/README.md
-./share/doc/gc/README.OS2
-./share/doc/gc/README.rs6000
-./share/doc/gc/README.sgi
-./share/doc/gc/README.solaris2
-./share/doc/gc/README.symbian
-./share/doc/gc/README.uts
-./share/doc/gc/README.win32
-./share/doc/gc/README.win64
-./share/doc/gc/scale.md
-./share/doc/gc/simple_example.md
-./share/doc/gc/tree.md
 ./share/locale/de/LC_MESSAGES/mcs.mo
 ./share/locale/es/LC_MESSAGES/mcs.mo
 ./share/locale/ja/LC_MESSAGES/mcs.mo
@@ -3301,7 +3248,6 @@
 ./share/man/man1/wsdl.1
 ./share/man/man1/xbuild.1
 ./share/man/man1/xsd.1
-./share/man/man3/gc.3
 ./share/man/man5/mdoc.5
 ./share/man/man5/mono-config.5
 ./share/mono-2.0/mono/cil/cil-opcodes.xml

lambdageek
lambdageek reviewed Dec 2, 2019
View reviewed changes
akoeplinger
akoeplinger previously requested changes Dec 10, 2019
View reviewed changes
@baulig baulig self-requested a review December 10, 2019 18:28
@directhex
Copy link
Contributor Author

directhex commented Jan 3, 2020

unload-appdomain-on-shutdown.exe failure on OSX unrelated.

@directhex directhex requested a review from akoeplinger January 3, 2020 19:12
@directhex
Copy link
Contributor Author

directhex commented Jan 3, 2020

@monojenkins build failed

@directhex directhex merged commit 4c9e28b into mono:master Jan 6, 2020
@directhex
Copy link
Contributor Author

directhex commented Jan 16, 2020

@monojenkins backport to 2019-12

@monojenkins monojenkins mentioned this pull request Jan 16, 2020
Merged
ManickaP pushed a commit to ManickaP/runtime that referenced this pull request Jan 20, 2020
Don't run make install in boehm submodule (mono/mono#17907)
7b804f3 
Don't run `make install` in boehm submodule


Commit migrated from mono/mono@4c9e28b
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@marek-safar marek-safar Awaiting requested review from marek-safar

@baulig baulig Awaiting requested review from baulig

@akoeplinger akoeplinger Awaiting requested review from akoeplinger

1 more reviewer

@lambdageek lambdageek lambdageek left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@directhex @baulig @lambdageek @akoeplinger