mirror of
https://github.com/ilyakooo0/urbit.git
synced 2024-12-24 23:44:56 +03:00
Build with libuv-v1.7.5
This commit is contained in:
John Franklin
Raymond Pasco
parent
0b6d89db5c
commit
7328874488
201
LIBUV-v1.7.5.md
201
LIBUV-v1.7.5.md
@ -65,3 +65,204 @@ Compare the (unpacked) tarball with the branch:
|
||||
You should get a null diff.
|
||||
|
||||
You can delete `libuv-v1.7.5.tar.gz`, `libuv-v1.7.5.tar.gz.sign` and `libuv-v1.7.5` as they are not needed anymore.
|
||||
|
||||
Build the branch
|
||||
----------------
|
||||
|
||||
Tag `MAKE-libuv-v1.7.5` is a commit that only has `Makefile` changes to build urbit with `libuv-v1.7.5`.
|
||||
This commit has no changes to the urbit code to address possible issues with using `libuv-v1.7.5`.
|
||||
|
||||
If you already cloned the branch from verifying:
|
||||
|
||||
cd urbit-libuv-v1.7.5
|
||||
git checkout MAKE-libuv-v1.7.5
|
||||
|
||||
Otherwise, get the branch:
|
||||
|
||||
git clone -b libuv-v1.7.5 https://github.com/jfranklin9000/urbit
|
||||
mv urbit urbit-libuv-v1.7.5
|
||||
cd urbit-libuv-v1.7.5
|
||||
git checkout MAKE-libuv-v1.7.5
|
||||
|
||||
Build it:
|
||||
|
||||
make
|
||||
|
||||
Sanity check:
|
||||
|
||||
find . -name "libuv.a"
|
||||
|
||||
Try it
|
||||
------
|
||||
|
||||
bin/urbit -c mycomet
|
||||
|
||||
~
|
||||
urbit: home is mycomet
|
||||
loom: mapped 2048MB
|
||||
boot: installed 229 jets
|
||||
boot: loading /Users/urbit/urbit-libuv-v1.7.5/urb/urbit.pill
|
||||
arvo: time: ~2015.10.26..09.54.15..1946
|
||||
generating 2048-bit RSA pair...
|
||||
cp /Users/urbit/urbit-libuv-v1.7.5/urb/urbit.pill mycomet/.urb
|
||||
saving passcode in mycomet/.urb/code.~pasnev-nachut
|
||||
(for real security, write it down and delete the file...)
|
||||
ames: czar zod.urbit.org: ip .192.241.195.84
|
||||
ames: on localhost, UDP 53365.
|
||||
http: live (insecure) on 8081
|
||||
http: live ("secure") on 8444
|
||||
; ~zod |Tianming| is your neighbor
|
||||
; ~zod |Tianming| is your neighbor
|
||||
<awaiting hood, this may take a few minutes>
|
||||
[%dill-init ~doslet-ronnep-moptux-nomhec--rivtyr-lidled-hoddur-dozmyl %hood]
|
||||
activated sync from %kids on ~zod to %base
|
||||
activated sync from %base on ~doslet-ronnep-moptux-nomhec--rivtyr-lidled-hoddur-dozmyl to %home
|
||||
sync succeeded from %base on ~doslet-ronnep-moptux-nomhec--rivtyr-lidled-hoddur-dozmyl to %home
|
||||
'initial merge succeeded'
|
||||
[~doslet-ronnep-moptux-nomhec--rivtyr-lidled-hoddur-dozmyl, driving ~doslet-ronnep-moptux-nomhec--rivtyr-lidled-hoddur-dozmyl]
|
||||
activated app base/dojo
|
||||
activated app base/talk
|
||||
[linked to [p=~doslet-ronnep-moptux-nomhec--rivtyr-lidled-hoddur-dozmyl q=%talk]]
|
||||
--------------| new mailbox %porch: default home
|
||||
--------------| cap default home
|
||||
--------------| met ~doslet-ronnep-moptux-nomhec--rivtyr-lidled-hoddur-dozmyl %h
|
||||
[linked to [p=~doslet-ronnep-moptux-nomhec--rivtyr-lidled-hoddur-dozmyl q=%dojo]]
|
||||
~doslet-ronnep-moptux-nomhec--rivtyr-lidled-hoddur-dozmyl:dojo> ^x
|
||||
~doslet-ronnep-moptux-nomhec--rivtyr-lidled-hoddur-dozmyl:talk() ;join ~doznec/urbit-meta
|
||||
sync succeeded from %kids on ~zod to %base
|
||||
--------------| new glyph '='
|
||||
----------------| ;join ~doznec/urbit-meta
|
||||
--------------| porch: hey '=' ~doznec/urbit-meta
|
||||
; ~doznec _Urban Republic_ is your neighbor
|
||||
; ~doznec _Urban Republic_ is your neighbor
|
||||
[%ap-fill-full [~doslet-ronnep-moptux-nomhec--rivtyr-lidled-hoddur-dozmyl %talk] ~doznec 2]
|
||||
[%ap-fill-full [~doslet-ronnep-moptux-nomhec--rivtyr-lidled-hoddur-dozmyl %talk] ~doznec 2]
|
||||
[%ap-fill-full [~doslet-ronnep-moptux-nomhec--rivtyr-lidled-hoddur-dozmyl %talk] ~doznec 2]
|
||||
[%ap-fill-full [~doslet-ronnep-moptux-nomhec--rivtyr-lidled-hoddur-dozmyl %talk] ~doznec 2]
|
||||
[%ap-fill-full [~doslet-ronnep-moptux-nomhec--rivtyr-lidled-hoddur-dozmyl %talk] ~doznec 2]
|
||||
[%ap-fill-full [~doslet-ronnep-moptux-nomhec--rivtyr-lidled-hoddur-dozmyl %talk] ~doznec 2]
|
||||
[%ap-fill-full [~doslet-ronnep-moptux-nomhec--rivtyr-lidled-hoddur-dozmyl %talk] ~doznec 2]
|
||||
[%ap-fill-full [~doslet-ronnep-moptux-nomhec--rivtyr-lidled-hoddur-dozmyl %talk] ~doznec 2]
|
||||
[%ap-fill-full [~doslet-ronnep-moptux-nomhec--rivtyr-lidled-hoddur-dozmyl %talk] ~doznec 2]
|
||||
[%ap-fill-full [~doslet-ronnep-moptux-nomhec--rivtyr-lidled-hoddur-dozmyl %talk] ~doznec 2]
|
||||
[%ap-fill-full [~doslet-ronnep-moptux-nomhec--rivtyr-lidled-hoddur-dozmyl %talk] ~doznec 2]
|
||||
[%ap-kill %talk 2]
|
||||
[%talk-pull ~doslet-ronnep-moptux-nomhec--rivtyr-lidled-hoddur-dozmyl 2 /sole]
|
||||
[%drum-quit ~doslet-ronnep-moptux-nomhec--rivtyr-lidled-hoddur-dozmyl 1 p=~doslet-ronnep-moptux-nomhec--rivtyr-lidled-hoddur-dozmyl q=%talk]
|
||||
--------------| new '=' ~doznec/urbit-meta
|
||||
--------------| --met ~hidduc-posmeg-hidduc-posmeg %hear
|
||||
--------------| --met ~parret-borden %hear
|
||||
--------------| --met ~loppeg-milper %hear
|
||||
--------------| --met ~doznec %hear
|
||||
--------------| --met ~racbes-solmun %hear
|
||||
--------------| --met ~sivbud-barnel %hear
|
||||
--------------| --met ~fortux-nartun %hear
|
||||
--------------| --met ~divpex-lidruc %hear
|
||||
--------------| --met ~ramtev-wisbyt %hear
|
||||
--------------| --met ~bilmet-havwer %hear
|
||||
--------------| --met ~sivtyv-barnel %hear
|
||||
--------------| --met ~tacden-lodret %hear
|
||||
--------------| --met ~nodpet-rinned %hear
|
||||
--------------| --met ~racleb-fitwyt %hear
|
||||
--------------| --met ~dilnem-nodfun %hear
|
||||
--------------| --met ~ripnul-rilnyx %hear
|
||||
--------------| --met ~talsur-todres %hear
|
||||
--------------| --met ~hodnym-ronsut-famnyt-fitpyl--pacryl-bisdet-dardeg-ronnyd
|
||||
--------------| --met ~novrud-hanweb %hear
|
||||
--------------| --met ~todsef-nathes %hear
|
||||
--------------| --met ~fodrem-michex %hear
|
||||
--------------| --met ~worlen-wicwet %hear
|
||||
--------------| --met ~hidduc-posmeg %hear
|
||||
--------------| --met ~ramdun-mirpec %hear
|
||||
--------------| --met ~bosmex-palseg %hear
|
||||
--------------| --met ~pormev-taglyn %hear
|
||||
--------------| --met ~simtex-wicnup-pagbes-matbec--tommyr-bilnyd-haptec-libdem
|
||||
--------------| --met ~pagmel-doclur-sarmer-dislyn--lasnem-bisred-mirdyt-nalwyx
|
||||
--------------| --met ~matwyc-sablud %hear
|
||||
--------------| --met ~rabtug-molhut %hear
|
||||
[unlinked from [p=~doslet-ronnep-moptux-nomhec--rivtyr-lidled-hoddur-dozmyl q=%talk]]
|
||||
[linked to [p=~doslet-ronnep-moptux-nomhec--rivtyr-lidled-hoddur-dozmyl q=%talk]]
|
||||
--------------| new mailbox %porch: default home
|
||||
--------------| met ~doslet-ronnep-moptux-nomhec--rivtyr-lidled-hoddur-dozmyl %h
|
||||
--------------| new '=' ~doznec/urbit-meta
|
||||
--------------| --met ~hidduc-posmeg-hidduc-posmeg %hear
|
||||
--------------| --met ~parret-borden %hear
|
||||
--------------| --met ~loppeg-milper %hear
|
||||
--------------| --met ~doznec %hear
|
||||
--------------| --met ~racbes-solmun %hear
|
||||
--------------| --met ~sivbud-barnel %hear
|
||||
--------------| --met ~fortux-nartun %hear
|
||||
--------------| --met ~divpex-lidruc %hear
|
||||
--------------| --met ~ramtev-wisbyt %hear
|
||||
--------------| --met ~bilmet-havwer %hear
|
||||
--------------| --met ~sivtyv-barnel %hear
|
||||
--------------| --met ~tacden-lodret %hear
|
||||
--------------| --met ~nodpet-rinned %hear
|
||||
--------------| --met ~racleb-fitwyt %hear
|
||||
--------------| --met ~dilnem-nodfun %hear
|
||||
--------------| --met ~ripnul-rilnyx %hear
|
||||
--------------| --met ~talsur-todres %hear
|
||||
--------------| --met ~hodnym-ronsut-famnyt-fitpyl--pacryl-bisdet-dardeg-ronnyd
|
||||
--------------| --met ~novrud-hanweb %hear
|
||||
--------------| --met ~todsef-nathes %hear
|
||||
--------------| --met ~fodrem-michex %hear
|
||||
--------------| --met ~worlen-wicwet %hear
|
||||
--------------| --met ~hidduc-posmeg %hear
|
||||
--------------| --met ~ramdun-mirpec %hear
|
||||
--------------| --met ~bosmex-palseg %hear
|
||||
--------------| --met ~pormev-taglyn %hear
|
||||
--------------| --met ~simtex-wicnup-pagbes-matbec--tommyr-bilnyd-haptec-libdem
|
||||
--------------| --met ~pagmel-doclur-sarmer-dislyn--lasnem-bisred-mirdyt-nalwyx
|
||||
--------------| --met ~matwyc-sablud %hear
|
||||
--------------| --met ~rabtug-molhut %hear
|
||||
--------------| cap default home
|
||||
--------------| porch: hey '=' ~doznec/urbit-meta
|
||||
--------------| ~doznec/urbit-meta: cap for urbit meta-discussion
|
||||
--------------| ~doznec/urbit-meta: but channel
|
||||
--------------| for '=' ~doznec/urbit-meta
|
||||
--------------| --met ~doslet-ronnep-moptux-nomhec--rivtyr-lidled-hoddur-dozmyl
|
||||
[%ap-fill-full [~doslet-ronnep-moptux-nomhec--rivtyr-lidled-hoddur-dozmyl %talk] ~doznec 2]
|
||||
|
||||
SNIP
|
||||
|
||||
[%ap-fill-full [~doslet-ronnep-moptux-nomhec--rivtyr-lidled-hoddur-dozmyl %talk] ~doznec 2]
|
||||
[%ap-kill %talk 2]
|
||||
[%talk-pull ~doslet-ronnep-moptux-nomhec--rivtyr-lidled-hoddur-dozmyl 2 /sole]
|
||||
[%drum-quit ~doslet-ronnep-moptux-nomhec--rivtyr-lidled-hoddur-dozmyl 1 p=~doslet-ronnep-moptux-nomhec--rivtyr-lidled-hoddur-dozmyl q=%talk]
|
||||
--------------[0]
|
||||
|
||||
SNIP
|
||||
|
||||
~doslet-ronnep-moptux-nomhec--rivtyr-lidled-hoddur-dozmyl:talk= testing
|
||||
~doslet_dozmyl= testing
|
||||
~doslet-ronnep-moptux-nomhec--rivtyr-lidled-hoddur-dozmyl:talk=
|
||||
|
||||
This is the only testing I've done so far. Don't use your planet with this branch.
|
||||
|
||||
Reverting to libuv_0.11
|
||||
-----------------------
|
||||
|
||||
Do some cleaning:
|
||||
|
||||
make clean
|
||||
make -C outside/libuv-v1.7.5 distclean
|
||||
|
||||
Edit `Makefile` from:
|
||||
|
||||
# libuv version
|
||||
#LIBUV_VER=libuv_0.11
|
||||
LIBUV_VER=libuv-v1.7.5
|
||||
|
||||
to:
|
||||
|
||||
# libuv version
|
||||
LIBUV_VER=libuv_0.11
|
||||
#LIBUV_VER=libuv-v1.7.5
|
||||
|
||||
Build it:
|
||||
|
||||
make
|
||||
|
||||
Sanity check:
|
||||
|
||||
find . -name "libuv.a"
|
||||
|
||||
24
Makefile
24
Makefile
@ -78,6 +78,16 @@ else
|
||||
DEBUGFLAGS=-O3
|
||||
endif
|
||||
|
||||
# libuv version
|
||||
#LIBUV_VER=libuv_0.11
|
||||
LIBUV_VER=libuv-v1.7.5
|
||||
|
||||
ifeq ($(LIBUV_VER),libuv_0.11)
|
||||
LIBUV_CONFIGURE_OPTIONS=--disable-dtrace
|
||||
else
|
||||
LIBUV_CONFIGURE_OPTIONS=
|
||||
endif
|
||||
|
||||
# NOTFORCHECKIN - restore -O3
|
||||
# -DGHETTO \
|
||||
# -DHUSH
|
||||
@ -86,7 +96,7 @@ CFLAGS= $(COSFLAGS) $(DEBUGFLAGS) -ffast-math \
|
||||
-I/usr/local/include \
|
||||
-I/opt/local/include \
|
||||
-I$(INCLUDE) \
|
||||
-Ioutside/libuv_0.11/include \
|
||||
-Ioutside/$(LIBUV_VER)/include \
|
||||
-Ioutside/anachronism/include \
|
||||
-Ioutside/bpt \
|
||||
-Ioutside/re2 \
|
||||
@ -360,10 +370,10 @@ VERE_DFILES=$(VERE_OFILES:%.o=.d/%.d)
|
||||
# * Solution: make libuv not only depend on its own Makefile,
|
||||
# but on a side effect of creating its own makefile.
|
||||
#
|
||||
LIBUV_MAKEFILE=outside/libuv_0.11/Makefile
|
||||
LIBUV_MAKEFILE2=outside/libuv_0.11/config.log
|
||||
LIBUV_MAKEFILE=outside/$(LIBUV_VER)/Makefile
|
||||
LIBUV_MAKEFILE2=outside/$(LIBUV_VER)/config.log
|
||||
|
||||
LIBUV=outside/libuv_0.11/.libs/libuv.a
|
||||
LIBUV=outside/$(LIBUV_VER)/.libs/libuv.a
|
||||
|
||||
LIBRE2=outside/re2/obj/libre2.a
|
||||
|
||||
@ -395,7 +405,7 @@ all: urbit
|
||||
urbit: $(BIN)/urbit
|
||||
|
||||
$(LIBUV_MAKEFILE) $(LIBUV_MAKEFILE2):
|
||||
cd outside/libuv_0.11 ; sh autogen.sh ; ./configure --disable-dtrace
|
||||
cd outside/$(LIBUV_VER) ; sh autogen.sh ; ./configure $(LIBUV_CONFIGURE_OPTIONS)
|
||||
|
||||
# [h]act II: the plot thickens
|
||||
#
|
||||
@ -413,7 +423,7 @@ $(LIBUV_MAKEFILE) $(LIBUV_MAKEFILE2):
|
||||
$(LIBUV_MAKEFILE2): $(LIBUV_MAKEFILE)
|
||||
|
||||
$(LIBUV): $(LIBUV_MAKEFILE) $(LIBUV_MAKEFILE2)
|
||||
$(MAKE) -C outside/libuv_0.11 all-am -j1
|
||||
$(MAKE) -C outside/$(LIBUV_VER) all-am -j1
|
||||
|
||||
$(LIBRE2):
|
||||
$(MAKE) -C outside/re2 obj/libre2.a
|
||||
@ -489,7 +499,7 @@ clean:
|
||||
# 'make distclean all -jn' ∀ n>1 still does not work because it is possible
|
||||
# Make will attempt to build urbit while it is also cleaning urbit..
|
||||
distclean: clean $(LIBUV_MAKEFILE)
|
||||
$(MAKE) -C outside/libuv_0.11 distclean
|
||||
$(MAKE) -C outside/$(LIBUV_VER) distclean
|
||||
$(MAKE) -C outside/re2 clean
|
||||
$(MAKE) -C outside/ed25519 clean
|
||||
$(MAKE) -C outside/anachronism clean
|
||||
|
||||
Loading…
Reference in New Issue
Block a user