From 305cb680f6a4a9cc706329aa23e1076549e001f4 Mon Sep 17 00:00:00 2001 From: Nikolay Orlyuk Date: Thu, 29 Nov 2012 02:09:56 +0200 Subject: [PATCH] dev-lang/fsharp introduced with scm version --- ...0001-Respect-with-gacdir-path-to-gac.patch | 138 ++++++++++++++++++ .../0002-use-only-relative-symlinks.patch | 60 ++++++++ packages/dev-lang/fsharp/fsharp-scm.exheres-0 | 29 ++++ 3 files changed, 227 insertions(+) create mode 100644 packages/dev-lang/fsharp/files/0001-Respect-with-gacdir-path-to-gac.patch create mode 100644 packages/dev-lang/fsharp/files/0002-use-only-relative-symlinks.patch create mode 100644 packages/dev-lang/fsharp/fsharp-scm.exheres-0 diff --git a/packages/dev-lang/fsharp/files/0001-Respect-with-gacdir-path-to-gac.patch b/packages/dev-lang/fsharp/files/0001-Respect-with-gacdir-path-to-gac.patch new file mode 100644 index 00000000..1c96f185 --- /dev/null +++ b/packages/dev-lang/fsharp/files/0001-Respect-with-gacdir-path-to-gac.patch @@ -0,0 +1,138 @@ +Upstream: pull request https://github.com/fsharp/fsharp/pull/74 + +From 0d2277a02a512fbbce17449cb8e0c4f697ff3538 Mon Sep 17 00:00:00 2001 +From: Nikolay Orlyuk +Date: Wed, 28 Nov 2012 22:49:46 +0200 +Subject: [PATCH 1/2] Respect --with-gacdir=/path/to/gac + +Use parameter of --with-gacdir and MONODIR as a source for ROOTDIR in +gacutil. +--- + config.make.in | 1 + + configure.ac | 4 ++++ + src/fsharp/targets.make | 61 ++++++++++++++++++++++++------------------------- + 3 files changed, 35 insertions(+), 31 deletions(-) + +diff --git a/config.make.in b/config.make.in +index baea343..5ef0e68 100644 +--- a/config.make.in ++++ b/config.make.in +@@ -4,6 +4,7 @@ topdir := @abs_top_srcdir@/ + builddir := @abs_top_builddir@/ + libdir := ${prefix}/lib/ + bindir := ${prefix}/bin/ ++monorootdir := @MONOROOTDIR@/ + monodir := @MONODIR@/ + monolibdir2 := $(monodir)2.0/ + +diff --git a/configure.ac b/configure.ac +index 16736fc..4f79618 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -57,7 +57,11 @@ fi + if ! test -e $MONODIR/2.0/mscorlib.dll; then + AC_ERROR(Couldn't find the mono gac directory or mscorlib.dll in the usual places. Set --with-gacdir=) + fi ++ ++MONOROOTDIR=$(cd "$MONODIR/.." && pwd) ++ + AC_SUBST(MONODIR) ++AC_SUBST(MONOROOTDIR) + + if test "x$MONO_SGEN" = "xno"; then + mono_gc_options= +diff --git a/src/fsharp/targets.make b/src/fsharp/targets.make +index 99cedc3..8265cc1 100644 +--- a/src/fsharp/targets.make ++++ b/src/fsharp/targets.make +@@ -144,57 +144,56 @@ install-bin-4: TARGET := $(TARGET_4_0) + # + install-lib-2 install-lib-2-1 install-lib-4: + @echo "Installing $(ASSEMBLY)" +- @mkdir -p $(DESTDIR)/$(libdir) +- @mkdir -p $(DESTDIR)/$(libdir)mono/$(TARGET) +- gacutil -i $(outdir)$(ASSEMBLY) -root $(DESTDIR)/$(libdir) -package $(TARGET) ++ @mkdir -p $(DESTDIR)$(monodir)/$(TARGET) ++ gacutil -i $(outdir)$(ASSEMBLY) -root $(DESTDIR)$(monorootdir) -package $(TARGET) + @if test -e $(outdir)Microsoft.FSharp.targets; then \ +- mkdir -p $(DESTDIR)/$(libdir)mono/Microsoft\ F#/v$(TARGET)/; \ +- mkdir -p $(DESTDIR)/$(libdir)mono/Microsoft\ SDKs/F#/3.0/Framework/v$(TARGET)/; \ +- ln -fs $(DESTDIR)/$(libdir)mono/$(TARGET)/$(ASSEMBLY) $(DESTDIR)/$(libdir)mono/Microsoft\ F#/v$(TARGET)/$(ASSEMBLY); \ +- ln -fs $(DESTDIR)/$(libdir)mono/$(TARGET)/$(ASSEMBLY) $(DESTDIR)/$(libdir)mono/Microsoft\ SDKs/F#/3.0/Framework/v$(TARGET)/$(ASSEMBLY); \ +- $(INSTALL_LIB) $(outdir)Microsoft.FSharp.targets $(DESTDIR)/$(libdir)mono/$(TARGET)/; \ +- ln -fs $(DESTDIR)/$(libdir)mono/$(TARGET)/Microsoft.FSharp.targets $(DESTDIR)/$(libdir)mono/Microsoft\ F#/v$(TARGET)/Microsoft.FSharp.targets; \ +- ln -fs $(DESTDIR)/$(libdir)mono/$(TARGET)/Microsoft.FSharp.targets $(DESTDIR)/$(libdir)mono/Microsoft\ SDKs/F#/3.0/Framework/v$(TARGET)/Microsoft.FSharp.targets; \ ++ mkdir -p $(DESTDIR)$(monodir)/Microsoft\ F#/v$(TARGET)/; \ ++ mkdir -p $(DESTDIR)$(monodir)/Microsoft\ SDKs/F#/3.0/Framework/v$(TARGET)/; \ ++ ln -fs $(DESTDIR)$(monodir)/$(TARGET)/$(ASSEMBLY) $(DESTDIR)$(monodir)/Microsoft\ F#/v$(TARGET)/$(ASSEMBLY); \ ++ ln -fs $(DESTDIR)$(monodir)/$(TARGET)/$(ASSEMBLY) $(DESTDIR)$(monodir)/Microsoft\ SDKs/F#/3.0/Framework/v$(TARGET)/$(ASSEMBLY); \ ++ $(INSTALL_LIB) $(outdir)Microsoft.FSharp.targets $(DESTDIR)$(monodir)/$(TARGET)/; \ ++ ln -fs $(DESTDIR)$(monodir)/$(TARGET)/Microsoft.FSharp.targets $(DESTDIR)$(monodir)/Microsoft\ F#/v$(TARGET)/Microsoft.FSharp.targets; \ ++ ln -fs $(DESTDIR)$(monodir)/$(TARGET)/Microsoft.FSharp.targets $(DESTDIR)$(monodir)/Microsoft\ SDKs/F#/3.0/Framework/v$(TARGET)/Microsoft.FSharp.targets; \ + fi + @if test -e $(outdir)$(NAME).xml; then \ +- $(INSTALL_LIB) $(outdir)$(NAME).xml $(DESTDIR)/$(libdir)mono/gac/$(NAME)/$(VERSION)__$(TOKEN); \ +- ln -fs ../gac/$(NAME)/$(VERSION)__$(TOKEN)/$(NAME).xml $(DESTDIR)/$(libdir)mono/$(TARGET)/$(NAME).xml; \ ++ $(INSTALL_LIB) $(outdir)$(NAME).xml $(DESTDIR)$(monodir)/gac/$(NAME)/$(VERSION)__$(TOKEN); \ ++ ln -fs ../gac/$(NAME)/$(VERSION)__$(TOKEN)/$(NAME).xml $(DESTDIR)$(monodir)/$(TARGET)/$(NAME).xml; \ + fi + @if test -e $(outdir)$(NAME).sigdata; then \ +- $(INSTALL_LIB) $(outdir)$(NAME).sigdata $(DESTDIR)/$(libdir)mono/gac/$(NAME)/$(VERSION)__$(TOKEN); \ +- ln -fs ../gac/$(NAME)/$(VERSION)__$(TOKEN)/$(NAME).sigdata $(DESTDIR)/$(libdir)mono/$(TARGET)/$(NAME).sigdata; \ ++ $(INSTALL_LIB) $(outdir)$(NAME).sigdata $(DESTDIR)$(monodir)/gac/$(NAME)/$(VERSION)__$(TOKEN); \ ++ ln -fs ../gac/$(NAME)/$(VERSION)__$(TOKEN)/$(NAME).sigdata $(DESTDIR)$(monodir)/$(TARGET)/$(NAME).sigdata; \ + fi + @if test -e $(outdir)$(NAME).optdata; then \ +- $(INSTALL_LIB) $(outdir)$(NAME).optdata $(DESTDIR)/$(libdir)mono/gac/$(NAME)/$(VERSION)__$(TOKEN); \ +- ln -fs ../gac/$(NAME)/$(VERSION)__$(TOKEN)/$(NAME).optdata $(DESTDIR)/$(libdir)mono/$(TARGET)/$(NAME).optdata; \ ++ $(INSTALL_LIB) $(outdir)$(NAME).optdata $(DESTDIR)$(monodir)/gac/$(NAME)/$(VERSION)__$(TOKEN); \ ++ ln -fs ../gac/$(NAME)/$(VERSION)__$(TOKEN)/$(NAME).optdata $(DESTDIR)$(monodir)/$(TARGET)/$(NAME).optdata; \ + fi + + install-lib-4-5: install-lib-4 +- @if test -e $(DESTDIR)$(libdir)mono/4.5/; then \ +- ln -fs $(DESTDIR)$(libdir)mono/4.0/$(ASSEMBLY) $(DESTDIR)$(libdir)mono/4.5/$(ASSEMBLY); \ +- if test -e $(DESTDIR)$(libdir)mono/4.0/$(ASSEMBLY).config; then \ +- ln -fs $(DESTDIR)$(libdir)mono/4.0/$(ASSEMBLY).config $(DESTDIR)$(libdir)mono/4.5/$(ASSEMBLY).config; \ ++ @if test -e $(DESTDIR)$(monodir)/4.5/; then \ ++ ln -fs $(DESTDIR)$(monodir)/4.0/$(ASSEMBLY) $(DESTDIR)$(monodir)/4.5/$(ASSEMBLY); \ ++ if test -e $(DESTDIR)$(monodir)/4.0/$(ASSEMBLY).config; then \ ++ ln -fs $(DESTDIR)$(monodir)/4.0/$(ASSEMBLY).config $(DESTDIR)$(monodir)/4.5/$(ASSEMBLY).config; \ + fi; \ +- if test -e $(DESTDIR)$(libdir)mono/4.0/$(NAME).sigdata; then \ +- ln -fs $(DESTDIR)$(libdir)mono/4.0/$(NAME).sigdata $(DESTDIR)$(libdir)mono/4.5/$(NAME).sigdata; \ ++ if test -e $(DESTDIR)$(monodir)/4.0/$(NAME).sigdata; then \ ++ ln -fs $(DESTDIR)$(monodir)/4.0/$(NAME).sigdata $(DESTDIR)$(monodir)/4.5/$(NAME).sigdata; \ + fi; \ +- if test -e $(DESTDIR)$(libdir)mono/4.0/$(NAME).xml; then \ +- ln -fs $(DESTDIR)$(libdir)mono/4.0/$(NAME).xml $(DESTDIR)$(libdir)mono/4.5/$(NAME).xml; \ ++ if test -e $(DESTDIR)$(monodir)/4.0/$(NAME).xml; then \ ++ ln -fs $(DESTDIR)$(monodir)/4.0/$(NAME).xml $(DESTDIR)$(monodir)/4.5/$(NAME).xml; \ + fi; \ +- if test -e $(DESTDIR)$(libdir)mono/4.0/$(NAME).optdata; then \ +- ln -fs $(DESTDIR)$(libdir)mono/4.0/$(NAME).optdata $(DESTDIR)$(libdir)mono/4.5/$(NAME).optdata; \ ++ if test -e $(DESTDIR)$(monodir)/4.0/$(NAME).optdata; then \ ++ ln -fs $(DESTDIR)$(monodir)/4.0/$(NAME).optdata $(DESTDIR)$(monodir)/4.5/$(NAME).optdata; \ + fi; \ + fi + + # The binaries fsc.exe and fsi.exe only get installed for Mono 4.0 profile + # This also installs 'fsharpc' and 'fsharpi' + install-bin-4: +- sed -e 's,[@]DIR[@],$(libdir)mono/$(TARGET),g' -e 's,[@]TOOL[@],$(ASSEMBLY),g' < $(topdir)launcher > $(outdir)$(subst fs,fsharp,$(NAME))$(VERSION) ++ sed -e 's,[@]DIR[@],$(monodir)/$(TARGET),g' -e 's,[@]TOOL[@],$(ASSEMBLY),g' < $(topdir)launcher > $(outdir)$(subst fs,fsharp,$(NAME))$(VERSION) + chmod +x $(outdir)$(subst fs,fsharp,$(NAME))$(VERSION) +- @mkdir -p $(DESTDIR)/$(libdir) +- @mkdir -p $(DESTDIR)/$(bindir) +- $(INSTALL_LIB) $(outdir)$(ASSEMBLY) $(DESTDIR)$(libdir)mono/$(TARGET) +- $(INSTALL_BIN) $(outdir)$(subst fs,fsharp,$(NAME))$(VERSION) $(DESTDIR)/$(bindir) ++ @mkdir -p $(DESTDIR)$(monodir)/$(TARGET) ++ @mkdir -p $(DESTDIR)$(bindir) ++ $(INSTALL_LIB) $(outdir)$(ASSEMBLY) $(DESTDIR)$(monodir)/$(TARGET) ++ $(INSTALL_BIN) $(outdir)$(subst fs,fsharp,$(NAME))$(VERSION) $(DESTDIR)$(bindir) + + + $(objdir) $(objdir)$(TARGET_2_0) $(objdir)$(TARGET_2_1) $(objdir)$(TARGET_4_0): +-- +1.8.0 + diff --git a/packages/dev-lang/fsharp/files/0002-use-only-relative-symlinks.patch b/packages/dev-lang/fsharp/files/0002-use-only-relative-symlinks.patch new file mode 100644 index 00000000..190f58ee --- /dev/null +++ b/packages/dev-lang/fsharp/files/0002-use-only-relative-symlinks.patch @@ -0,0 +1,60 @@ +Upstream: pull request https://github.com/fsharp/fsharp/pull/74 + +From 4287a749b6f79b32c9cfbf948e584041f0ee1c76 Mon Sep 17 00:00:00 2001 +From: Nikolay Orlyuk +Date: Thu, 29 Nov 2012 01:24:10 +0200 +Subject: [PATCH 2/2] use only relative symlinks + +Many linux distributives uses DESTDIR for sandbox and then relocate all +files under root causing absolute (to DESTDIR) symlinks to be broken. +--- + src/fsharp/targets.make | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/src/fsharp/targets.make b/src/fsharp/targets.make +index 8265cc1..25a465a 100644 +--- a/src/fsharp/targets.make ++++ b/src/fsharp/targets.make +@@ -149,11 +149,11 @@ install-lib-2 install-lib-2-1 install-lib-4: + @if test -e $(outdir)Microsoft.FSharp.targets; then \ + mkdir -p $(DESTDIR)$(monodir)/Microsoft\ F#/v$(TARGET)/; \ + mkdir -p $(DESTDIR)$(monodir)/Microsoft\ SDKs/F#/3.0/Framework/v$(TARGET)/; \ +- ln -fs $(DESTDIR)$(monodir)/$(TARGET)/$(ASSEMBLY) $(DESTDIR)$(monodir)/Microsoft\ F#/v$(TARGET)/$(ASSEMBLY); \ +- ln -fs $(DESTDIR)$(monodir)/$(TARGET)/$(ASSEMBLY) $(DESTDIR)$(monodir)/Microsoft\ SDKs/F#/3.0/Framework/v$(TARGET)/$(ASSEMBLY); \ ++ ln -fs ../../$(TARGET)/$(ASSEMBLY) $(DESTDIR)$(monodir)/Microsoft\ F#/v$(TARGET)/$(ASSEMBLY); \ ++ ln -fs ../../../../../$(TARGET)/$(ASSEMBLY) $(DESTDIR)$(monodir)/Microsoft\ SDKs/F#/3.0/Framework/v$(TARGET)/$(ASSEMBLY); \ + $(INSTALL_LIB) $(outdir)Microsoft.FSharp.targets $(DESTDIR)$(monodir)/$(TARGET)/; \ +- ln -fs $(DESTDIR)$(monodir)/$(TARGET)/Microsoft.FSharp.targets $(DESTDIR)$(monodir)/Microsoft\ F#/v$(TARGET)/Microsoft.FSharp.targets; \ +- ln -fs $(DESTDIR)$(monodir)/$(TARGET)/Microsoft.FSharp.targets $(DESTDIR)$(monodir)/Microsoft\ SDKs/F#/3.0/Framework/v$(TARGET)/Microsoft.FSharp.targets; \ ++ ln -fs ../../$(TARGET)/Microsoft.FSharp.targets $(DESTDIR)$(monodir)/Microsoft\ F#/v$(TARGET)/Microsoft.FSharp.targets; \ ++ ln -fs ../../../../../$(TARGET)/Microsoft.FSharp.targets $(DESTDIR)$(monodir)/Microsoft\ SDKs/F#/3.0/Framework/v$(TARGET)/Microsoft.FSharp.targets; \ + fi + @if test -e $(outdir)$(NAME).xml; then \ + $(INSTALL_LIB) $(outdir)$(NAME).xml $(DESTDIR)$(monodir)/gac/$(NAME)/$(VERSION)__$(TOKEN); \ +@@ -170,18 +170,18 @@ install-lib-2 install-lib-2-1 install-lib-4: + + install-lib-4-5: install-lib-4 + @if test -e $(DESTDIR)$(monodir)/4.5/; then \ +- ln -fs $(DESTDIR)$(monodir)/4.0/$(ASSEMBLY) $(DESTDIR)$(monodir)/4.5/$(ASSEMBLY); \ ++ ln -fs ../4.0/$(ASSEMBLY) $(DESTDIR)$(monodir)/4.5/$(ASSEMBLY); \ + if test -e $(DESTDIR)$(monodir)/4.0/$(ASSEMBLY).config; then \ +- ln -fs $(DESTDIR)$(monodir)/4.0/$(ASSEMBLY).config $(DESTDIR)$(monodir)/4.5/$(ASSEMBLY).config; \ ++ ln -fs ../4.0/$(ASSEMBLY).config $(DESTDIR)$(monodir)/4.5/$(ASSEMBLY).config; \ + fi; \ + if test -e $(DESTDIR)$(monodir)/4.0/$(NAME).sigdata; then \ +- ln -fs $(DESTDIR)$(monodir)/4.0/$(NAME).sigdata $(DESTDIR)$(monodir)/4.5/$(NAME).sigdata; \ ++ ln -fs ../4.0/$(NAME).sigdata $(DESTDIR)$(monodir)/4.5/$(NAME).sigdata; \ + fi; \ + if test -e $(DESTDIR)$(monodir)/4.0/$(NAME).xml; then \ +- ln -fs $(DESTDIR)$(monodir)/4.0/$(NAME).xml $(DESTDIR)$(monodir)/4.5/$(NAME).xml; \ ++ ln -fs ../4.0/$(NAME).xml $(DESTDIR)$(monodir)/4.5/$(NAME).xml; \ + fi; \ + if test -e $(DESTDIR)$(monodir)/4.0/$(NAME).optdata; then \ +- ln -fs $(DESTDIR)$(monodir)/4.0/$(NAME).optdata $(DESTDIR)$(monodir)/4.5/$(NAME).optdata; \ ++ ln -fs ../4.0/$(NAME).optdata $(DESTDIR)$(monodir)/4.5/$(NAME).optdata; \ + fi; \ + fi + +-- +1.8.0 + diff --git a/packages/dev-lang/fsharp/fsharp-scm.exheres-0 b/packages/dev-lang/fsharp/fsharp-scm.exheres-0 new file mode 100644 index 00000000..71b87844 --- /dev/null +++ b/packages/dev-lang/fsharp/fsharp-scm.exheres-0 @@ -0,0 +1,29 @@ +# Copyright 2012 Nikolay Orlyuk +# Distributed under the terms of the GNU General Public License v2 + +require github \ + autotools [ supported_automake=[ 1.12 ] supported_autoconf=[ 2.5 ] ] + +SUMMARY="The F# compiler, core library and core tools (open source edition)" + +LICENCES="Apache-2.0" +SLOT="0" +PLATFORMS="~amd64" +MYOPTIONS="" + +DEPENDENCIES=" + build: + virtual/pkg-config + build+run: + dev-lang/mono[>=2.9] +" + +BUGS_TO="virkony@gmail.com" + +DEFAULT_SRC_PREPARE_PATCHES=( + "${FILES}/0001-Respect-with-gacdir-path-to-gac.patch" + "${FILES}/0002-use-only-relative-symlinks.patch" +) + +DEFAULT_SRC_CONFIGURE_PARAMS=( --with-gacdir=/usr/${LIBDIR:-lib}/mono/gac ) +