srctree

Robin Linden parent 249d5f0c 2c64ac6f
Update jvm-toxcore-c to fix build w/ libstdc++-13

.github/workflows/ci.yaml added: 4, removed: 9, total 0

@@ -78,11 +78,6 @@ jobs:

- name: Install tox4j dependencies

if: steps.cache.outputs.cache-hit != 'true'

run: sudo apt-get update && sudo apt install yasm

- name: Work around jvm-toxcore-c not building w/ libstdc++-13

run: |

sudo rm -f /etc/apt/sources.list.d/ubuntu-toolchain-r-ubuntu-test-jammy.list

sudo apt-get update

sudo apt-get install --allow-downgrades libstdc++6=12.3.0-1ubuntu1~22.04 libgcc-s1=12.3.0-1ubuntu1~22.04

- name: Build tox4j

if: steps.cache.outputs.cache-hit != 'true'

run: |

scripts/dependencies.mk added: 4, removed: 9, total 0

@@ -48,10 +48,10 @@ $(DESTDIR)/jvm-toxcore-api.stamp: $(SRCDIR)/jvm-toxcore-api $(DESTDIR)/jvm-sbt-p

#############################################################################

# tox4j

# HEAD as of 2022-01-13

# HEAD as of 2023-12-29

$(SRCDIR)/tox4j:

git clone https://github.com/toktok/jvm-toxcore-c $@

cd $@ && git checkout 959e226809e4446c97679f090ef5df905bf627a4

cd $@ && git checkout f697eef5d0a16a025b187c3369288986e89bde2b

$(BUILDDIR)/tox4j/Makefile: $(SRCDIR)/tox4j $(TOOLCHAIN_FILE) $(foreach i,protobuf toxcore,$(PREFIX)/$i.stamp)

@$(PRE_RULE)