-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy pathurbit-i686.diff
88 lines (84 loc) · 2.77 KB
/
urbit-i686.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
diff --git a/Makefile b/Makefile
index de9e5b5..4f6c0fa 100644
--- a/Makefile
+++ b/Makefile
@@ -64,7 +64,7 @@ endif
CURLINC=$(shell curl-config --cflags)
CURLLIB=$(shell curl-config --libs)
-RM=rm -f
+RM=rm -rf
ifneq ($(UNAME),FreeBSD)
CC=gcc
CXX=g++
@@ -499,7 +499,9 @@ osxpackage:
$(MAKE) $(BIN)/urbit LIB=/usr/local/lib/urb STATIC=yes
mkdir -p inst/usr/local/lib/urb inst/usr/local/bin
cp $(BIN)/urbit inst/usr/local/bin
- cp urb/urbit.pill inst/usr/local/lib/urb
+ cp urbit.pill inst/usr/local/lib/urb
+ mkdir -p inst/usr/local/lib/urb
+ cp -R arvo inst/usr/local/lib/urb/arvo
pkgbuild --root inst --identifier org.urbit.urbit --version 0.2 urbit.pkg
debbuild:
@@ -508,11 +510,13 @@ debbuild:
debinstall:
mkdir -p $(DESTDIR)/usr/bin $(DESTDIR)/usr/share/urb
install -m755 $(BIN)/urbit $(DESTDIR)/usr/bin
- cp urb/urbit.pill $(DESTDIR)/usr/share/urb
+ cp urbit.pill $(DESTDIR)/usr/share/urb
+ mkdir -p $(DESTDIR)/usr/share/urb
+ cp -R arvo $(DESTDIR)/usr/share/urb/arvo
clean:
$(RM) $(VERE_OFILES) $(BIN)/urbit urbit.pkg $(VERE_DFILES) $(TAGS)
- $(RM) -r debian/files debian/urbit*
+ $(RM) -r debian/files debian/urbit* debian/.debhelper debian/debhelper-build-stamp
# '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..
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..af69f45
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,8 @@
+urbit (0.2-1) UNRELEASED; urgency=low
+
+ * from mars
+ from the future
+
+ * not endorsed by zombies
+
+ -- Kingdon <yebyen@gmail.com> Wed, 26 Oct 2016 12:45:37 -0400
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..f6807d1
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,15 @@
+Source: urbit
+Section: base
+Priority: extra
+Maintainer: Kingdon <yebyen@gmail.com>
+Build-Depends: debhelper (>= 8.0.0), libssl-dev, libncurses5-dev, libgmp-dev, libsigsegv-dev, ragel, cmake, libtool, autoconf, libcurl4-gnutls-dev | libcurl4-openssl-dev
+Standards-Version: 3.9.7
+Homepage: http://urbit.org
+
+Package: urbit
+Architecture: any
+Multi-Arch: foreign
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: auto-generated package by debmake
+ This Debian binary package was auto-generated by the
+ debmake(1) command provided by the debmake package.
diff --git a/include/c/portable.h b/include/c/portable.h
index 7ed2db6..5e3bfcb 100644
--- a/include/c/portable.h
+++ b/include/c/portable.h
@@ -74,7 +74,7 @@
**/
# if defined(U3_OS_linux)
# define U3_OS_LoomBase 0x36000000
-# define U3_OS_LoomBits 29 // ie, 2^29 words == 2GB
+# define U3_OS_LoomBits 28 // ie, 2^28 words == 1GB
# elif defined(U3_OS_osx)
# ifdef __LP64__
# define U3_OS_LoomBase 0x200000000