From 48e7351360666a59baf81f8bc54ad374b5abbf70 Mon Sep 17 00:00:00 2001
From: j842 <j842@842.be>
Date: Mon, 9 Jun 2025 17:28:34 +1200
Subject: [PATCH] IT WORKS

---
 build-base/Dockerfile.dropshell-build-base | 69 +++++++---------------
 1 file changed, 21 insertions(+), 48 deletions(-)

diff --git a/build-base/Dockerfile.dropshell-build-base b/build-base/Dockerfile.dropshell-build-base
index 034466f..a739e81 100644
--- a/build-base/Dockerfile.dropshell-build-base
+++ b/build-base/Dockerfile.dropshell-build-base
@@ -95,9 +95,13 @@ RUN curl -LO https://ftp.postgresql.org/pub/source/v${POSTGRES_VERSION}/postgres
     tar xzf postgresql-${POSTGRES_VERSION}.tar.gz && \
     cd postgresql-${POSTGRES_VERSION} && \
     ./configure --prefix=/usr/local/pgsql --without-readline --without-zlib --without-icu --enable-static --disable-shared && \
-    make -j$(nproc) && \
+    make -j$(nproc) -C src/port && \
+    make -j$(nproc) -C src/common && \
+    make -j$(nproc) -C src/interfaces/libpq && \
+    make -C src/port install && \
+    make -C src/common install && \
     make -C src/interfaces/libpq install && \
-    make install && \
+    make -C src/include install && \
     cd / && rm -rf /tmp/postgresql-${POSTGRES_VERSION} /tmp/postgresql-${POSTGRES_VERSION}.tar.gz
 
 RUN ls /usr/local/pgsql/include/pg_config.h
@@ -142,44 +146,11 @@ RUN wget https://www.sqlite.org/2024/sqlite-autoconf-3450000.tar.gz && \
     ./configure --enable-static --disable-shared --prefix=/usr/local/sqlite3 && \
     make && \
     make install && \
-    cd .. && rm -rf sqlite-autoconf-3450000* 
+    cd .. && rm -rf sqlite-autoconf-3450000* && \
+    # Remove any system SQLite3 to avoid conflicts
+    rm -f /usr/lib/libsqlite3.so* /usr/lib/libsqlite3.a 
 
-# Build MySQL statically
-ARG MYSQL_VERSION=8.0.36
-WORKDIR /tmp
-RUN echo "Downloading MySQL ${MYSQL_VERSION}..." && \
-    wget -O mysql-${MYSQL_VERSION}.tar.gz https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-${MYSQL_VERSION}.tar.gz && \
-    echo "Extracting MySQL..." && \
-    tar -xzf mysql-${MYSQL_VERSION}.tar.gz && \
-    cd mysql-${MYSQL_VERSION} && \
-    echo "Downloading Boost from archives.boost.io..." && \
-    mkdir -p boost && \
-    wget --tries=3 --timeout=30 -O boost_1_77_0.tar.bz2 \
-      "https://archives.boost.io/release/1.77.0/source/boost_1_77_0.tar.bz2" && \
-    echo "Verifying Boost download..." && \
-    file boost_1_77_0.tar.bz2 | grep -q "bzip2 compressed data" || \
-      (echo "ERROR: Downloaded file is not a valid bzip2 archive" && exit 1) && \
-    echo "Extracting Boost..." && \
-    tar -xjf boost_1_77_0.tar.bz2 -C boost --strip-components=1 && \
-    rm boost_1_77_0.tar.bz2 && \
-    mkdir build && cd build && \
-    cmake .. \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DWITH_SYSTEM_LIBS=OFF \
-      -DWITH_UNIT_TESTS=OFF \
-      -DWITH_EMBEDDED_SERVER=OFF \
-      -DWITH_INNODB_MEMCACHED=OFF \
-      -DWITH_SSL=system \
-      -DWITH_ZLIB=system \
-      -DWITH_LIBEVENT=system \
-      -DWITH_SSL=/usr/local/openssl-musl \
-      -DCMAKE_INSTALL_PREFIX=/usr/local/mysql \
-      -DBUILD_SHARED_LIBS=OFF \
-      -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
-      -DWITH_BOOST=/tmp/mysql-${MYSQL_VERSION}/boost && \
-    make -j$(nproc) && \
-    make install && \
-    cd / && rm -rf /tmp/mysql-${MYSQL_VERSION} /tmp/mysql-${MYSQL_VERSION}.tar.gz
+# Skip MySQL build - use MariaDB Connector/C for MySQL support instead
 
 #ARG DROGON_VERSION=1.9.5
 WORKDIR /tmp
@@ -191,13 +162,15 @@ RUN git clone --recurse-submodules https://github.com/drogonframework/drogon.git
       -DCMAKE_BUILD_TYPE=Release \
       -DBUILD_SHARED_LIBS=OFF \
       -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
-      -DCMAKE_CXX_FLAGS="-static -static-libgcc -static-libstdc++" \
-      -DCMAKE_EXE_LINKER_FLAGS="-static" \
+      -DCMAKE_CXX_FLAGS="-fPIC" \
+      -DCMAKE_EXE_LINKER_FLAGS="-static -static-libgcc -static-libstdc++ -Wl,-Bstatic" \
+      -DCMAKE_SHARED_LINKER_FLAGS="-static" \
       -DCMAKE_INSTALL_PREFIX=/usr/local \
       -DCMAKE_FIND_LIBRARY_SUFFIXES=".a" \
+      -DZLIB_USE_STATIC_LIBS=ON \
       -DUSE_MONGODB=OFF \
       -DUSE_POSTGRESQL=ON \
-      -DUSE_MYSQL=ON \
+      -DUSE_MYSQL=OFF \
       -DUSE_SQLITE3=ON \
       -DBUILD_EXAMPLES=OFF \
       -DBUILD_TESTING=OFF \
@@ -209,12 +182,12 @@ RUN git clone --recurse-submodules https://github.com/drogonframework/drogon.git
       -DJSONCPP_INCLUDE_DIRS=/usr/local/jsoncpp/include \
       -DJSONCPP_LIBRARIES=/usr/local/jsoncpp/lib/libjsoncpp.a \
       -DPostgreSQL_INCLUDE_DIR=/usr/local/pgsql/include \
-      -DPostgreSQL_LIBRARY=/usr/local/pgsql/lib/libpq.a \
-      -DMYSQL_INCLUDE_DIR=/usr/local/mysql/include \
-      -DMYSQL_LIBRARIES=/usr/local/mysql/lib/libmysqlclient.a \
-      -DSQLITE3_LIBRARY=/usr/local/sqlite3/lib/libsqlite3.a \
-      -DSQLITE3_INCLUDE_DIR=/usr/local/sqlite3/include \
-      -DSQLITE3_STATIC=ON \
+      -DPostgreSQL_LIBRARY="/usr/local/pgsql/lib/libpq.a;/usr/local/pgsql/lib/libpgcommon.a;/usr/local/pgsql/lib/libpgport.a" \
+      -DSQLite3_LIBRARY=/usr/local/sqlite3/lib/libsqlite3.a \
+      -DSQLite3_INCLUDE_DIR=/usr/local/sqlite3/include \
+      -DZLIB_LIBRARY=/usr/lib/libz.a \
+      -DZLIB_INCLUDE_DIR=/usr/include \
+      -DCMAKE_PREFIX_PATH="/usr/local/sqlite3;/usr/local/pgsql;/usr/local/jsoncpp;/usr/local/cares;/usr/local/openssl-musl" \
       &&\
     make -j$(nproc) && \
     make install && \