- Fix build if OpenSSL is installed from ports. [1]
- Some options require other ones. Add check for them. [2] PR: ports/139391 [1] Submitted by: "Y.A." <nexther0 AT gmail.com> [1] Tested by: Yuri Gorchakov <yuri.gorchakov AT point-group.ru> [1] Reported by: Maxim <maksims.k AT gmail.com> [2] On behalf of: vbox@ (decke, dhn, itetcu, miwi, nox)
This commit is contained in:
parent
bb8fa633fe
commit
f9297d2f2b
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=243239
10 changed files with 85 additions and 5 deletions
|
@ -76,6 +76,14 @@ KMK_BUILDTYPE= release
|
|||
KMK_CONFIG= VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys
|
||||
KMK_FLAGS=
|
||||
|
||||
.if defined(WITHOUT_QT4) && !defined(WITHOUT_NLS)
|
||||
BROKEN= NLS support requires QT4 frontend. Run 'make config' again!
|
||||
.endif
|
||||
|
||||
.if defined(WITHOUT_X11) && !defined(WITHOUT_QT4)
|
||||
BROKEN= QT4 frontend requires X11 support. Run 'make config' again!
|
||||
.endif
|
||||
|
||||
.if !defined(WITHOUT_X11)
|
||||
USE_SDL= sdl
|
||||
USE_XORG= xcursor xmu
|
||||
|
@ -96,7 +104,6 @@ PLIST_SUB+= QT4=""
|
|||
.else
|
||||
CONFIGURE_ARGS+=--disable-qt4
|
||||
PLIST_SUB+= QT4="@comment "
|
||||
WITHOUT_NLS= yes
|
||||
.endif
|
||||
|
||||
.if defined(WITH_GUESTADDITIONS)
|
||||
|
|
|
@ -1,5 +1,14 @@
|
|||
--- configure.orgi 2009-05-31 13:43:50.000000000 +0200
|
||||
+++ configure 2009-05-31 13:45:47.000000000 +0200
|
||||
@@ -102,7 +102,7 @@
|
||||
XSLTPROC="xsltproc"
|
||||
GENISOIMAGE="genisoimage"
|
||||
MKISOFS="mkisofs"
|
||||
-LIBCRYPTO="-lcrypto"
|
||||
+LIBCRYPTO="-lcrypto -lssl"
|
||||
LIBPTHREAD="-lpthread"
|
||||
LIBCAP="-lcap"
|
||||
GSOAP=""
|
||||
@@ -1698,7 +1698,7 @@
|
||||
cat $ODIR.tmp_src.cc >> $LOG
|
||||
echo "using the following command line:" >> $LOG
|
||||
|
|
|
@ -76,6 +76,14 @@ KMK_BUILDTYPE= release
|
|||
KMK_CONFIG= VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys
|
||||
KMK_FLAGS=
|
||||
|
||||
.if defined(WITHOUT_QT4) && !defined(WITHOUT_NLS)
|
||||
BROKEN= NLS support requires QT4 frontend. Run 'make config' again!
|
||||
.endif
|
||||
|
||||
.if defined(WITHOUT_X11) && !defined(WITHOUT_QT4)
|
||||
BROKEN= QT4 frontend requires X11 support. Run 'make config' again!
|
||||
.endif
|
||||
|
||||
.if !defined(WITHOUT_X11)
|
||||
USE_SDL= sdl
|
||||
USE_XORG= xcursor xmu
|
||||
|
@ -96,7 +104,6 @@ PLIST_SUB+= QT4=""
|
|||
.else
|
||||
CONFIGURE_ARGS+=--disable-qt4
|
||||
PLIST_SUB+= QT4="@comment "
|
||||
WITHOUT_NLS= yes
|
||||
.endif
|
||||
|
||||
.if defined(WITH_GUESTADDITIONS)
|
||||
|
|
|
@ -1,5 +1,14 @@
|
|||
--- configure.orgi 2009-05-31 13:43:50.000000000 +0200
|
||||
+++ configure 2009-05-31 13:45:47.000000000 +0200
|
||||
@@ -102,7 +102,7 @@
|
||||
XSLTPROC="xsltproc"
|
||||
GENISOIMAGE="genisoimage"
|
||||
MKISOFS="mkisofs"
|
||||
-LIBCRYPTO="-lcrypto"
|
||||
+LIBCRYPTO="-lcrypto -lssl"
|
||||
LIBPTHREAD="-lpthread"
|
||||
LIBCAP="-lcap"
|
||||
GSOAP=""
|
||||
@@ -1698,7 +1698,7 @@
|
||||
cat $ODIR.tmp_src.cc >> $LOG
|
||||
echo "using the following command line:" >> $LOG
|
||||
|
|
|
@ -76,6 +76,14 @@ KMK_BUILDTYPE= release
|
|||
KMK_CONFIG= VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys
|
||||
KMK_FLAGS=
|
||||
|
||||
.if defined(WITHOUT_QT4) && !defined(WITHOUT_NLS)
|
||||
BROKEN= NLS support requires QT4 frontend. Run 'make config' again!
|
||||
.endif
|
||||
|
||||
.if defined(WITHOUT_X11) && !defined(WITHOUT_QT4)
|
||||
BROKEN= QT4 frontend requires X11 support. Run 'make config' again!
|
||||
.endif
|
||||
|
||||
.if !defined(WITHOUT_X11)
|
||||
USE_SDL= sdl
|
||||
USE_XORG= xcursor xmu
|
||||
|
@ -96,7 +104,6 @@ PLIST_SUB+= QT4=""
|
|||
.else
|
||||
CONFIGURE_ARGS+=--disable-qt4
|
||||
PLIST_SUB+= QT4="@comment "
|
||||
WITHOUT_NLS= yes
|
||||
.endif
|
||||
|
||||
.if defined(WITH_GUESTADDITIONS)
|
||||
|
|
|
@ -1,5 +1,14 @@
|
|||
--- configure.orgi 2009-05-31 13:43:50.000000000 +0200
|
||||
+++ configure 2009-05-31 13:45:47.000000000 +0200
|
||||
@@ -102,7 +102,7 @@
|
||||
XSLTPROC="xsltproc"
|
||||
GENISOIMAGE="genisoimage"
|
||||
MKISOFS="mkisofs"
|
||||
-LIBCRYPTO="-lcrypto"
|
||||
+LIBCRYPTO="-lcrypto -lssl"
|
||||
LIBPTHREAD="-lpthread"
|
||||
LIBCAP="-lcap"
|
||||
GSOAP=""
|
||||
@@ -1698,7 +1698,7 @@
|
||||
cat $ODIR.tmp_src.cc >> $LOG
|
||||
echo "using the following command line:" >> $LOG
|
||||
|
|
|
@ -76,6 +76,14 @@ KMK_BUILDTYPE= release
|
|||
KMK_CONFIG= VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys
|
||||
KMK_FLAGS=
|
||||
|
||||
.if defined(WITHOUT_QT4) && !defined(WITHOUT_NLS)
|
||||
BROKEN= NLS support requires QT4 frontend. Run 'make config' again!
|
||||
.endif
|
||||
|
||||
.if defined(WITHOUT_X11) && !defined(WITHOUT_QT4)
|
||||
BROKEN= QT4 frontend requires X11 support. Run 'make config' again!
|
||||
.endif
|
||||
|
||||
.if !defined(WITHOUT_X11)
|
||||
USE_SDL= sdl
|
||||
USE_XORG= xcursor xmu
|
||||
|
@ -96,7 +104,6 @@ PLIST_SUB+= QT4=""
|
|||
.else
|
||||
CONFIGURE_ARGS+=--disable-qt4
|
||||
PLIST_SUB+= QT4="@comment "
|
||||
WITHOUT_NLS= yes
|
||||
.endif
|
||||
|
||||
.if defined(WITH_GUESTADDITIONS)
|
||||
|
|
|
@ -1,5 +1,14 @@
|
|||
--- configure.orgi 2009-05-31 13:43:50.000000000 +0200
|
||||
+++ configure 2009-05-31 13:45:47.000000000 +0200
|
||||
@@ -102,7 +102,7 @@
|
||||
XSLTPROC="xsltproc"
|
||||
GENISOIMAGE="genisoimage"
|
||||
MKISOFS="mkisofs"
|
||||
-LIBCRYPTO="-lcrypto"
|
||||
+LIBCRYPTO="-lcrypto -lssl"
|
||||
LIBPTHREAD="-lpthread"
|
||||
LIBCAP="-lcap"
|
||||
GSOAP=""
|
||||
@@ -1698,7 +1698,7 @@
|
||||
cat $ODIR.tmp_src.cc >> $LOG
|
||||
echo "using the following command line:" >> $LOG
|
||||
|
|
|
@ -76,6 +76,14 @@ KMK_BUILDTYPE= release
|
|||
KMK_CONFIG= VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys
|
||||
KMK_FLAGS=
|
||||
|
||||
.if defined(WITHOUT_QT4) && !defined(WITHOUT_NLS)
|
||||
BROKEN= NLS support requires QT4 frontend. Run 'make config' again!
|
||||
.endif
|
||||
|
||||
.if defined(WITHOUT_X11) && !defined(WITHOUT_QT4)
|
||||
BROKEN= QT4 frontend requires X11 support. Run 'make config' again!
|
||||
.endif
|
||||
|
||||
.if !defined(WITHOUT_X11)
|
||||
USE_SDL= sdl
|
||||
USE_XORG= xcursor xmu
|
||||
|
@ -96,7 +104,6 @@ PLIST_SUB+= QT4=""
|
|||
.else
|
||||
CONFIGURE_ARGS+=--disable-qt4
|
||||
PLIST_SUB+= QT4="@comment "
|
||||
WITHOUT_NLS= yes
|
||||
.endif
|
||||
|
||||
.if defined(WITH_GUESTADDITIONS)
|
||||
|
|
|
@ -1,5 +1,14 @@
|
|||
--- configure.orgi 2009-05-31 13:43:50.000000000 +0200
|
||||
+++ configure 2009-05-31 13:45:47.000000000 +0200
|
||||
@@ -102,7 +102,7 @@
|
||||
XSLTPROC="xsltproc"
|
||||
GENISOIMAGE="genisoimage"
|
||||
MKISOFS="mkisofs"
|
||||
-LIBCRYPTO="-lcrypto"
|
||||
+LIBCRYPTO="-lcrypto -lssl"
|
||||
LIBPTHREAD="-lpthread"
|
||||
LIBCAP="-lcap"
|
||||
GSOAP=""
|
||||
@@ -1698,7 +1698,7 @@
|
||||
cat $ODIR.tmp_src.cc >> $LOG
|
||||
echo "using the following command line:" >> $LOG
|
||||
|
|
Loading…
Reference in a new issue