Skip to content

Commit 4330fa3

Browse files
committed
[WORKSPACE, glib.BUILD] Replace from-source glib with system's version
1 parent eecb8c0 commit 4330fa3

File tree

2 files changed

+10
-253
lines changed

2 files changed

+10
-253
lines changed

Diff for: WORKSPACE

+6-11
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,6 @@ http_archive(
6262
],
6363
)
6464

65-
http_archive(
66-
name = "glib_archive",
67-
build_file = "@//bazel:glib.BUILD",
68-
sha256 = "0cbb3d31c9d181bbcc97cba3d9dbe3250f75e2da25e5f7c8bf5a993fe54baf6a",
69-
strip_prefix = "glib-2.55.1",
70-
urls = [
71-
"https://mirror.bazel.build/ftp.gnome.org/pub/gnome/sources/glib/2.55/glib-2.55.1.tar.xz",
72-
"https://ftp.gnome.org/pub/gnome/sources/glib/2.55/glib-2.55.1.tar.xz",
73-
],
74-
)
75-
7665
http_archive(
7766
name = "jpeg_archive",
7867
build_file = "@//bazel:jpeg.BUILD",
@@ -160,6 +149,12 @@ http_archive(
160149
)
161150

162151
# TODO: Replace with hermetic build
152+
new_local_repository(
153+
name = "glib_archive",
154+
build_file = "@//bazel:glib.BUILD",
155+
path ="/usr/local/Cellar/glib/2.66.2_1",
156+
)
157+
163158
new_local_repository(
164159
name = "sdl_system",
165160
build_file = "@//bazel:sdl.BUILD",

Diff for: bazel/glib.BUILD

+4-242
Original file line numberDiff line numberDiff line change
@@ -1,246 +1,8 @@
1-
genrule(
2-
name = "gen_configure",
3-
srcs = [
4-
"configure",
5-
"config.guess",
6-
"config.sub",
7-
"install-sh",
8-
"ltmain.sh",
9-
"missing",
10-
"glib/glib.h",
11-
"po/LINGUAS",
12-
] + glob(["**/*.in"]),
13-
outs = [
14-
"config.h",
15-
"glibconfig.h",
16-
],
17-
cmd = "./$(location configure) --silent --disable-fam --disable-libmount --disable-dtrace --disable-compile-warnings --with-pcre=internal " +
18-
"&& cp --verbose -- config.h $(location config.h)" +
19-
"&& cp --verbose -- glib/glibconfig.h $(location glibconfig.h)",
20-
)
21-
22-
cc_library(
23-
name = "charset",
24-
srcs = [
25-
"config.h",
26-
"glib/libcharset/localcharset.c",
27-
],
28-
hdrs = ["glib/libcharset/localcharset.h"],
29-
copts = [
30-
"-DHAVE_CONFIG_H",
31-
"-DLIBDIR='\"/nonexistent\"'",
32-
],
33-
)
34-
351
cc_library(
362
name = "glib",
37-
srcs = [
38-
"glib/deprecated/gallocator.c",
39-
"glib/deprecated/gcache.c",
40-
"glib/deprecated/gcompletion.c",
41-
"glib/deprecated/grel.c",
42-
"glib/deprecated/gthread.h",
43-
"glib/deprecated/gthread-deprecated.c",
44-
"glib/garray.c",
45-
"glib/gasyncqueue.c",
46-
"glib/gasyncqueueprivate.h",
47-
"glib/gatomic.c",
48-
"glib/gbacktrace.c",
49-
"glib/gbase64.c",
50-
"glib/gbitlock.c",
51-
"glib/gbookmarkfile.c",
52-
"glib/gbytes.c",
53-
"glib/gcharset.c",
54-
"glib/gcharsetprivate.h",
55-
"glib/gchecksum.c",
56-
"glib/gconvert.c",
57-
"glib/gdataset.c",
58-
"glib/gdatasetprivate.h",
59-
"glib/gdate.c",
60-
"glib/gdatetime.c",
61-
"glib/gdir.c",
62-
"glib/genviron.c",
63-
"glib/gerror.c",
64-
"glib/gfileutils.c",
65-
"glib/ggettext.c",
66-
"glib/ghash.c",
67-
"glib/ghmac.c",
68-
"glib/ghook.c",
69-
"glib/ghostutils.c",
70-
"glib/giochannel.c",
71-
"glib/giounix.c",
72-
"glib/gkeyfile.c",
73-
"glib/glib-autocleanups.h",
74-
"glib/glib-init.c",
75-
"glib/glib-init.h",
76-
"glib/glib-private.c",
77-
"glib/glib-unix.c",
78-
"glib/glist.c",
79-
"glib/gmain.c",
80-
"glib/gmain-internal.h",
81-
"glib/gmappedfile.c",
82-
"glib/gmarkup.c",
83-
"glib/gmem.c",
84-
"glib/gmessages.c",
85-
"glib/gnode.c",
86-
"glib/goption.c",
87-
"glib/gpattern.c",
88-
"glib/gpoll.c",
89-
"glib/gprimes.c",
90-
"glib/gprintf.c",
91-
"glib/gqsort.c",
92-
"glib/gquark.c",
93-
"glib/gqueue.c",
94-
"glib/grand.c",
95-
"glib/gregex.c",
96-
"glib/gscanner.c",
97-
"glib/gsequence.c",
98-
"glib/gshell.c",
99-
"glib/gslice.c",
100-
"glib/gslist.c",
101-
"glib/gspawn.c",
102-
"glib/gstdio.c",
103-
"glib/gstdioprivate.h",
104-
"glib/gstrfuncs.c",
105-
"glib/gstring.c",
106-
"glib/gstringchunk.c",
107-
"glib/gtestutils.c",
108-
"glib/gthread.c",
109-
"glib/gthread-posix.c",
110-
"glib/gthreadpool.c",
111-
"glib/gthreadprivate.h",
112-
"glib/gtimer.c",
113-
"glib/gtimezone.c",
114-
"glib/gtranslit.c",
115-
"glib/gtranslit-data.h",
116-
"glib/gtrashstack.c",
117-
"glib/gtree.c",
118-
"glib/gunibreak.c",
119-
"glib/gunibreak.h",
120-
"glib/gunicodeprivate.h",
121-
"glib/gunicollate.c",
122-
"glib/gunidecomp.c",
123-
"glib/gunidecomp.h",
124-
"glib/guniprop.c",
125-
"glib/gurifuncs.c",
126-
"glib/gutf8.c",
127-
"glib/gutils.c",
128-
"glib/guuid.h",
129-
"glib/gvariant.c",
130-
"glib/gvariant-core.c",
131-
"glib/gvariant-core.h",
132-
"glib/gvariant-internal.h",
133-
"glib/gvariant-parser.c",
134-
"glib/gvariant-serialiser.c",
135-
"glib/gvariant-serialiser.h",
136-
"glib/gvarianttype.c",
137-
"glib/gvarianttypeinfo.c",
138-
"glib/gvarianttypeinfo.h",
139-
"glib/gversion.c",
140-
"glib/gwakeup.c",
141-
"glib/gwakeup.h",
142-
"glib/libcharset/libcharset.h",
143-
"glib/pcre/pcre.h",
144-
],
145-
hdrs = [
146-
"config.h",
147-
"glib/deprecated/gallocator.h",
148-
"glib/deprecated/gcache.h",
149-
"glib/deprecated/gcompletion.h",
150-
"glib/deprecated/gmain.h",
151-
"glib/deprecated/grel.h",
152-
"glib/galloca.h",
153-
"glib/garray.h",
154-
"glib/gasyncqueue.h",
155-
"glib/gatomic.h",
156-
"glib/gbacktrace.h",
157-
"glib/gbase64.h",
158-
"glib/gbitlock.h",
159-
"glib/gbookmarkfile.h",
160-
"glib/gbytes.h",
161-
"glib/gcharset.h",
162-
"glib/gchecksum.h",
163-
"glib/gconstructor.h",
164-
"glib/gconvert.h",
165-
"glib/gdataset.h",
166-
"glib/gdate.h",
167-
"glib/gdatetime.h",
168-
"glib/gdir.h",
169-
"glib/genviron.h",
170-
"glib/gerror.h",
171-
"glib/gfileutils.h",
172-
"glib/ggettext.h",
173-
"glib/ghash.h",
174-
"glib/ghmac.h",
175-
"glib/ghook.h",
176-
"glib/ghostutils.h",
177-
"glib/giochannel.h",
178-
"glib/gkeyfile.h",
179-
"glib/glib.h",
180-
"glib/glib-private.h",
181-
"glib/glib-unix.h",
182-
"glib/glib_trace.h",
183-
"glib/glibintl.h",
184-
"glib/glist.h",
185-
"glib/gmacros.h",
186-
"glib/gmain.h",
187-
"glib/gmappedfile.h",
188-
"glib/gmarkup.h",
189-
"glib/gmem.h",
190-
"glib/gmessages.h",
191-
"glib/gmirroringtable.h",
192-
"glib/gnode.h",
193-
"glib/goption.h",
194-
"glib/gpattern.h",
195-
"glib/gpoll.h",
196-
"glib/gprimes.h",
197-
"glib/gprintf.h",
198-
"glib/gprintfint.h",
199-
"glib/gqsort.h",
200-
"glib/gquark.h",
201-
"glib/gqueue.h",
202-
"glib/grand.h",
203-
"glib/gregex.h",
204-
"glib/gscanner.h",
205-
"glib/gscripttable.h",
206-
"glib/gsequence.h",
207-
"glib/gshell.h",
208-
"glib/gslice.h",
209-
"glib/gslist.h",
210-
"glib/gspawn.h",
211-
"glib/gstdio.h",
212-
"glib/gstrfuncs.h",
213-
"glib/gstring.h",
214-
"glib/gstringchunk.h",
215-
"glib/gtestutils.h",
216-
"glib/gthread.h",
217-
"glib/gthreadpool.h",
218-
"glib/gtimer.h",
219-
"glib/gtimezone.h",
220-
"glib/gtrashstack.h",
221-
"glib/gtree.h",
222-
"glib/gtypes.h",
223-
"glib/gunichartables.h",
224-
"glib/gunicode.h",
225-
"glib/gunicomp.h",
226-
"glib/gurifuncs.h",
227-
"glib/gutils.h",
228-
"glib/gvariant.h",
229-
"glib/gvarianttype.h",
230-
"glib/gversion.h",
231-
"glib/gversionmacros.h",
232-
"glib/valgrind.h",
233-
"glibconfig.h",
234-
],
235-
copts = [
236-
"-Iexternal/glib_archive/glib",
237-
"-DGLIB_COMPILATION",
238-
"-DG_DISABLE_CAST_CHECKS",
239-
"-DG_LOG_DOMAIN='\"GLib\"'",
240-
"-DHAVE_CONFIG_H",
241-
"-DPCRE_STATIC",
242-
],
243-
includes = ["."],
3+
srcs = ["lib/libglib-2.0.0.dylib"],
4+
hdrs = glob(["include/glib-2.0/**/*.h", "lib/glib-2.0/**/*.h"]),
5+
includes = ["include/glib-2.0", "lib/glib-2.0/include"],
2446
visibility = ["//visibility:public"],
245-
deps = [":charset"],
7+
linkopts = ["-liconv"],
2468
)

0 commit comments

Comments
 (0)