View | Details | Raw Unified | Return to bug 204402
Collapse All | Expand All

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

Return to bug 204402