Browse Source

Fix boost build, don't copy files as symlink but actual files when

packaging.

Simplify crtmpserver Makefile
master
Ray Burgemeestre 4 years ago
parent
commit
60d2b45236
2 changed files with 3 additions and 4 deletions
  1. +2
    -2
      boost/Makefile
  2. +1
    -2
      crtmpserver/Makefile

+ 2
- 2
boost/Makefile View File

@@ -29,8 +29,8 @@ impl:
package:
rm -rf out
mkdir -p out/opt/cppse/build/boost/include/
cp -prv boost/stage/lib out/opt/cppse/build/boost/
cp -prv boost/boost out/opt/cppse/build/boost/include/
cp -L -prv boost/stage/lib out/opt/cppse/build/boost/
cp -L -prv boost/boost out/opt/cppse/build/boost/include/
rm -rf boost_*_amd64.deb
docker run -v "$$(pwd):/src/" rayburgemeestre/fpm-ubuntu:18.04 fpm -v 1.1 -s dir -t deb -n boost --license MPL2 --maintainer "Ray Burgemeestre <ray@cppse.nl>" --description "boost - build dependency" --url "https://github.com/liballeg/boost.git" --deb-generate-changes -C /src/out


+ 1
- 2
crtmpserver/Makefile View File

@@ -1,8 +1,7 @@
SHELL:=/bin/bash

crtmpserver:
git clone https://github.com/rayburgemeestre/crtmpserver
pushd crtmpserver && git checkout lib
git clone --branch lib https://github.com/rayburgemeestre/crtmpserver
bash ../ubuntu1804.sh make impl
make package


Loading…
Cancel
Save