Skip to content

Commit c251e54

Browse files
jmswenfacebook-github-bot
authored andcommitted
Minor tweaks to xz and libiberty builds
Summary: X-link: facebookincubator/zstrong#1145 This diff contains a few changes to the xz and libiberty getdeps builds that are required in order for folly to build as a shared library, which in turn is needed for folly's Python extensions to build correctly. Reviewed By: hyuen Differential Revision: D68252093 fbshipit-source-id: 036bc4a0e7bf9a11f0a4aa6ec0014f7935afbb5b
1 parent 9243cbc commit c251e54

File tree

3 files changed

+17
-8
lines changed

3 files changed

+17
-8
lines changed

build/fbcode_builder/manifests/libiberty

+4-5
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,18 @@ binutils
99
binutils-dev
1010

1111
[download]
12-
url = https://ftp.gnu.org/gnu/binutils/binutils-2.42.tar.xz
13-
sha256 = f6e4d41fd5fc778b06b7891457b3620da5ecea1006c6a4a41ae998109f85a800
12+
url = https://ftp.gnu.org/gnu/binutils/binutils-2.43.tar.xz
13+
sha256 = b53606f443ac8f01d1d5fc9c39497f2af322d99e14cea5c0b4b124d630379365
1414

1515
[dependencies]
1616
zlib
1717

1818
[build]
1919
builder = autoconf
20-
subdir = binutils-2.42/libiberty
20+
subdir = binutils-2.43/libiberty
21+
patchfile = libiberty_install_pic_lib.patch
2122

2223
# only build the parts needed for demangling
2324
# as we still want to use system linker and assembler etc
2425
[autoconf.args]
25-
--disable-shared
26-
--disable-testsuite
2726
--enable-install-libiberty

build/fbcode_builder/manifests/xz

-3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,3 @@ sha256 = f6f4910fd033078738bd82bfba4f49219d03b17eb0794eb91efbae419f4aba10
1818
[build]
1919
builder = autoconf
2020
subdir = xz-5.2.5
21-
22-
[autoconf.args]
23-
--disable-shared
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/Makefile.in b/Makefile.in
2+
index b77a41c..cbe71fe 100644
3+
--- a/Makefile.in
4+
+++ b/Makefile.in
5+
@@ -389,7 +389,7 @@ MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory`
6+
install_to_libdir: all
7+
if test -n "${target_header_dir}"; then \
8+
${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \
9+
- $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n; \
10+
+ $(INSTALL_DATA) pic/$(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n; \
11+
( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n ); \
12+
mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB); \
13+
case "${target_header_dir}" in \

0 commit comments

Comments
 (0)