Skip to content

Commit

Permalink
Fix failing build scripts
Browse files Browse the repository at this point in the history
[docker_verify]
  • Loading branch information
sumeetchhetri committed Jun 9, 2024
1 parent ec83c4d commit 9a854ef
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 5 deletions.
3 changes: 3 additions & 0 deletions docker/all/scripts/install_ffead-cpp-backends.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ then
SRV_TYPE=SRV_DROGON
git clone --recurse-submodules https://github.com/sumeetchhetri/drogon
cd drogon
sed -i "s/#include <stdio.h>/#include <stdio.h>\n#include <cstdint>/g" trantor/trantor/utils/MsgBuffer.h
mkdir build
cd build
cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_CTL=off -DBUILD_EXAMPLES=off -DBUILD_ORM=off ..
Expand Down Expand Up @@ -73,6 +74,8 @@ then
cd $IROOT
git clone https://github.com/sumeetchhetri/uv-cpp
cd uv-cpp
sed -i "s/#include <string>/#include <string>\n#include <cstdint>/g" uv/include/GlobalConfig.hpp
sed -i "s/#include <string>/#include <string>\n#include <cstdint>/g" uv/include/http/HttpCommon.hpp
cmake .
make -j4 install
cd $IROOT
Expand Down
4 changes: 4 additions & 0 deletions docker/all/scripts/install_ffead-cpp-framework.sh
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,10 @@ sed -i 's|web/peer-server/src/autotools/Makefile||g' configure.ac

#./autogen.sh
#./configure --enable-debug=no --enable-apachemod=yes --enable-nginxmod=yes --enable-mod_sdormmongo=yes --enable-mod_sdormsql=yes --enable-mod_rediscache=yes --enable-mod_memcached=yes CPPFLAGS="$CPPFLAGS -I${IROOT}/include/libmongoc-1.0 -I${IROOT}/include/libbson-1.0 -I${IROOT}/include/" LDFLAGS="$LDFLAGS -L${IROOT} -L${IROOT}/lib"
sed -i "s/if(NOT DEBUG)/if(DEBUG)/g" CMakeLists.txt
sed -i 's|install(FILES ${PROJECT_BINARY_DIR}/ffead-cpp-nghttp2|#install(FILES ${PROJECT_BINARY_DIR}/ffead-cpp-nghttp2|g' CMakeLists.txt
mv /usr/local/lib/libnghttp2.so* /tmp/
find / -name "libnghttp2.so*"
cmake -DSRV_ALL=on -DCINATRA_INCLUDES=${IROOT}/cinatra/include -DMOD_APACHE=on -DMOD_NGINX=on -DMOD_MEMCACHED=on -DMOD_REDIS=on -DMOD_SDORM_MONGO=on -DDEBUG=${DEBUG} -DWITH_RAPIDJSON=on -DWITH_PUGIXML=on -GNinja .

cp resources/sample-odbcinst.ini ${IROOT}/odbcinst.ini
Expand Down
2 changes: 1 addition & 1 deletion docker/test/build_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ cp -rf ../../rtdcf .
cp -rf ../../script .
cp -rf ../../resources .
cp -rf ../../lang-server-backends/v/pico.v .
DOCKER_BUILDKIT=0 docker build -f DockerFile-UbuntuBionic-x64-ffead-cpp-fortest -t ffeadcpptest:1.0 --progress plain .
docker build -f DockerFile-UbuntuBionic-x64-ffead-cpp-fortest -t ffeadcpptest:1.0 --progress plain .
rm -rf src web rtdcf script resources CMakeLists.txt
8 changes: 4 additions & 4 deletions rtdcf/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ if not cc.has_header('libpq-fe.h')
if not cc.has_header('libpq-fe.h', args : '-I/usr/local/include/postgresql')
if cc.has_header('libpq-fe.h', args : '-I/usr/local/include/pgsql')
pqincpath = '/usr/local/include/pgsql'
else if cc.has_header('libpq-fe.h', args : '-I/opt/homebrew/include/postgresql')
elif cc.has_header('libpq-fe.h', args : '-I/opt/homebrew/include/postgresql')
pqincpath = '/opt/homebrew/include/postgresql'
else if cc.has_header('libpq-fe.h', args : '-I/opt/homebrew/include/pgsql')
elif cc.has_header('libpq-fe.h', args : '-I/opt/homebrew/include/pgsql')
pqincpath = '/opt/homebrew/include/pgsql'
endif
else
Expand All @@ -46,7 +46,7 @@ endif
if not cc.has_header('bson.h', args : '-I/usr/include/libbson-1.0')
if cc.has_header('bson.h', args : '-I/usr/local/include/libbson-1.0')
wd_includes += ['/usr/local/include/libbson-1.0']
else if cc.has_header('bson.h', args : '-I/opt/homebrew/include/libbson-1.0')
elif cc.has_header('bson.h', args : '-I/opt/homebrew/include/libbson-1.0')
wd_includes += ['/opt/homebrew/include/libbson-1.0']
endif
else
Expand All @@ -55,7 +55,7 @@ endif
if not cc.has_header('mongoc.h', args : '-I/usr/include/libmongoc-1.0')
if cc.has_header('mongoc.h', args : '-I/usr/local/include/libmongoc-1.0')
wd_includes += ['/usr/local/include/libmongoc-1.0']
else if cc.has_header('mongoc.h', args : '-I/opt/homebrew/include/libmongoc-1.0')
elif cc.has_header('mongoc.h', args : '-I/opt/homebrew/include/libmongoc-1.0')
wd_includes += ['/opt/homebrew/include/libmongoc-1.0']
endif
else
Expand Down

0 comments on commit 9a854ef

Please sign in to comment.