File tree 6 files changed +8
-138
lines changed
6 files changed +8
-138
lines changed Original file line number Diff line number Diff line change @@ -40,7 +40,6 @@ function pre_build {
40
40
echo ' -----------------'
41
41
else
42
42
echo " Running for linux"
43
- export LDFLAGS=" -Wl,--no-as-needed -Wl,--no-undefined ${LDFLAGS} "
44
43
fi
45
44
qmake -query
46
45
}
Original file line number Diff line number Diff line change 1
1
FROM quay.io/pypa/manylinux1_i686:latest
2
2
3
- RUN wget --no-check-certificate https://download.qt.io/official_releases /qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz && \
3
+ RUN curl -O -L https://download.qt.io/archive /qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz && \
4
4
tar -xf qt-everywhere-opensource-src-4.8.7.tar.gz && \
5
5
cd qt-everywhere* && \
6
- ./configure -prefix /opt/Qt4.8.7 -release -opensource -confirm-license -qtnamespace Qt4 && \
7
- gmake && \
6
+ ./configure -prefix /opt/Qt4.8.7 -release -opensource -confirm-license && \
7
+ gmake -j5 && \
8
8
gmake install && \
9
9
cd .. && \
10
10
rm -rf qt-everywhere-opensource-src-4.8.7 && \
@@ -13,7 +13,7 @@ RUN wget --no-check-certificate https://download.qt.io/official_releases/qt/4.8/
13
13
ENV QTDIR /opt/Qt4.8.7
14
14
ENV PATH "$QTDIR/bin:$PATH"
15
15
16
- RUN wget --no-check-certificate https://cmake.org/files/v3.9/cmake-3.9.0.tar.gz && \
16
+ RUN curl -O -L https://cmake.org/files/v3.9/cmake-3.9.0.tar.gz && \
17
17
tar -zxf cmake-3.9.0.tar.gz && \
18
18
cd cmake-3.9.0 && \
19
19
yum -y install curl-devel zlib-devel && \
Original file line number Diff line number Diff line change 1
1
FROM quay.io/pypa/manylinux1_x86_64:latest
2
2
3
- RUN wget --no-check-certificate https://download.qt.io/official_releases /qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz && \
3
+ RUN curl -O -L https://download.qt.io/archive /qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz && \
4
4
tar -xf qt-everywhere-opensource-src-4.8.7.tar.gz && \
5
5
cd qt-everywhere* && \
6
- ./configure -prefix /opt/Qt4.8.7 -release -opensource -confirm-license -qtnamespace Qt4 && \
7
- gmake && \
6
+ ./configure -prefix /opt/Qt4.8.7 -release -opensource -confirm-license && \
7
+ gmake -j5 && \
8
8
gmake install && \
9
9
cd .. && \
10
10
rm -rf qt-everywhere-opensource-src-4.8.7 && \
@@ -13,7 +13,7 @@ RUN wget --no-check-certificate https://download.qt.io/official_releases/qt/4.8/
13
13
ENV QTDIR /opt/Qt4.8.7
14
14
ENV PATH "$QTDIR/bin:$PATH"
15
15
16
- RUN wget --no-check-certificate https://cmake.org/files/v3.9/cmake-3.9.0.tar.gz && \
16
+ RUN curl -O -L https://cmake.org/files/v3.9/cmake-3.9.0.tar.gz && \
17
17
tar -zxf cmake-3.9.0.tar.gz && \
18
18
cd cmake-3.9.0 && \
19
19
yum -y install curl-devel zlib-devel && \
Load Diff This file was deleted.
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -109,9 +109,6 @@ def main():
109
109
# OS-specific components
110
110
if (sys .platform == 'darwin' or sys .platform .startswith ('linux' )) and not build_headless :
111
111
cmake_args .append ("-DWITH_QT=4" )
112
- # Apply Qt namespace patches to OpenCV GUI code
113
- subprocess .check_call ("patch -p0 < patches/patch1.patch" , shell = True )
114
- subprocess .check_call ("patch -p0 < patches/patch2.patch" , shell = True )
115
112
116
113
if build_headless :
117
114
# it seems that cocoa cannot be disabled so on macOS the package is not truly headless
You can’t perform that action at this time.
0 commit comments