Browse Source

Fix path in fmt Makefile build

master
Ray Burgemeestre 2 years ago
parent
commit
cfc1b9bc7a
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      fmt/Makefile

+ 2
- 2
fmt/Makefile View File

@@ -21,7 +21,7 @@ impl-emscripten:
apt-get update && apt-get install libz-dev -y && \
pushd fmt && \
mkdir build2 && pushd build2 && \
CXX=/emsdk/upstream/emscripten/em++ cmake -DFMT_TEST=off -DCMAKE_C_FLAGS=-fPIC -DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_INSTALL_PREFIX=$$PWD/fmt_out2 .. && \
CXX=/emsdk/upstream/emscripten/em++ cmake -DFMT_TEST=off -DCMAKE_C_FLAGS=-fPIC -DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_INSTALL_PREFIX=$$PWD/fmt_out .. && \
make -j $$(nproc) && \
make install

@@ -29,7 +29,7 @@ package-ubuntu2004:
rm -rf out
mkdir -p out/opt/cppse/build/fmt
cp -prv fmt/build/fmt_out/* out/opt/cppse/build/fmt/
cp -prv fmt/build/fmt_out2/lib/libfmt.a out/opt/cppse/build/fmt/lib/libfmt-em.a
cp -prv fmt/build2/fmt_out/lib/libfmt.a out/opt/cppse/build/fmt/lib/libfmt-em.a
rm -rf fmt_*_amd64.deb
docker run -v "$$(pwd):/src/" rayburgemeestre/fpm-ubuntu:20.04 fpm -v 1.1 -s dir -t deb -n fmt --license MPL2 --maintainer "Ray Burgemeestre <ray@cppse.nl>" --description "fmt - build dependency" --url "https://github.com/mattgodbolt/fmt" --deb-generate-changes -C /src/out


Loading…
Cancel
Save