Skip to content

Commit df95c49

Browse files
bottstrap::xorg: init
Signed-off-by: Andy-Python-Programmer <[email protected]>
1 parent ba7d1af commit df95c49

File tree

13 files changed

+1531
-5
lines changed

13 files changed

+1531
-5
lines changed

aero.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ def run_in_emulator(args, iso_path):
522522

523523
qemu_args = ['-cdrom', iso_path,
524524
'-M', 'q35',
525-
'-m', '512M',
525+
'-m', '1G',
526526
'-smp', '5',
527527
'-serial', 'stdio']
528528

bootstrap.yml

Lines changed: 291 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
imports:
2+
- file: bootstrap/xorg.yml
3+
14
general:
25
cargo:
36
config_toml: 'extra-files/rust/config.toml'
@@ -144,6 +147,22 @@ sources:
144147
tag: '1.20.0'
145148
version: '1.20.0'
146149

150+
- name: libxtrans
151+
subdir: 'bundled'
152+
git: 'https://gitlab.freedesktop.org/xorg/lib/libxtrans.git'
153+
tag: 'xtrans-1.4.0'
154+
version: '1.4.0'
155+
tools_required:
156+
- host-autoconf-v2.69
157+
- host-automake-v1.16
158+
- host-libtool
159+
- host-pkg-config
160+
- host-xorg-macros
161+
regenerate:
162+
- args: ['./autogen.sh']
163+
environ:
164+
NOCONFIGURE: 'yes'
165+
147166
tools:
148167
# We could run an external pkg-config; however, we need the aclocal files.
149168
# The easiest way to ensure that they are available is to just install pkg-config.
@@ -1084,6 +1103,277 @@ packages:
10841103
environ:
10851104
DESTDIR: '@THIS_COLLECT_DIR@'
10861105

1106+
- name: zlib
1107+
source:
1108+
subdir: 'bundled'
1109+
git: 'https://github.com/madler/zlib.git'
1110+
tag: 'v1.2.12'
1111+
version: '1.2.12'
1112+
tools_required:
1113+
- host-gcc
1114+
pkgs_required:
1115+
- mlibc
1116+
configure:
1117+
- args:
1118+
- '@THIS_SOURCE_DIR@/configure'
1119+
environ:
1120+
CHOST: 'x86_64-aero'
1121+
prefix: '/usr'
1122+
build:
1123+
- args: ['make', '-j@PARALLELISM@']
1124+
- args: ['make', 'install']
1125+
environ:
1126+
DESTDIR: '@THIS_COLLECT_DIR@'
1127+
1128+
- name: openssl
1129+
source:
1130+
subdir: 'bundled'
1131+
git: 'https://github.com/openssl/openssl.git'
1132+
tag: 'OpenSSL_1_1_1o'
1133+
version: '1.1.1o'
1134+
tools_required:
1135+
- host-gcc
1136+
pkgs_required:
1137+
- mlibc
1138+
- zlib
1139+
configure:
1140+
- args:
1141+
- '@THIS_SOURCE_DIR@/Configure'
1142+
- '--prefix=/usr'
1143+
- '--openssldir=/etc/ssl'
1144+
- '--libdir=lib'
1145+
- 'x86_64-aero'
1146+
- 'shared'
1147+
- 'zlib-dynamic'
1148+
- 'no-afalgeng'
1149+
environ:
1150+
CC: 'x86_64-aero-gcc'
1151+
CXX: 'x86_64-aero-g++'
1152+
build:
1153+
- args: ['make', '-j@PARALLELISM@']
1154+
# Disable installing static libraries
1155+
- args: ['sed', '-i', '/INSTALL_LIBS/s/libcrypto.a libssl.a//', '@THIS_BUILD_DIR@/Makefile']
1156+
# Suffix all man pages with ssl
1157+
- args: ['make', 'DESTDIR=@THIS_COLLECT_DIR@', 'MANSUFFIX=ssl', 'install']
1158+
environ:
1159+
DESTDIR: '@THIS_COLLECT_DIR@'
1160+
# Move the doc dir to a versioned directory
1161+
- args: ['mv', '@THIS_COLLECT_DIR@/usr/share/doc/openssl', '@THIS_COLLECT_DIR@/usr/share/doc/openssl-1.1.1o']
1162+
1163+
- name: libpng
1164+
source:
1165+
subdir: 'bundled'
1166+
git: 'https://git.code.sf.net/p/libpng/code'
1167+
tag: 'v1.6.37'
1168+
version: '1.6.37'
1169+
tools_required:
1170+
- host-autoconf-v2.69
1171+
- host-automake-v1.16
1172+
- host-libtool
1173+
regenerate:
1174+
- args: ['git', 'clean', '-xf', '-e', '*.xbstrap']
1175+
- args: ['autoreconf', '-fvi']
1176+
tools_required:
1177+
- host-gcc
1178+
pkgs_required:
1179+
- mlibc
1180+
- zlib
1181+
configure:
1182+
- args:
1183+
- '@THIS_SOURCE_DIR@/configure'
1184+
- '--host=x86_64-aero'
1185+
- '--prefix=/usr'
1186+
- '--with-sysroot=@SYSROOT_DIR@' # Set libtool's lt_sysroot.
1187+
build:
1188+
- args: ['make', '-j@PARALLELISM@']
1189+
- args: ['make', 'install-strip']
1190+
environ:
1191+
DESTDIR: '@THIS_COLLECT_DIR@'
1192+
1193+
- name: freetype
1194+
source:
1195+
subdir: 'bundled'
1196+
git: 'https://gitlab.freedesktop.org/freetype/freetype.git'
1197+
tag: 'VER-2-12-1'
1198+
version: '2.12.1'
1199+
tools_required:
1200+
- host-autoconf-v2.69
1201+
- host-automake-v1.16
1202+
- host-libtool
1203+
- host-pkg-config
1204+
regenerate:
1205+
- args: ['./autogen.sh']
1206+
environ:
1207+
NOCONFIGURE: '1'
1208+
- args: ['cp',
1209+
'@BUILD_ROOT@/tools/host-automake-v1.16/share/automake-1.16/config.sub',
1210+
'@THIS_SOURCE_DIR@/builds/unix/']
1211+
tools_required:
1212+
- host-gcc
1213+
pkgs_required:
1214+
- mlibc
1215+
- libpng
1216+
- zlib
1217+
configure:
1218+
- args:
1219+
- '@THIS_SOURCE_DIR@/configure'
1220+
- '--host=x86_64-aero'
1221+
- '--prefix=/usr'
1222+
- '--disable-static'
1223+
- '--with-harfbuzz=no'
1224+
build:
1225+
- args: ['make', '-j@PARALLELISM@']
1226+
- args: ['make', 'install']
1227+
environ:
1228+
DESTDIR: '@THIS_COLLECT_DIR@'
1229+
1230+
- name: fontconfig
1231+
source:
1232+
subdir: 'bundled'
1233+
git: 'https://gitlab.freedesktop.org/fontconfig/fontconfig.git'
1234+
tag: '2.14.0'
1235+
version: '2.14.0'
1236+
tools_required:
1237+
- host-autoconf-v2.69
1238+
- host-automake-v1.16
1239+
- host-libtool
1240+
- host-pkg-config
1241+
regenerate:
1242+
- args: ['./autogen.sh']
1243+
environ:
1244+
NOCONFIGURE: 'yes'
1245+
# Make sure we regenerate this file
1246+
- args: ['rm', '-f', 'src/fcobjshash.h']
1247+
pkgs_required:
1248+
- mlibc
1249+
- freetype
1250+
- libxml
1251+
- libiconv
1252+
tools_required:
1253+
- host-autoconf-v2.69
1254+
- host-automake-v1.16
1255+
- host-gcc
1256+
- host-libtool
1257+
- host-pkg-config
1258+
configure:
1259+
- args:
1260+
- '@THIS_SOURCE_DIR@/configure'
1261+
- '--host=x86_64-aero'
1262+
- '--prefix=/usr'
1263+
- '--sysconfdir=/etc'
1264+
- '--localstatedir=/var'
1265+
- '--disable-docs'
1266+
- '--with-sysroot=@SYSROOT_DIR@' # Set libtool's lt_sysroot.
1267+
- '--enable-libxml2'
1268+
build:
1269+
- args: ['make', '-j@PARALLELISM@']
1270+
- args: ['make', 'install-strip']
1271+
environ:
1272+
DESTDIR: '@THIS_COLLECT_DIR@'
1273+
1274+
- name: libxml
1275+
source:
1276+
subdir: 'bundled'
1277+
git: 'https://gitlab.gnome.org/GNOME/libxml2.git'
1278+
tag: 'v2.9.14'
1279+
version: '2.9.14'
1280+
tools_required:
1281+
- host-autoconf-v2.69
1282+
- host-automake-v1.16
1283+
- host-libtool
1284+
- host-pkg-config
1285+
regenerate:
1286+
- args: ['./autogen.sh']
1287+
environ:
1288+
NOCONFIGURE: 'yes'
1289+
tools_required:
1290+
- host-gcc
1291+
pkgs_required:
1292+
- mlibc
1293+
- zlib
1294+
- python
1295+
- libiconv
1296+
configure:
1297+
- args:
1298+
- '@THIS_SOURCE_DIR@/configure'
1299+
- '--host=x86_64-aero'
1300+
- '--prefix=/usr'
1301+
- '--with-python=@SYSROOT_DIR@/usr/bin/python3.8'
1302+
- '--disable-static'
1303+
- '--with-threads'
1304+
- '--disable-ipv6'
1305+
build:
1306+
- args: ['make', '-j@PARALLELISM@']
1307+
- args: ['make', 'install-strip']
1308+
environ:
1309+
DESTDIR: '@THIS_COLLECT_DIR@'
1310+
1311+
- name: libiconv
1312+
source:
1313+
subdir: 'bundled'
1314+
git: 'https://git.savannah.gnu.org/git/libiconv.git'
1315+
# Last release tag is broken for us, use current master (07-12-2020)
1316+
branch: 'master'
1317+
commit: '0eb1068ceb77ba383c3ce2fc391ab40ef686c491'
1318+
version: '1.16'
1319+
tools_required:
1320+
- host-autoconf-v2.69
1321+
- host-automake-v1.16
1322+
- host-libtool
1323+
- host-pkg-config
1324+
regenerate:
1325+
- args: ['./gitsub.sh', 'pull']
1326+
# Gnulib broke on commit e3174b6d1fdbe6ea2297bf8c8333f65f9d9d9588, so check out the one before that.
1327+
- args: ['git', 'checkout', '766ec17a90f67e8cda78394e58a7fffb00f5a4b7']
1328+
workdir: '@THIS_SOURCE_DIR@/gnulib'
1329+
- args: ['./autogen.sh']
1330+
environ:
1331+
'NOCONFIGURE': 'yes'
1332+
- args: ['cp',
1333+
'@BUILD_ROOT@/tools/host-automake-v1.16/share/automake-1.16/config.sub',
1334+
'@THIS_SOURCE_DIR@/build-aux/']
1335+
- args: ['cp',
1336+
'@BUILD_ROOT@/tools/host-automake-v1.16/share/automake-1.16/config.sub',
1337+
'@THIS_SOURCE_DIR@/libcharset/build-aux/']
1338+
- args: ['cp',
1339+
'@BUILD_ROOT@/tools/host-libtool/share/aclocal/libtool.m4',
1340+
'@THIS_SOURCE_DIR@/m4/']
1341+
- args: ['cp',
1342+
'@BUILD_ROOT@/tools/host-libtool/share/aclocal/libtool.m4',
1343+
'@THIS_SOURCE_DIR@/libcharset/m4/']
1344+
- args: ['cp',
1345+
'@BUILD_ROOT@/tools/host-libtool/share/libtool/build-aux/ltmain.sh',
1346+
'@THIS_SOURCE_DIR@/libcharset/build-aux/']
1347+
- args: ['cp',
1348+
'@BUILD_ROOT@/tools/host-libtool/share/libtool/build-aux/ltmain.sh',
1349+
'@THIS_SOURCE_DIR@/build-aux/']
1350+
- args: ['cp',
1351+
'@BUILD_ROOT@/tools/host-libtool/share/aclocal/ltversion.m4',
1352+
'@THIS_SOURCE_DIR@/m4/']
1353+
- args: ['cp',
1354+
'@BUILD_ROOT@/tools/host-libtool/share/aclocal/ltversion.m4',
1355+
'@THIS_SOURCE_DIR@/libcharset/m4/']
1356+
- args: ['autoreconf', '-fvi', '-I@THIS_SOURCE_DIR@/m4', '-I@THIS_SOURCE_DIR@/srcm4']
1357+
tools_required:
1358+
- host-gcc
1359+
- host-libtool
1360+
pkgs_required:
1361+
- mlibc
1362+
configure:
1363+
- args:
1364+
- '@THIS_SOURCE_DIR@/configure'
1365+
- '--host=x86_64-aero'
1366+
- '--prefix=/usr'
1367+
- '--with-sysroot=@SYSROOT_DIR@' # Set libtool's lt_sysroot.
1368+
- '--disable-nls'
1369+
- '--enable-shared'
1370+
- '--disable-static'
1371+
build:
1372+
- args: ['make', '-j@PARALLELISM@']
1373+
- args: ['make', 'install']
1374+
environ:
1375+
DESTDIR: '@THIS_COLLECT_DIR@'
1376+
10871377
# - name: weston
10881378
# labels: [aarch64]
10891379
# architecture: '@OPTION:arch@'
@@ -1094,7 +1384,7 @@ packages:
10941384
# version: '10.0.0'
10951385
# tools_required:
10961386
# - host-autoconf-v2.69
1097-
# - host-automake-v1.15
1387+
# - host-automake-v1.16
10981388
# - host-libtool
10991389
# - host-pkg-config
11001390
# - system-gcc

0 commit comments

Comments
 (0)