Disable sdl-player

Update relibc
Add libgmp
2021-07-19 11:12:29 -06:00 · 2021-07-19 10:14:50 -06:00 · 2021-07-19 08:39:16 -06:00 · 2021-07-19 08:28:39 -06:00 · 2021-07-19 06:46:53 -06:00 · 2021-07-18 20:48:01 -06:00
8 changed files with 10 additions and 7 deletions
--- a/bootstrap.sh
+++ b/bootstrap.sh
@ -231,7 +231,9 @@ ubuntu()
 		git \
 		gperf \
 		libc6-dev-i386 \
+		libexpat-dev \
 		libfuse-dev \
+		libgmp-dev \
 		libhtml-parser-perl \
 		libpng-dev \
 		libtool \
--- a/ci.toml
+++ b/ci.toml
@ -17,7 +17,7 @@ binutils = {}
 bootloader = {}
 ca-certificates = {}
 cairo = {}
-cairodemo = {}
+#cairodemo = {} # multiple definition of __rust_alloc
 #cargo = {} # curl-config not found
 cleye = {}
 cmatrix = {}
@ -75,6 +75,7 @@ keyboard-sfx = {}
 lci = {}
 libc-bench = {}
 libffi = {}
+libgmp = {}
 libiconv = {}
 libjpeg = {}
 libogg = {}
@ -164,7 +165,7 @@ sdl2_ttf = {}
 sdl_gfx = {}
 sdl_image = {}
 sdl_mixer = {}
-sdl-player = {}
+#sdl-player = {} # wctype_t
 #sdl_ttf = {} # configure patch needs to be updated
 sed = {}
 #servo = {} # some more crates to port
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 6e25f3485bdc4e3f3a62f83c6eaec5ac3ef25cab
+Subproject commit f11560d9785f76dbd80167b0e6ca02eeaca82ac4
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 6039026349658bf3cd30669d36e76ce8f8d5a0a6
+Subproject commit 9c3cf84453f95d597823f3b0d1512b48160c2ea8
--- a/mk/config.mk
+++ b/mk/config.mk
@ -51,7 +51,6 @@ KBUILD=build/kernel
 export TARGET=$(ARCH)-unknown-redox
 BUILD=build/userspace
 INSTALLER=\
-	export REDOXER_TOOLCHAIN="$(ROOT)/$(PREFIX_INSTALL)" && \
 	export PATH="$(PREFIX_PATH):$$PATH" && \
 	installer/target/release/redox_installer $(INSTALLER_FLAGS)

--- a/mk/prefix.mk
+++ b/mk/prefix.mk
@ -5,6 +5,7 @@ PREFIX_PATH=$(ROOT)/$(PREFIX_INSTALL)/bin

 export PREFIX_RUSTFLAGS=-L $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/lib
 export RUSTUP_TOOLCHAIN=$(ROOT)/$(PREFIX_INSTALL)
+export REDOXER_TOOLCHAIN=$(RUSTUP_TOOLCHAIN)

 prefix: $(PREFIX_INSTALL)

--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 98c60c357f8a4ff29c00334469efff56a22cf12c
+Subproject commit e051b18490d5675fc7b2b25a86cc51753a5d560f
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit f5eee2c14346c7c6e919721e4b0221f73f2fca9e
+Subproject commit b9b9225c2a7295a8ecfd7f575ffc6fba7de72f28
Author	SHA1	Message	Date
Jeremy Soller	a6eca10af6	Disable sdl-player	2021-07-19 11:12:29 -06:00
Jeremy Soller	c6a27629bc	Update relibc	2021-07-19 10:14:50 -06:00
Jeremy Soller	24914f1886	Add libgmp	2021-07-19 08:39:16 -06:00
Jeremy Soller	5981d3367f	Re-enable glium	2021-07-19 08:28:39 -06:00
Jeremy Soller	a8bff54cd7	Disable glium recipe	2021-07-19 06:46:53 -06:00
Jeremy Soller	17bf88b390	Ensure that REDOXER_TOOLCHAIN is set for all makefile targets	2021-07-18 20:48:01 -06:00
Jeremy Soller	4935d9f800	Update relibc	2021-07-18 20:21:25 -06:00
Jeremy Soller	7b528ed593	Update rust	2021-07-16 13:08:35 -06:00
Jeremy Soller	595fb29abc	Add libexpat-dev and libgmp-dev to Ubuntu bootstrap	2021-07-16 10:57:24 -06:00
Jeremy Soller	d5f3100c4d	Disable cairodemo recipe	2021-07-15 21:37:04 -06:00
Jeremy Soller	8c8d412d4f	Update cookbook	2021-07-14 13:13:19 -06:00
Jeremy Soller	46cb8b5c04	Update cookbook	2021-07-14 12:27:00 -06:00
Jeremy Soller	3bc63957a0	Update cookbook	2021-07-14 11:57:02 -06:00
Jeremy Soller	6d30c71282	Update kernel	2021-07-14 11:23:04 -06:00