[Pkg-cli-apps-commits] [fsharp] 04/06: Refresh patches for new upstream
Christopher Halse Rogers
raof-guest at moszumanska.debian.org
Mon Feb 10 10:53:10 UTC 2014
This is an automated email from the git hooks/post-receive script.
raof-guest pushed a commit to branch master-experimental
in repository fsharp.
commit 44d049d32222db3e130468bc4745823310ef4a91
Author: Christopher James Halse Rogers <raof at ubuntu.com>
Date: Mon Feb 10 20:05:12 2014 +1100
Refresh patches for new upstream
---
debian/patches/build-only-4.0-libs.patch | 101 ++++++++-----------------------
debian/patches/debian-cli-policy.patch | 16 ++---
2 files changed, 32 insertions(+), 85 deletions(-)
diff --git a/debian/patches/build-only-4.0-libs.patch b/debian/patches/build-only-4.0-libs.patch
index 01a46f3..c4ca8b4 100644
--- a/debian/patches/build-only-4.0-libs.patch
+++ b/debian/patches/build-only-4.0-libs.patch
@@ -1,77 +1,24 @@
---- a/src/fsharp/FSharp.Core/Makefile.in
-+++ b/src/fsharp/FSharp.Core/Makefile.in
-@@ -103,10 +103,10 @@
-
- include $(topdir)/src/fsharp/targets.make
-
--do-final: do-4-0 do-2-0 do-2-1
-+do-final: do-4-0
-
- clean: clean-4-0 clean-2-0 clean-2-1
-
--install: install-lib-4 install-lib-4-5 install-lib-2 install-lib-2-1
-+install: install-lib-4 install-lib-4-5
-
-
---- a/src/fsharp/policy.2.0.FSharp.Core/Makefile.in
-+++ b/src/fsharp/policy.2.0.FSharp.Core/Makefile.in
-@@ -20,10 +20,10 @@
- cp policy.2.0.FSharp.Core.dll.config $(@D)
- al /link:policy.2.0.FSharp.Core.dll.config /out:$@ /delaysign /keyfile:$(topdir)msfinal.pub /version:$(VERSION_4_0)
-
--do-final: do-2-0 do-4-0
-+do-final: do-4-0
-
- clean: clean-2-0 clean-4-0
-
--install: install-lib-2 install-lib-4
-+install: install-lib-4
-
-
---- a/src/fsharp/policy.2.3.FSharp.Core/Makefile.in
-+++ b/src/fsharp/policy.2.3.FSharp.Core/Makefile.in
-@@ -20,10 +20,10 @@
- cp policy.2.3.FSharp.Core.dll.config $(@D)
- al /link:policy.2.3.FSharp.Core.dll.config /out:$@ /delaysign /keyfile:$(topdir)msfinal.pub /version:$(VERSION_4_0)
-
--do-final: do-2-0 do-4-0
-+do-final: do-4-0
-
- clean: clean-2-0 clean-4-0
-
--install: install-lib-2 install-lib-4
-+install: install-lib-4
-
-
---- a/src/fsharp/policy.4.0.FSharp.Core/Makefile.in
-+++ b/src/fsharp/policy.4.0.FSharp.Core/Makefile.in
-@@ -20,11 +20,11 @@
- cp policy.4.0.FSharp.Core.dll.config $(@D)
- al /link:policy.4.0.FSharp.Core.dll.config /out:$@ /delaysign /keyfile:$(topdir)msfinal.pub /version:$(VERSION_4_0)
-
--do-final: do-2-0 do-4-0
-+do-final: do-4-0
-
- clean: clean-2-0 clean-4-0
-
--install: install-lib-2 install-lib-4
-+install: install-lib-4
-
-
-
---- a/src/fsharp/policy.4.3.FSharp.Core/Makefile.in
-+++ b/src/fsharp/policy.4.3.FSharp.Core/Makefile.in
-@@ -20,11 +20,11 @@
- cp policy.4.3.FSharp.Core.dll.config $(@D)
- al /link:policy.4.3.FSharp.Core.dll.config /out:$@ /delaysign /keyfile:$(topdir)msfinal.pub /version:$(VERSION_4_0)
-
--do-final: do-2-0 do-4-0
-+do-final: do-4-0
-
- clean: clean-2-0 clean-4-0
-
--install: install-lib-2 install-lib-4
-+install: install-lib-4
-
-
-
+--- a/src/fsharp/Makefile.in
++++ b/src/fsharp/Makefile.in
+@@ -35,11 +35,16 @@
+ $(MAKE) -C policy.2.3.FSharp.Core $@
+ $(MAKE) -C policy.3.3.FSharp.Core $@
+ $(MAKE) -C policy.4.3.FSharp.Core $@
+- $(MAKE) -C policy.2.0.FSharp.Core TargetFramework=net20 $@
+- $(MAKE) -C policy.2.3.FSharp.Core TargetFramework=net20 $@
+- $(MAKE) -C FSharp.Core TargetFramework=net20 $@
+- $(MAKE) -C FSharp.Core TargetFramework=monodroid $@
+- $(MAKE) -C FSharp.Core TargetFramework=monotouch $@
++# We don't care about 2.0-profile support, and can't build
++# (non-DFSG-free) MonoDroid support
++#
++# If you'd like us to care about 2.0-profile support for some reason,
++# please file a bug.
++# $(MAKE) -C policy.2.0.FSharp.Core TargetFramework=net20 $@
++# $(MAKE) -C policy.2.3.FSharp.Core TargetFramework=net20 $@
++# $(MAKE) -C FSharp.Core TargetFramework=net20 $@
++# $(MAKE) -C FSharp.Core TargetFramework=monodroid $@
++# $(MAKE) -C FSharp.Core TargetFramework=monotouch $@
+
+ # Add these to build portable FSharp.Core on Mac
+ # - Requires Mono 3.2.4 or greater
diff --git a/debian/patches/debian-cli-policy.patch b/debian/patches/debian-cli-policy.patch
index db90eca..e3b7952 100644
--- a/debian/patches/debian-cli-policy.patch
+++ b/debian/patches/debian-cli-policy.patch
@@ -1,23 +1,23 @@
--- a/launcher.in
+++ b/launcher.in
-@@ -27,4 +27,4 @@
+@@ -21,4 +21,4 @@
# location of the default FSharp install in order to find the FSharp compiler binaries (see
# fsharpbinding/MonoDevelop.FSharpBinding/Services/CompilerLocationUtils.fs). That's a pretty unfortunate
# way of finding those binaries. And really should be changed.
--$EXEC mono $DEBUG $MONO_OPTIONS $MONO_GC_OPTIONS @DIR@/@TOOL@ "$@"
-+SILLY_ENV_HACK_FOR_REGEX=mono $EXEC cli $DEBUG $MONO_OPTIONS $MONO_GC_OPTIONS @DIR@/@TOOL@ "$@"
+-$EXEC mono $DEBUG $MONO_OPTIONS @DIR@/@TOOL@ --exename:$(basename $0) "$@"
++SILLY_ENV_HACK_FOR_REGEX=mono $EXEC cli $DEBUG $MONO_OPTIONS @DIR@/@TOOL@ --exename:$(basename $0) "$@"
--- a/src/fsharp/targets.make
+++ b/src/fsharp/targets.make
-@@ -221,9 +221,11 @@
+@@ -101,9 +101,11 @@
# The binaries fsc.exe and fsi.exe only get installed for Mono 4.0 profile
# This also installs 'fsharpc' and 'fsharpi'
+#
+# Debian patch - Point fsharpc and fsharpi at our install paths, not the GAC.
- install-bin-4:
+ install-bin:
chmod +x $(outdir)$(ASSEMBLY)
-- sed -e 's,[@]DIR[@],$(gacdir)/$(TARGET),g' -e 's,[@]TOOL[@],$(ASSEMBLY),g' < $(topdir)launcher > $(outdir)$(subst fs,fsharp,$(NAME))$(VERSION)
-+ sed -e "s,[@]DIR[@],/usr/lib/cli/fsharp,g" -e 's,[@]TOOL[@],$(ASSEMBLY),g' < $(topdir)launcher > $(outdir)$(subst fs,fsharp,$(NAME))$(VERSION)
- chmod +x $(outdir)$(subst fs,fsharp,$(NAME))$(VERSION)
+- sed -e 's,[@]DIR[@],$(gacdir)/$(TARGET),g' -e 's,[@]TOOL[@],$(ASSEMBLY),g' < $(topdir)launcher > $(outdir)$(subst fs,fsharp,$(NAME))
++ sed -e "s,[@]DIR[@],/usr/lib/cli/fsharp,g" -e 's,[@]TOOL[@],$(ASSEMBLY),g' < $(topdir)launcher > $(outdir)$(subst fs,fsharp,$(NAME))
+ chmod +x $(outdir)$(subst fs,fsharp,$(NAME))
@mkdir -p $(DESTDIR)$(gacdir)/$(TARGET)
@mkdir -p $(DESTDIR)$(bindir)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/fsharp.git
More information about the Pkg-cli-apps-commits
mailing list