From 9b52619936592a1a9a149d3923e078acef09e7a1 Mon Sep 17 00:00:00 2001 From: nick black Date: Fri, 8 Mar 2024 03:35:30 -0500 Subject: [PATCH] drone: use official debian layer --- .drone.yml | 7 ++++++- CMakeLists.txt | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 32a83f39a..355586260 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,10 +5,14 @@ name: debian-unstable steps: - name: debian-build - image: dankamongmen/unstable_builder:2022-01-29a + image: debian:unstable-slim commands: - export LANG=en_US.UTF-8 - export TERM=xterm + - apt-get update -y + - apt-get install -y ncurses-dev pkgconf libqrcodegen-dev libavdevice-dev cmake build-essential doctest-dev libunistring-dev libdeflate-dev libgpm-dev pandoc locales + - echo "en_US.UTF-8 UTF-8" > /etc/locale.gen + - locale-gen - mkdir build - cd build - cmake .. -DCMAKE_BUILD_TYPE=Release -DUSE_STATIC=off -DUSE_GPM=on -DUSE_QRCODEGEN=on -DDFSG_BUILD=on -DBUILD_FFI_LIBRARY=on @@ -17,6 +21,7 @@ steps: - ctest --output-on-failure - make install - ldconfig + - apt-get install -y python3-setuptools python3-wheel python3-pip python3-pypandoc python3-cffi-backend - cd ../cffi - LDFLAGS=-L/usr/local/lib CFLAGS=-I/usr/local/include python3 setup.py sdist build install - env LD_LIBRARY_PATH=/usr/local/lib ./notcurses-pydemo > /dev/null diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ce166b45..21ce51eb3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -123,7 +123,7 @@ if(NOT WIN32) # MSYS2 needs -lssp and -fstack-protector for _FORTIFY_SOURCE # macOS with ASAN can't handle _FORTIFY_SOURCE != 1 if(NOT ${USE_ASAN}) -add_compile_definitions(_FORTIFY_SOURCE=3) +add_compile_definitions(_FORTIFY_SOURCE=2) endif() add_compile_options(-Wformat -Werror=format-security) endif()