Changeset a4f37269 for x

Timestamp:

06/03/2017 10:32:28 PM (7 years ago)

Author:

DJ Lucas <dj@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

2de449e3

Parents:

14bf879

Message:

Update to OpenSSL-1.1.0f. Fixes #8214.
Update to OpenSSL Libraries 1.0.2l. Fixes #9282.
Remove Re-alpine and raplaced with Alpine-2.21.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@18783 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• x/lib/qt5.xml (modified) (3 diffs)

x/lib/qt5.xml

@@ -105 +105 @@
       <xref linkend="mesa"/>,
       <xref linkend="mtdev"/>,
-      <xref linkend="openssl"/>,
+      <xref linkend="openssl10"/>,
       <xref linkend="pcre"/>,
       <xref linkend="sqlite"/>,
@@ -214 +214 @@
       </para>
 
-<screen role="nodump"><userinput>-archdatadir    /usr/lib/qt5                \
--bindir         /usr/bin/qt5                \
--plugindir      /usr/lib/qt5/plugins        \
--importdir      /usr/lib/qt5/imports        \
--headerdir      /usr/include/qt5            \
--datadir        /usr/share/qt5              \
--docdir         /usr/share/doc/qt5          \
--translationdir /usr/share/qt5/translations \
--examplesdir    /usr/share/doc/qt5/examples \</userinput></screen>
+<screen role="nodump"><userinput>            -archdatadir    /usr/lib/qt5                \
+            -bindir         /usr/bin/qt5                \
+            -plugindir      /usr/lib/qt5/plugins        \
+            -importdir      /usr/lib/qt5/imports        \
+            -headerdir      /usr/include/qt5            \
+            -datadir        /usr/share/qt5              \
+            -docdir         /usr/share/doc/qt5          \
+            -translationdir /usr/share/qt5/translations \
+            -examplesdir    /usr/share/doc/qt5/examples</userinput></screen>
     </note>
 
@@ -229 +229 @@
     </para>
 
-<screen><userinput>./configure -prefix         $QT5PREFIX \
-            -sysconfdir     /etc/xdg   \
-            -confirm-license           \
-            -opensource                \
-            -dbus-linked               \
-            -openssl-linked            \
-            -system-harfbuzz           \
-            -system-sqlite             \
-            -nomake examples           \
-            -no-rpath                  \
-            -skip qtwebengine          &amp;&amp;
+<screen><userinput>echo "INCLUDEPATH += /usr/include/openssl-1.0" >>           \
+                     qtbase/src/network/network.pro         &amp;&amp;
+export OPENSSL_LIBS='-L/usr/lib/openssl-1.0 -lssl -lcrypto' &amp;&amp;
+
+./configure -prefix $QT5PREFIX                          \
+            -sysconfdir /etc/xdg                        \
+            -confirm-license                            \
+            -opensource                                 \
+            -dbus-linked                                \
+            -openssl-linked                             \
+            -system-harfbuzz                            \
+            -system-sqlite                              \
+            -nomake examples                            \
+            -no-rpath                                   \
+            -skip qtwebengine                           &amp;&amp;
 make</userinput></screen>