Skip to content

Commit 49fd94f

Browse files
Satish Kumarmeta-codesync[bot]
authored andcommitted
Isolate Python dependency tree from native build system
Summary: **Context:** Thrift Python builds require different library versions and configurations than native C++ builds. `fbthrift-python` does not require `proxygen`, yet `proxygen` is included as a dependency, which makes the build unnecessarily brittle. Current manifests mix Python and C++ dependencies. **This diff:** - New `libaio-python` manifest for Linux-only Python builds - `-python` manifests (`fbthrift-python`, `folly-python`, `fizz-python`, `zlib-python`, `libiberty-python`) now depend on `-python` variants instead of base manifests - Fix `zlib-python` download URL (github instead of `zlib.net`) - Exclude `http2_helper` test extension from `fbthrift-python` build (removes `proxygen` dependency) - **Bonus** - Add build status badges for the python builds. Reviewed By: yfeldblum Differential Revision: D94714599 fbshipit-source-id: 5d23e7591b67db3baaa57d54942429162c71fbdf
1 parent 5724323 commit 49fd94f

File tree

11 files changed

+42
-16
lines changed

11 files changed

+42
-16
lines changed

build/fbcode_builder/manifests/fbthrift-python

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,8 @@ xxhash
4545
# dependency to avoid duplication.
4646

4747
[dependencies.os=linux]
48-
libaio
48+
libaio-python
4949
libevent-python
50-
proxygen-python
5150

5251
[shipit.pathmap]
5352
xplat/thrift/public_tld = .

build/fbcode_builder/manifests/folly-python

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ openssl
4848
zlib
4949

5050
[dependencies.os=linux]
51-
libaio
51+
libaio-python
5252
libiberty-python
5353
libunwind
5454

build/fbcode_builder/manifests/gflags

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,11 @@ builder = cmake
1010
subdir = gflags-2.2.2
1111

1212
[cmake.defines]
13+
BUILD_SHARED_LIBS = ON
1314
BUILD_STATIC_LIBS = ON
1415
#BUILD_gflags_nothreads_LIB = OFF
1516
BUILD_gflags_LIB = ON
1617

17-
[cmake.defines.os=windows]
18-
BUILD_SHARED_LIBS = ON
19-
20-
[cmake.defines.shared_libs=on]
21-
BUILD_SHARED_LIBS = ON
22-
2318
[homebrew]
2419
gflags
2520

build/fbcode_builder/manifests/glog

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,10 @@ subdir = glog-0.5.0
1313
gflags
1414

1515
[cmake.defines]
16+
BUILD_SHARED_LIBS=ON
1617
BUILD_TESTING=NO
1718
WITH_PKGCONFIG=ON
1819

19-
[cmake.defines.os=windows]
20-
BUILD_SHARED_LIBS=ON
21-
22-
[cmake.defines.shared_libs=on]
23-
BUILD_SHARED_LIBS=ON
24-
2520
[cmake.defines.os=freebsd]
2621
HAVE_TR1_UNORDERED_MAP=OFF
2722
HAVE_TR1_UNORDERED_SET=OFF
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
[manifest]
2+
name = libaio-python
3+
4+
[debs]
5+
libaio-dev
6+
7+
[rpms.distro=centos_stream]
8+
libaio-devel
9+
10+
[download]
11+
url = https://pagure.io/libaio/archive/libaio-0.3.113/libaio-libaio-0.3.113.tar.gz
12+
sha256 = 716c7059703247344eb066b54ecbc3ca2134f0103307192e6c2b7dab5f9528ab
13+
14+
[build]
15+
builder = make
16+
subdir = libaio-libaio-0.3.113
17+
18+
[build.not(os=linux)]
19+
builder = nop
20+
21+
[make.build_args]
22+
CFLAGS=-fPIC -O2
23+
24+
[make.install_args]
25+
install

build/fbcode_builder/manifests/libiberty-python

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,5 @@ builder = nop
3030
# as we still want to use system linker and assembler etc
3131
[autoconf.args]
3232
--enable-install-libiberty
33+
CFLAGS=-fPIC -O2
34+
PICFLAG=-fPIC

build/fbcode_builder/manifests/libsodium

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,4 @@ libsodium/x64/Release/v143/dynamic/libsodium.pdb = lib/libsodium.pdb
3737
libsodium/include = include
3838

3939
[autoconf.args]
40+
--with-pic

build/fbcode_builder/manifests/libunwind

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,6 @@ sha256 = 4ff5c335c02d225491d6c885db827fb5fa505fee4e68b4d7e866efc0087e7264
1818
[build]
1919
builder = autoconf
2020
subdir = libunwind-f081cf42917bdd5c428b77850b473f31f81767cf
21+
22+
[autoconf.args]
23+
--with-pic

build/fbcode_builder/manifests/xxhash

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,6 @@ xxhash
1818
[build]
1919
builder = cmake
2020
subdir = xxHash-0.8.2/cmake_unofficial
21+
22+
[cmake.defines]
23+
CMAKE_POSITION_INDEPENDENT_CODE = ON

build/fbcode_builder/manifests/xz

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,6 @@ sha256 = f6f4910fd033078738bd82bfba4f49219d03b17eb0794eb91efbae419f4aba10
1818
[build]
1919
builder = autoconf
2020
subdir = xz-5.2.5
21+
22+
[autoconf.args]
23+
--with-pic

0 commit comments

Comments
 (0)