Skip to content

Commit e56ed85

Browse files
committed
limit sysroot_linux-64 to 2.12
1 parent 87bf293 commit e56ed85

File tree

6 files changed

+413
-9
lines changed

6 files changed

+413
-9
lines changed

.gitignore

+366-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,368 @@
1-
*~
2-
*.swp
3-
bazel-*
41
workspace/
2+
3+
# Created by https://www.toptal.com/developers/gitignore/api/vim,bazel,linux,macos,python,intellij+all,visualstudiocode
4+
# Edit at https://www.toptal.com/developers/gitignore?templates=vim,bazel,linux,macos,python,intellij+all,visualstudiocode
5+
6+
### Bazel ###
7+
# gitignore template for Bazel build system
8+
# website: https://bazel.build/
9+
10+
# Ignore all bazel-* symlinks. There is no full list since this can change
11+
# based on the name of the directory bazel is cloned into.
12+
/bazel-*
13+
14+
# Directories for the Bazel IntelliJ plugin containing the generated
15+
# IntelliJ project files and plugin configuration. Seperate directories are
16+
# for the IntelliJ, Android Studio and CLion versions of the plugin.
17+
/.ijwb/
18+
/.aswb/
19+
/.clwb/
20+
21+
### Intellij+all ###
22+
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
23+
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
24+
25+
# User-specific stuff
26+
.idea/**/workspace.xml
27+
.idea/**/tasks.xml
28+
.idea/**/usage.statistics.xml
29+
.idea/**/dictionaries
30+
.idea/**/shelf
31+
32+
# AWS User-specific
33+
.idea/**/aws.xml
34+
35+
# Generated files
36+
.idea/**/contentModel.xml
37+
38+
# Sensitive or high-churn files
39+
.idea/**/dataSources/
40+
.idea/**/dataSources.ids
41+
.idea/**/dataSources.local.xml
42+
.idea/**/sqlDataSources.xml
43+
.idea/**/dynamic.xml
44+
.idea/**/uiDesigner.xml
45+
.idea/**/dbnavigator.xml
46+
47+
# Gradle
48+
.idea/**/gradle.xml
49+
.idea/**/libraries
50+
51+
# Gradle and Maven with auto-import
52+
# When using Gradle or Maven with auto-import, you should exclude module files,
53+
# since they will be recreated, and may cause churn. Uncomment if using
54+
# auto-import.
55+
# .idea/artifacts
56+
# .idea/compiler.xml
57+
# .idea/jarRepositories.xml
58+
# .idea/modules.xml
59+
# .idea/*.iml
60+
# .idea/modules
61+
# *.iml
62+
# *.ipr
63+
64+
# CMake
65+
cmake-build-*/
66+
67+
# Mongo Explorer plugin
68+
.idea/**/mongoSettings.xml
69+
70+
# File-based project format
71+
*.iws
72+
73+
# IntelliJ
74+
out/
75+
76+
# mpeltonen/sbt-idea plugin
77+
.idea_modules/
78+
79+
# JIRA plugin
80+
atlassian-ide-plugin.xml
81+
82+
# Cursive Clojure plugin
83+
.idea/replstate.xml
84+
85+
# SonarLint plugin
86+
.idea/sonarlint/
87+
88+
# Crashlytics plugin (for Android Studio and IntelliJ)
89+
com_crashlytics_export_strings.xml
90+
crashlytics.properties
91+
crashlytics-build.properties
92+
fabric.properties
93+
94+
# Editor-based Rest Client
95+
.idea/httpRequests
96+
97+
# Android studio 3.1+ serialized cache file
98+
.idea/caches/build_file_checksums.ser
99+
100+
### Intellij+all Patch ###
101+
# Ignore everything but code style settings and run configurations
102+
# that are supposed to be shared within teams.
103+
104+
.idea/*
105+
106+
!.idea/codeStyles
107+
!.idea/runConfigurations
108+
109+
### Linux ###
110+
*~
111+
112+
# temporary files which can be created if a process still has a handle open of a deleted file
113+
.fuse_hidden*
114+
115+
# KDE directory preferences
116+
.directory
117+
118+
# Linux trash folder which might appear on any partition or disk
119+
.Trash-*
120+
121+
# .nfs files are created when an open file is removed but is still being accessed
122+
.nfs*
123+
124+
### macOS ###
125+
# General
126+
.DS_Store
127+
.AppleDouble
128+
.LSOverride
129+
130+
# Icon must end with two \r
131+
Icon
132+
133+
134+
# Thumbnails
135+
._*
136+
137+
# Files that might appear in the root of a volume
138+
.DocumentRevisions-V100
139+
.fseventsd
140+
.Spotlight-V100
141+
.TemporaryItems
142+
.Trashes
143+
.VolumeIcon.icns
144+
.com.apple.timemachine.donotpresent
145+
146+
# Directories potentially created on remote AFP share
147+
.AppleDB
148+
.AppleDesktop
149+
Network Trash Folder
150+
Temporary Items
151+
.apdisk
152+
153+
### macOS Patch ###
154+
# iCloud generated files
155+
*.icloud
156+
157+
### Python ###
158+
# Byte-compiled / optimized / DLL files
5159
__pycache__/
6-
.vscode/
7-
.idea/
8-
*.swo
160+
*.py[cod]
161+
*$py.class
162+
163+
# C extensions
164+
*.so
165+
166+
# Distribution / packaging
167+
.Python
168+
build/
169+
develop-eggs/
170+
dist/
171+
downloads/
172+
eggs/
173+
.eggs/
174+
lib/
175+
lib64/
176+
parts/
177+
sdist/
178+
var/
179+
wheels/
180+
share/python-wheels/
181+
*.egg-info/
182+
.installed.cfg
183+
*.egg
184+
MANIFEST
185+
186+
# PyInstaller
187+
# Usually these files are written by a python script from a template
188+
# before PyInstaller builds the exe, so as to inject date/other infos into it.
189+
*.manifest
190+
*.spec
191+
192+
# Installer logs
193+
pip-log.txt
194+
pip-delete-this-directory.txt
195+
196+
# Unit test / coverage reports
197+
htmlcov/
198+
.tox/
199+
.nox/
200+
.coverage
201+
.coverage.*
202+
.cache
203+
nosetests.xml
204+
coverage.xml
205+
*.cover
206+
*.py,cover
207+
.hypothesis/
208+
.pytest_cache/
209+
cover/
210+
211+
# Translations
212+
*.mo
213+
*.pot
214+
215+
# Django stuff:
216+
*.log
217+
local_settings.py
218+
db.sqlite3
219+
db.sqlite3-journal
220+
221+
# Flask stuff:
222+
instance/
223+
.webassets-cache
224+
225+
# Scrapy stuff:
226+
.scrapy
227+
228+
# Sphinx documentation
229+
docs/_build/
230+
231+
# PyBuilder
232+
.pybuilder/
233+
target/
234+
235+
# Jupyter Notebook
236+
.ipynb_checkpoints
237+
238+
# IPython
239+
profile_default/
240+
ipython_config.py
241+
242+
# pyenv
243+
# For a library or package, you might want to ignore these files since the code is
244+
# intended to run in multiple environments; otherwise, check them in:
245+
# .python-version
246+
247+
# pipenv
248+
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
249+
# However, in case of collaboration, if having platform-specific dependencies or dependencies
250+
# having no cross-platform support, pipenv may install dependencies that don't work, or not
251+
# install all needed dependencies.
252+
#Pipfile.lock
253+
254+
# poetry
255+
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
256+
# This is especially recommended for binary packages to ensure reproducibility, and is more
257+
# commonly ignored for libraries.
258+
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
259+
#poetry.lock
260+
261+
# pdm
262+
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
263+
#pdm.lock
264+
# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
265+
# in version control.
266+
# https://pdm.fming.dev/#use-with-ide
267+
.pdm.toml
268+
269+
# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
270+
__pypackages__/
271+
272+
# Celery stuff
273+
celerybeat-schedule
274+
celerybeat.pid
275+
276+
# SageMath parsed files
277+
*.sage.py
278+
279+
# Environments
280+
.env
281+
.venv
282+
env/
283+
venv/
284+
ENV/
285+
env.bak/
286+
venv.bak/
287+
288+
# Spyder project settings
289+
.spyderproject
290+
.spyproject
291+
292+
# Rope project settings
293+
.ropeproject
294+
295+
# mkdocs documentation
296+
/site
297+
298+
# mypy
299+
.mypy_cache/
300+
.dmypy.json
301+
dmypy.json
302+
303+
# Pyre type checker
304+
.pyre/
305+
306+
# pytype static type analyzer
307+
.pytype/
308+
309+
# Cython debug symbols
310+
cython_debug/
311+
312+
# PyCharm
313+
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
314+
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
315+
# and can be added to the global gitignore or merged into this file. For a more nuclear
316+
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
317+
#.idea/
318+
319+
### Python Patch ###
320+
# Poetry local configuration file - https://python-poetry.org/docs/configuration/#local-configuration
321+
poetry.toml
322+
323+
# ruff
324+
.ruff_cache/
325+
326+
# LSP config files
327+
pyrightconfig.json
328+
329+
### Vim ###
330+
# Swap
331+
[._]*.s[a-v][a-z]
332+
!*.svg # comment out if you don't need vector files
333+
[._]*.sw[a-p]
334+
[._]s[a-rt-v][a-z]
335+
[._]ss[a-gi-z]
336+
[._]sw[a-p]
337+
338+
# Session
339+
Session.vim
340+
Sessionx.vim
341+
342+
# Temporary
343+
.netrwhist
344+
# Auto-generated tag files
345+
tags
346+
# Persistent undo
347+
[._]*.un~
348+
349+
### VisualStudioCode ###
350+
.vscode/*
351+
!.vscode/settings.json
352+
!.vscode/tasks.json
353+
!.vscode/launch.json
354+
!.vscode/extensions.json
355+
!.vscode/*.code-snippets
356+
357+
# Local History for Visual Studio Code
358+
.history/
359+
360+
# Built Visual Studio Code Extensions
361+
*.vsix
362+
363+
### VisualStudioCode Patch ###
364+
# Ignore all local history of files
365+
.history
366+
.ionide
367+
368+
# End of https://www.toptal.com/developers/gitignore/api/vim,bazel,linux,macos,python,intellij+all,visualstudiocode

WORKSPACE

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ http_archive(
2828
"https://github.com/apache/brpc/archive/0.9.7.tar.gz"
2929
],
3030
strip_prefix = "brpc-0.9.7",
31+
patches = ["//thirdparty/patches:01-fix_dl_sym.patch"],
32+
patch_args = ["-p", "1"],
3133
)
3234

3335
# depend by brpc

config/tn_build.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ dependencies:
88
- openmpi==4.1.3
99
- openssl==1.1.1t
1010
- libxcrypt==4.4.28
11-
- gcc==10.3.0
12-
- gxx==10.3.0
13-
- libstdcxx-devel_linux-64==10.3.0
11+
- sysroot_linux-64 <2.13 # for running on CentOS 6
12+
- gcc >=10.3.0,<11.2 # https://github.com/apache/brpc/issues/1693 fix from brpc 1.3.0
13+
- gxx >=10.3.0,<11.2
14+
- libstdcxx-devel_linux-64 >=10.3.0,<11.2,!=11.1 # 11.1 do not install libstdc++.so correctly
1415
- openjdk==8.0.382
1516
- patch
1617
- pip

0 commit comments

Comments
 (0)