rpms/mono-basic/devel mono-basic-1.9-nobootstrap.patch, NONE, 1.1 mono-basic.spec, 1.4, 1.5

Fri Apr 11 21:46:04 UTC 2008

Author: spot

Update of /cvs/pkgs/rpms/mono-basic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30217

Modified Files:
	mono-basic.spec 
Added Files:
	mono-basic-1.9-nobootstrap.patch 
Log Message:

Don't use binaries to bootstrap, use system files.


mono-basic-1.9-nobootstrap.patch:

--- NEW FILE mono-basic-1.9-nobootstrap.patch ---
diff -up mono-basic-1.9/build/profiles/bootstrap.make.BAD mono-basic-1.9/build/profiles/bootstrap.make
--- mono-basic-1.9/build/profiles/bootstrap.make.BAD	2008-04-11 17:37:18.000000000 -0400
+++ mono-basic-1.9/build/profiles/bootstrap.make	2008-04-11 17:37:35.000000000 -0400
@@ -14,8 +14,8 @@
 # run the compiler; /r: flags are by default loaded from whatever's
 # in the MONO_PATH too).
 
-VBNC = MONO_PATH="$(topdir)/class/lib/$(PROFILE):$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) --debug $(topdir)/class/lib/bootstrap/vbnc.exe
-BOOTSTRAP_VBNC = MONO_PATH="$(topdir)/class/lib/bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) --debug  $(topdir)/class/lib/bootstrap/vbnc.exe
+VBNC = MONO_PATH="$(topdir)/class/lib/$(PROFILE):$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) --debug $(libdir)/mono/2.0/vbnc.exe
+BOOTSTRAP_VBNC = MONO_PATH="$(topdir)/class/lib/bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) --debug  $(libdir)/mono/2.0/vbnc.exe
 
 
 # nuttzing!
diff -up mono-basic-1.9/build/profiles/vbnc.make.BAD mono-basic-1.9/build/profiles/vbnc.make
--- mono-basic-1.9/build/profiles/vbnc.make.BAD	2008-04-11 17:35:38.000000000 -0400
+++ mono-basic-1.9/build/profiles/vbnc.make	2008-04-11 17:36:40.000000000 -0400
@@ -1,7 +1,7 @@
 # -*- makefile -*-
 
-VBNC = MONO_PATH="$(topdir)/class/lib/$(PROFILE):$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) --debug $(topdir)/class/lib/vbnc/vbnc.exe
-BOOTSTRAP_VBNC = MONO_PATH="$(topdir)/class/lib/bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) --debug  $(topdir)/class/lib/bootstrap/vbnc.exe
+VBNC = MONO_PATH="$(topdir)/class/lib/$(PROFILE):$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) --debug $(libdir)/mono/2.0/vbnc.exe
+BOOTSTRAP_VBNC = MONO_PATH="$(topdir)/class/lib/bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) --debug  $(libdir)/mono/2.0/vbnc.exe
 
 # nuttzing!
 
diff -up mono-basic-1.9/build/rules.make.BAD mono-basic-1.9/build/rules.make
--- mono-basic-1.9/build/rules.make.BAD	2008-04-11 17:34:45.000000000 -0400
+++ mono-basic-1.9/build/rules.make	2008-04-11 17:35:23.000000000 -0400
@@ -28,7 +28,7 @@ INSTALL_BIN = $(INSTALL) -c -m 755
 INSTALL_LIB = $(INSTALL_BIN)
 MKINSTALLDIRS = $(SHELL) $(topdir)/mkinstalldirs
 INTERNAL_MCS = mcs
-INTERNAL_VBNC = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(PROFILE)/vbnc.exe
+INTERNAL_VBNC = $(RUNTIME) $(RUNTIME_FLAGS) $(libdir)/mono/2.0/vbnc.exe
 INTERNAL_GMCS = gmcs
 INTERNAL_ILASM = ilasm
 INTERNAL_RESGEN = resgen
diff -up mono-basic-1.9/class/Makefile.BAD mono-basic-1.9/class/Makefile
--- mono-basic-1.9/class/Makefile.BAD	2008-04-11 17:38:33.000000000 -0400
+++ mono-basic-1.9/class/Makefile	2008-04-11 17:38:50.000000000 -0400
@@ -5,10 +5,9 @@ include ../build/rules.make
 lib/bootstrap lib/vbnc:
 	$(MKINSTALLDIRS) $@
 
-DISTFILES = \
-	lib/bootstrap/Microsoft.VisualBasic.dll lib/bootstrap/vbnc.exe lib/bootstrap/vbnc.rsp	
+DISTFILES = 
 
-dist-default: lib/bootstrap/Microsoft.VisualBasic.dll lib/bootstrap/vbnc.exe lib/bootstrap/vbnc.rsp
+dist-default: 
 
 DIST_PROFILE_DIRS = bootstrap vbnc
 
diff -up mono-basic-1.9/vbnc/vbnc/Makefile.BAD mono-basic-1.9/vbnc/vbnc/Makefile
--- mono-basic-1.9/vbnc/vbnc/Makefile.BAD	2008-04-11 17:39:46.000000000 -0400
+++ mono-basic-1.9/vbnc/vbnc/Makefile	2008-04-11 17:40:28.000000000 -0400
@@ -4,7 +4,7 @@ include ../../build/rules.make
 
 LOCAL_VBNC_FLAGS = @vbnc.exe.rsp $(EXTERNAL_VBNC_FLAGS)
 
-PROGRAM = $(topdir)/class/lib/vbnc/vbnc.exe
+PROGRAM = $(libdir)/mono/2.0/vbnc.exe
 PROGRAM_COMPILE = $(BOOT_COMPILE)
 
 include ../../build/executable.make
diff -up mono-basic-1.9/vbnc/vbnc/tests/Makefile.BAD mono-basic-1.9/vbnc/vbnc/tests/Makefile


Index: mono-basic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-basic/devel/mono-basic.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mono-basic.spec	21 Feb 2008 14:44:52 -0000	1.4
+++ mono-basic.spec	11 Apr 2008 21:45:27 -0000	1.5
@@ -1,14 +1,17 @@
 Name:		mono-basic
 Version:	1.9
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:        VisualBasic.NET support for mono
 Group:          Development/Languages
 License:        LGPLv2+
 Patch0:		mono-basic.patch
+Patch1:		mono-basic-1.9-nobootstrap.patch
 URL:            http://www.mono-project.com/
 Source0:        %{name}-%{version}.tar.bz2	
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# Yeah, so this guy isn't self-hosting.
+BuildRequires:	mono-basic
 BuildRequires:  mono-devel >= 1.9
 Requires: 	mono-winforms
 
@@ -25,14 +28,17 @@
 sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH0}
 %patch0 -p1 -b .original
 sed -i -e 's!%{_libdir}!@@LIBDIR@@!' %{PATCH0} 
+# Get rid of bootstrap binary bits
+rm -rf class/lib/bootstrap/*
+%patch1 -p1 -b .nobootstrap
 
 %build
 ./configure --prefix=%{_prefix} --libdir=%{_libdir}
-make
+make libdir=%{_libdir}
 
 %install
 %{__rm} -rf %{buildroot}
-make DESTDIR=%{buildroot} install
+make libdir=%{_libdir} DESTDIR=%{buildroot} install
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -45,6 +51,9 @@
 %{_libdir}/mono/gac/Microsoft.VisualBasic
 
 %changelog
+* Fri Apr 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.9-2
+- get rid of bootstrap binary bits
+
 * Thu Feb 21 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9-1
 - bump
 


