From c80002bea41ec5c378be8cdff7cfb75985ef34c7 Mon Sep 17 00:00:00 2001
From: simon <me@simon987.net>
Date: Sat, 18 Jan 2020 11:43:03 -0500
Subject: [PATCH] Bundle libcurl attempt 2

---
 CMakeLists.txt             | 20 +++++++-------------
 scripts/get_static_libs.sh | 25 ++++++++++++++++++-------
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 296b7e6..074ad9c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,7 +47,6 @@ add_executable(
 find_package(PkgConfig REQUIRED)
 set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/lib/pkgconfig/")
 
-#find_package(OpenSSL REQUIRED)
 find_package(Freetype REQUIRED)
 
 pkg_check_modules(GLIB REQUIRED glib-2.0)
@@ -86,21 +85,12 @@ target_link_directories(
 target_compile_options(sist2
         PRIVATE
         -Ofast
-        # -march=native
+        -march=native
+        -fPIC
         -fno-stack-protector
         -fomit-frame-pointer
         )
 
-if (CURL_STATIC)
-    execute_process(COMMAND curl-config --static-libs
-            OUTPUT_VARIABLE CURL_STATIC_LIBS
-            ERROR_QUIET
-            OUTPUT_STRIP_TRAILING_WHITESPACE)
-    string(REPLACE " " ";" CURL_LIBS "${CURL_STATIC_LIBS}")
-else ()
-    set(CURL_LIBS curl)
-endif ()
-
 TARGET_LINK_LIBRARIES(
         sist2
 
@@ -123,7 +113,11 @@ TARGET_LINK_LIBRARIES(
         ${PROJECT_SOURCE_DIR}/lib/libonion_static.a
 
         pthread
-        ${CURL_LIBS}
+
+        # curl
+        ${PROJECT_SOURCE_DIR}/lib/libcurl.a
+        ssl crypto
+
         m
         bz2
         ${PROJECT_SOURCE_DIR}/lib/libmagic.a
diff --git a/scripts/get_static_libs.sh b/scripts/get_static_libs.sh
index 4cd108f..96baf17 100755
--- a/scripts/get_static_libs.sh
+++ b/scripts/get_static_libs.sh
@@ -13,8 +13,7 @@ mv mupdf/build/release/libmupdf-third.a .
 
 # openjp2
 cd openjpeg
-#cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-O3 -march=native -DNDEBUG"
-cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-O3"
+cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-O3 -march=native -DNDEBUG -fPIC"
 make -j $THREADS
 cd ..
 mv openjpeg/bin/libopenjp2.a .
@@ -22,7 +21,7 @@ mv openjpeg/bin/libopenjp2.a .
 # harfbuzz
 cd harfbuzz
 ./autogen.sh
-./configure --disable-shared --enable-static
+CFLAGS=-fPIC ./configure --disable-shared --enable-static
 make -j $THREADS
 cd ..
 mv harfbuzz/src/.libs/libharfbuzz.a .
@@ -75,7 +74,8 @@ mv libmagic/src/.libs/libmagic.a .
 cd tesseract
 mkdir build
 cd build
-cmake -DSTATIC=on -DBUILD_TRAINING_TOOLS=off ..
+cmake -DSTATIC=on -DBUILD_TRAINING_TOOLS=off -DBUILD_TESTS=off -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_CXX_FLAGS="-fPIC"  ..
 make -j $THREADS
 cd ../..
 mv tesseract/build/libtesseract.a .
@@ -83,7 +83,7 @@ mv tesseract/build/libtesseract.a .
 # leptonica
 cd leptonica
 ./autogen.sh
-./configure --without-zlib --without-jpeg --without-giflib \
+CFLAGS="-fPIC" ./configure --without-zlib --without-jpeg --without-giflib \
   --without-giflib --without-libwebp --without-libwebpmux --without-libopenjpeg \
   --enable-static --disable-shared
 make -j $THREADS
@@ -93,14 +93,25 @@ mv leptonica/src/.libs/liblept.a .
 # tiff
 cd libtiff
 ./autogen.sh
-./configure --enable-static --disable-shared --disable-lzw --disable-jpeg --disable-webp \
+CFLAGS="-fPIC" CXXFLAGS="-fPIC" CXX_FLAGS="-fPIC" ./configure --enable-static --disable-shared --disable-lzw --disable-jpeg --disable-webp \
   --disable-lzma --disable-zstd --disable-jbig
 make -j $THREADS
 cd ..
 mv libtiff/libtiff/.libs/libtiff.a .
 
+# png
 cd libpng
-./configure --enable-static --disable-shared
+CFLAGS="-fPIC" ./configure --enable-static --disable-shared
 make -j $THREADS
 cd ..
 mv libpng/.libs/libpng16.a .
+
+# curl
+wget -nc https://curl.haxx.se/download/curl-7.68.0.tar.gz
+tar -xzf curl-7.68.0.tar.gz
+cd curl-7.68.0
+./configure --disable-ldap --disable-ldaps --without-librtmp --disable-rtsp --disable-crypto-auth \
+  --disable-smtp --enable-static --disable-shared
+make -j $THREADS
+cd ..
+mv curl-7.68.0/lib/.libs/libcurl.a .