Skip to content

Commit fb0fc08

Browse files
committed
remove gsl for portable artifacts; add -f key to generate-random-id in order to read addr_list from file;
1 parent 61134fd commit fb0fc08

File tree

3 files changed

+18
-4
lines changed

3 files changed

+18
-4
lines changed

.github/workflows/build-ton-linux-x86-64-portable.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ jobs:
1818

1919
- name: Install system libraries
2020
run: |
21-
sudo apt-get update
22-
sudo apt-get install -y build-essential git cmake ninja-build libc++-dev libc++abi-dev
21+
sudo apt update
22+
sudo apt install -y build-essential git cmake ninja-build libc++-dev libc++abi-dev
23+
sudo apt remove libgsl-dev
2324
2425
- if: matrix.os != 'ubuntu-24.04'
2526
run: |

assembly/native/build-ubuntu-portable.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ git clone https://github.com/lz4/lz4.git
3333
cd lz4
3434
lz4Path=`pwd`
3535
git checkout v1.9.4
36-
make -j12
36+
CFLAGS="-fPIC" make -j12
3737
test $? -eq 0 || { echo "Can't compile lz4"; exit 1; }
3838
cd ..
3939
# ./lib/liblz4.a
@@ -102,7 +102,7 @@ fi
102102

103103
cmake -GNinja .. \
104104
-DCMAKE_CXX_FLAGS="-stdlib=libc++ -I/usr/lib/llvm-16/include/c++/v1" \
105-
-DCMAKE_EXE_LINKER_FLAGS="-stdlib=libc++ -I/usr/lib/llvm-16/include/c++/v1" \
105+
-DCMAKE_EXE_LINKER_FLAGS="-stdlib=libc++ -static-libgcc -static-libstdc++ /usr/lib/llvm-14/lib/libc++abi.a -I/usr/lib/llvm-16/include/c++/v1" \
106106
-DPORTABLE=1 \
107107
-DCMAKE_BUILD_TYPE=Release \
108108
-DOPENSSL_FOUND=1 \

utils/generate-random-id.cpp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,19 @@ int main(int argc, char *argv[]) {
8484
TRY_RESULT_PREFIX_ASSIGN(addr_list, ton::adnl::AdnlAddressList::create(addr_list_tl), "bad addr list: ");
8585
return td::Status::OK();
8686
});
87+
p.add_checked_option('f', "path to file with addr-list", "addr list to sign", [&](td::Slice key) {
88+
if (addr_list) {
89+
return td::Status::Error("duplicate '-f' option");
90+
}
91+
92+
td::BufferSlice bs(key);
93+
TRY_RESULT_PREFIX(data, td::read_file(key.str()), "failed to read addr-list: ");
94+
TRY_RESULT_PREFIX(as_json_value, data), "bad addr list JSON: ");
95+
ton::tl_object_ptr<ton::ton_api::adnl_addressList> addr_list_tl;
96+
TRY_STATUS_PREFIX(td::from_json(addr_list_tl, std::move(as_json_value)), "bad addr list TL: ");
97+
TRY_RESULT_PREFIX_ASSIGN(addr_list, ton::adnl::AdnlAddressList::create(addr_list_tl), "bad addr list: ");
98+
return td::Status::OK();
99+
});
87100
p.add_checked_option('i', "network-id", "dht network id (default: -1)", [&](td::Slice key) {
88101
if (network_id_opt) {
89102
return td::Status::Error("duplicate '-i' option");

0 commit comments

Comments
 (0)