diff options
| author | jkim <jkim@FreeBSD.org> | 2016-07-24 09:55:39 +0800 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2016-07-24 09:55:39 +0800 |
| commit | 538bd5acffab9fbb3dd778c5699c91d929f643dd (patch) | |
| tree | 93d6aea70334c8a32be8b1b707f4ad3bf1f6c48c /emulators | |
| parent | 0e8a7aaf093ee0a6646535e7497b32b076ab1f89 (diff) | |
| download | freebsd-ports-gnome-538bd5acffab9fbb3dd778c5699c91d929f643dd.tar.gz freebsd-ports-gnome-538bd5acffab9fbb3dd778c5699c91d929f643dd.tar.zst freebsd-ports-gnome-538bd5acffab9fbb3dd778c5699c91d929f643dd.zip | |
Fix build with ports OpenSSL.
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/virtualbox-ose/files/patch-configure | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/emulators/virtualbox-ose/files/patch-configure b/emulators/virtualbox-ose/files/patch-configure index e87789b83669..c9bbeb0b39f7 100644 --- a/emulators/virtualbox-ose/files/patch-configure +++ b/emulators/virtualbox-ose/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2015-06-01 13:50:10.000000000 -0400 -+++ configure 2015-06-10 19:40:14.170742000 -0400 -@@ -137,10 +137,14 @@ +--- configure.orig 2016-07-18 11:50:32 UTC ++++ configure +@@ -137,10 +137,14 @@ CXX_FLAGS="" if [ "$OS" = "freebsd" ]; then INCCURL="-I/usr/local/include" LIBCURL="-L/usr/local/lib -lcurl" @@ -15,7 +15,7 @@ else INCCURL="" LIBCURL="-lcurl" -@@ -1200,7 +1204,7 @@ +@@ -1213,7 +1217,7 @@ extern "C" int main(void) #endif } EOF @@ -24,7 +24,7 @@ test_execute fi } -@@ -1949,8 +1953,8 @@ +@@ -1945,8 +1949,8 @@ EOF echo "compiling the following source file:" >> $LOG cat $ODIR.tmp_src.cc >> $LOG echo "using the following command line:" >> $LOG @@ -35,7 +35,16 @@ if [ $? -eq 0 ]; then found=1 break -@@ -2733,8 +2737,15 @@ +@@ -2415,7 +2419,7 @@ 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 -lssl -lcrypto" + ;; + --with-ow-dir=*) + WATCOM=`echo $option | cut -d'=' -f2` +@@ -2744,8 +2748,15 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then [ $WITH_PYTHON -eq 1 ] && check_python [ $WITH_JAVA -eq 1 ] && check_java @@ -52,7 +61,7 @@ if [ $WITH_PULSE -eq 1 ]; then check_pulse elif [ $WITH_PULSE -eq 0 ]; then -@@ -2756,14 +2767,6 @@ +@@ -2767,14 +2778,6 @@ if [ "$OS" = "linux" ]; then cnf_append "VBOX_WITH_ADDITION_DRIVERS" "" fi if [ $ONLY_ADDITIONS -eq 0 ]; then |