mirror of
https://github.com/facebook/proxygen.git
synced 2025-08-10 05:22:59 +03:00
Minor tweaks to xz and libiberty builds
Summary: X-link: https://github.com/facebookincubator/zstrong/pull/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
This commit is contained in:
committed by
Facebook GitHub Bot
parent
243763e6e3
commit
f2e2414e2a
@@ -9,19 +9,18 @@ binutils
|
|||||||
binutils-dev
|
binutils-dev
|
||||||
|
|
||||||
[download]
|
[download]
|
||||||
url = https://ftp.gnu.org/gnu/binutils/binutils-2.42.tar.xz
|
url = https://ftp.gnu.org/gnu/binutils/binutils-2.43.tar.xz
|
||||||
sha256 = f6e4d41fd5fc778b06b7891457b3620da5ecea1006c6a4a41ae998109f85a800
|
sha256 = b53606f443ac8f01d1d5fc9c39497f2af322d99e14cea5c0b4b124d630379365
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
zlib
|
zlib
|
||||||
|
|
||||||
[build]
|
[build]
|
||||||
builder = autoconf
|
builder = autoconf
|
||||||
subdir = binutils-2.42/libiberty
|
subdir = binutils-2.43/libiberty
|
||||||
|
patchfile = libiberty_install_pic_lib.patch
|
||||||
|
|
||||||
# only build the parts needed for demangling
|
# only build the parts needed for demangling
|
||||||
# as we still want to use system linker and assembler etc
|
# as we still want to use system linker and assembler etc
|
||||||
[autoconf.args]
|
[autoconf.args]
|
||||||
--disable-shared
|
|
||||||
--disable-testsuite
|
|
||||||
--enable-install-libiberty
|
--enable-install-libiberty
|
||||||
|
@@ -18,6 +18,3 @@ sha256 = f6f4910fd033078738bd82bfba4f49219d03b17eb0794eb91efbae419f4aba10
|
|||||||
[build]
|
[build]
|
||||||
builder = autoconf
|
builder = autoconf
|
||||||
subdir = xz-5.2.5
|
subdir = xz-5.2.5
|
||||||
|
|
||||||
[autoconf.args]
|
|
||||||
--disable-shared
|
|
||||||
|
13
build/fbcode_builder/patches/libiberty_install_pic_lib.patch
Normal file
13
build/fbcode_builder/patches/libiberty_install_pic_lib.patch
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/Makefile.in b/Makefile.in
|
||||||
|
index b77a41c..cbe71fe 100644
|
||||||
|
--- a/Makefile.in
|
||||||
|
+++ b/Makefile.in
|
||||||
|
@@ -389,7 +389,7 @@ MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory`
|
||||||
|
install_to_libdir: all
|
||||||
|
if test -n "${target_header_dir}"; then \
|
||||||
|
${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \
|
||||||
|
- $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n; \
|
||||||
|
+ $(INSTALL_DATA) pic/$(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n; \
|
||||||
|
( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n ); \
|
||||||
|
mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB); \
|
||||||
|
case "${target_header_dir}" in \
|
Reference in New Issue
Block a user