Permalink
Browse files

Patch

  • Loading branch information...
kvart2006 committed Feb 20, 2017
1 parent a632ee3 commit a0e62a08fd771dd1c056648cde4e12cec0af4883
Showing with 20 additions and 10 deletions.
  1. +11 −5 servus/Makefile
  2. +9 −5 zerobuf/Makefile
@@ -6,24 +6,30 @@ UPSTREAM=https://github.com/HBPVIS/Servus.git
all: bin/servus

bin/servus: Servus/build/servus
#
#Copying files to pkgs directory
#
(cd Servus/build && \
mkdir -p ../../../pkgs/lib && \
cp lib/*.a ../../../pkgs/lib/. && \
mkdir -p ../../../pkgs/include && \
cp -a include/servus ../../../pkgs/include/servus && \
cd .. && cp servus/*.h ../../pkgs/include/servus/.)
cd .. && cp -R servus/ ../../pkgs/include/.)

Servus/build/servus: Servus/build/Makefile
$(MAKE) -C Servus/build

Servus/build/Makefile: build/CMakeLists.txt
(mkdir -p Servus/build && \
cd Servus/build && \
cmake -DCMAKE_TOOLCHAIN_FILE=$(RUMPRUN_CMAKE_TOOLCHAIN_FILE) \
-DENABLE_XSLT=off \
-Wno-dev \
..)
cmake -DCMAKE_TOOLCHAIN_FILE=$(RUMPRUN_CMAKE_TOOLCHAIN_FILE) -Wno-dev .. && \
pwd && cd .. && pwd && \
sed -i "/set(COMMON_CXX11_FEATURES/c\#set(COMMON_CXX11_FEATURES" \
CMake/common/CommonCompiler.cmake && \
sed -i "/ cxx_alias_templates cxx_nullptr cxx_override cxx_final)/c\# cxx_alias_templates cxx_nullptr cxx_override cxx_final)" \
CMake/common/CommonCompiler.cmake && \
sed -i "/set(COMMON_LIBRARY_TYPE SHARED CACHE STRING/c\set(COMMON_LIBRARY_TYPE STATIC CACHE STRING" \
CMake/common/CommonLibrary.cmake)

build/CMakeLists.txt:
(git clone $(UPSTREAM))
@@ -12,18 +12,22 @@ bin/zerobuf: ZeroBuf/build/zerobuf
cp lib/*.a ../../../pkgs/lib/. && \
mkdir -p ../../../pkgs/include && \
cp -a include/zerobuf ../../../pkgs/include/zerobuf && \
cd .. && cp zerobuf/*.h ../../pkgs/include/zerobuf/.)
cd .. && cp -R zerobuf ../../pkgs/include/.)

ZeroBuf/build/zerobuf: ZeroBuf/build/Makefile
$(MAKE) -C ZeroBuf/build

ZeroBuf/build/Makefile: build/CMakeLists.txt
(mkdir -p ZeroBuf/build && \
cd ZeroBuf/build && \
cmake -DCMAKE_TOOLCHAIN_FILE=$(RUMPRUN_CMAKE_TOOLCHAIN_FILE) \
-DENABLE_XSLT=off \
-Wno-dev \
..)
cmake -DCMAKE_TOOLCHAIN_FILE=$(RUMPRUN_CMAKE_TOOLCHAIN_FILE) -Wno-dev .. && \
pwd && cd .. && pwd && \
sed -i "/set(COMMON_CXX11_FEATURES/c\#set(COMMON_CXX11_FEATURES" \
CMake/common/CommonCompiler.cmake && \
sed -i "/ cxx_alias_templates cxx_nullptr cxx_override cxx_final)/c\# cxx_alias_templates cxx_nullptr cxx_override cxx_final)" \
CMake/common/CommonCompiler.cmake && \
sed -i "/set(COMMON_LIBRARY_TYPE SHARED CACHE STRING/c\set(COMMON_LIBRARY_TYPE STATIC CACHE STRING" \
CMake/common/CommonLibrary.cmake)

build/CMakeLists.txt:
(git clone $(UPSTREAM))

0 comments on commit a0e62a0

Please sign in to comment.