mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 17:59:20 -04:00
Fix build with ports OpenSSL.
This commit is contained in:
parent
1e5a497d8b
commit
8c6cb1ade9
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=418983
1 changed files with 16 additions and 7 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue