Move Chrome related files to their own directory

Building curl-impersonate with Chrome impersonation requires a different
compilation and a different set of patches which may conflict with the
Firefox impersonation. Therefore we will treat them a separate builds.
All chrome related files were moved to the chrome/ directory.
This commit is contained in:
lwthiker
2022-02-19 11:05:20 +02:00
parent 01b4a33c82
commit 367f91922d
9 changed files with 27 additions and 2 deletions

View File

@@ -40,7 +40,7 @@ RUN curl -o ${NGHTTP2_VERSION}.tar.bz2 -L ${NGHTTP2_URL}
RUN tar xf ${NGHTTP2_VERSION}.tar.bz2 RUN tar xf ${NGHTTP2_VERSION}.tar.bz2
# Patch nghttp2 pkg config file to support static builds. # Patch nghttp2 pkg config file to support static builds.
COPY libnghttp2-*.patch ${NGHTTP2_VERSION}/ COPY patches/libnghttp2-*.patch ${NGHTTP2_VERSION}/
RUN cd ${NGHTTP2_VERSION} && \ RUN cd ${NGHTTP2_VERSION} && \
for p in $(ls libnghttp2-*.patch); do patch -p1 < $p; done && \ for p in $(ls libnghttp2-*.patch); do patch -p1 < $p; done && \
autoreconf -i && automake && autoconf autoreconf -i && automake && autoconf
@@ -56,7 +56,7 @@ RUN curl -o ${CURL_VERSION}.tar.xz https://curl.se/download/${CURL_VERSION}.tar.
RUN tar xf ${CURL_VERSION}.tar.xz RUN tar xf ${CURL_VERSION}.tar.xz
# Patch curl and re-generate the configure script # Patch curl and re-generate the configure script
COPY curl-*.patch ${CURL_VERSION}/ COPY patches/curl-*.patch ${CURL_VERSION}/
RUN cd ${CURL_VERSION} && \ RUN cd ${CURL_VERSION} && \
for p in $(ls curl-*.patch); do patch -p1 < $p; done && \ for p in $(ls curl-*.patch); do patch -p1 < $p; done && \
autoreconf -fi autoreconf -fi

View File

@@ -0,0 +1,17 @@
--- curl-7.81.0-original/configure.ac 2022-01-03 18:36:46.000000000 +0200
+++ curl-7.81.0/configure.ac 2022-02-17 13:40:02.248497926 +0200
@@ -2575,3 +2575,3 @@
LIB_H2=`CURL_EXPORT_PCDIR([$want_nghttp2_path])
- $PKGCONFIG --libs-only-l libnghttp2`
+ $PKGCONFIG --static --libs-only-l libnghttp2`
AC_MSG_NOTICE([-l is $LIB_H2])
@@ -2579,3 +2579,3 @@
CPP_H2=`CURL_EXPORT_PCDIR([$want_nghttp2_path]) dnl
- $PKGCONFIG --cflags-only-I libnghttp2`
+ $PKGCONFIG --static --cflags-only-I libnghttp2`
AC_MSG_NOTICE([-I is $CPP_H2])
@@ -2583,3 +2583,3 @@
LD_H2=`CURL_EXPORT_PCDIR([$want_nghttp2_path])
- $PKGCONFIG --libs-only-L libnghttp2`
+ $PKGCONFIG --static --libs-only-L libnghttp2`
AC_MSG_NOTICE([-L is $LD_H2])

View File

@@ -0,0 +1,8 @@
--- nghttp2-1.46.0-original/lib/libnghttp2.pc.in 2021-10-19 12:31:47.000000000 +0300
+++ nghttp2-1.46.0/lib/libnghttp2.pc.in 2022-02-17 13:44:46.722604316 +0200
@@ -31,3 +31,4 @@
Version: @VERSION@
-Libs: -L${libdir} -lnghttp2
+Libs: -L${libdir}
+Libs.private: -l:libnghttp2.a
Cflags: -I${includedir}