Attachment 163945 Details for Bug 204402 – patch to unbreak build on -CURRENT WITH_OPENSSL_PORT

[patch] patch to unbreak build on -CURRENT WITH_OPENSSL_PORT

patch-virtualbox-ose (text/plain), 1.70 KB, created by Don Lewis on 2015-12-07 17:24:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Don Lewis

Created: 2015-12-07 17:24:34 UTC

Size: 1.70 KB

patch

obsolete

>Index: files/patch-configure
>===================================================================
>--- files/patch-configure	(revision 403081)
>+++ files/patch-configure	(working copy)
>@@ -1,6 +1,6 @@
>---- configure.orig	2015-05-13 11:08:57.000000000 -0400
>-+++ configure	2015-05-15 14:16:05.988372000 -0400
>-@@ -140,6 +140,8 @@
>+--- configure.orig	2015-11-10 21:17:36 UTC
>++++ configure
>+@@ -140,6 +140,8 @@ if [ "$OS" = "freebsd" ]; then
>    LIBPULSE="-L/usr/local/lib"
>    INCPNG="-I/usr/local/include"
>    LIBPNG="-L/usr/local/lib -lpng"
>@@ -9,7 +9,15 @@
>  else
>    INCCURL=""
>    LIBCURL="-lcurl"
>-@@ -1947,8 +1949,8 @@
>+@@ -835,6 +837,7 @@ EOF
>+         cnf_append "SDK_VBOX_OPENSSL_INCS" "`strip_I "$INCCRYPTO"`"
>+         cnf_append "SDK_VBOX_OPENSSL_LIBS" "`strip_l "$LIBCRYPTO"`"
>+         cnf_append "SDK_VBOX_BLD_OPENSSL_LIBS" "`strip_l "$LIBCRYPTO"`"
>++        cnf_append "VBoxRT_LDFLAGS.freebsd" "$OPENSSL_LDFLAGS"
>+       fi
>+     fi
>+   fi
>+@@ -1948,8 +1951,8 @@ EOF
>          echo "compiling the following source file:" >> $LOG
>          cat $ODIR.tmp_src.cc >> $LOG
>          echo "using the following command line:" >> $LOG
>@@ -20,12 +28,13 @@
>          if [ $? -eq 0 ]; then
>            found=1
>            break
>-@@ -2357,7 +2359,7 @@
>+@@ -2358,7 +2361,8 @@ for option in $*; do
>      --with-openssl-dir=*)
>        OPENSSLDIR=`echo $option | cut -d'=' -f2`
>        INCCRYPTO="-I${OPENSSLDIR}/include"
> -      LIBCRYPTO="${OPENSSLDIR}/lib/libcrypto.a ${OPENSSLDIR}/lib/libssl.a"
>-+      LIBCRYPTO="-L${OPENSSLDIR}/lib -lcrypto -lssl"
>++      LIBCRYPTO="-lcrypto -lssl"
>++      OPENSSL_LDFLAGS="-L${OPENSSLDIR}/lib -Wl,-rpath,${OPENSSLDIR}/lib"
>        ;;
>      --with-ow-dir=*)
>        WATCOM=`echo $option | cut -d'=' -f2`

Actions: View | Diff

Attachments on bug 204402: 162927 | 163945