diff options
| author | Beat Gaetzi <beat@FreeBSD.org> | 2009-10-23 14:29:50 +0000 |
|---|---|---|
| committer | Beat Gaetzi <beat@FreeBSD.org> | 2009-10-23 14:29:50 +0000 |
| commit | f9297d2f2bf3976db9e172235347c2016414ccc6 (patch) | |
| tree | 208ca47ad913db4a8f44c6c34b50114d753da2d2 /emulators | |
| parent | Set NO_LATEST_LINK to not overlap with www/mediawiki (diff) | |
- 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)
Notes
Notes:
svn path=/head/; revision=243239
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/virtualbox-ose-kmod-legacy/Makefile | 9 | ||||
| -rw-r--r-- | emulators/virtualbox-ose-kmod-legacy/files/patch-configure | 9 | ||||
| -rw-r--r-- | emulators/virtualbox-ose-kmod/Makefile | 9 | ||||
| -rw-r--r-- | emulators/virtualbox-ose-kmod/files/patch-configure | 9 | ||||
| -rw-r--r-- | emulators/virtualbox-ose-legacy/Makefile | 9 | ||||
| -rw-r--r-- | emulators/virtualbox-ose-legacy/files/patch-configure | 9 | ||||
| -rw-r--r-- | emulators/virtualbox-ose/Makefile | 9 | ||||
| -rw-r--r-- | emulators/virtualbox-ose/files/patch-configure | 9 | ||||
| -rw-r--r-- | emulators/virtualbox/Makefile | 9 | ||||
| -rw-r--r-- | emulators/virtualbox/files/patch-configure | 9 |
10 files changed, 85 insertions, 5 deletions
diff --git a/emulators/virtualbox-ose-kmod-legacy/Makefile b/emulators/virtualbox-ose-kmod-legacy/Makefile index 94377f31fbcd..d0419e2d0b6f 100644 --- a/emulators/virtualbox-ose-kmod-legacy/Makefile +++ b/emulators/virtualbox-ose-kmod-legacy/Makefile @@ -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) diff --git a/emulators/virtualbox-ose-kmod-legacy/files/patch-configure b/emulators/virtualbox-ose-kmod-legacy/files/patch-configure index d296d38cd70e..c6532c3db606 100644 --- a/emulators/virtualbox-ose-kmod-legacy/files/patch-configure +++ b/emulators/virtualbox-ose-kmod-legacy/files/patch-configure @@ -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 diff --git a/emulators/virtualbox-ose-kmod/Makefile b/emulators/virtualbox-ose-kmod/Makefile index 94377f31fbcd..d0419e2d0b6f 100644 --- a/emulators/virtualbox-ose-kmod/Makefile +++ b/emulators/virtualbox-ose-kmod/Makefile @@ -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) diff --git a/emulators/virtualbox-ose-kmod/files/patch-configure b/emulators/virtualbox-ose-kmod/files/patch-configure index d296d38cd70e..c6532c3db606 100644 --- a/emulators/virtualbox-ose-kmod/files/patch-configure +++ b/emulators/virtualbox-ose-kmod/files/patch-configure @@ -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 diff --git a/emulators/virtualbox-ose-legacy/Makefile b/emulators/virtualbox-ose-legacy/Makefile index 94377f31fbcd..d0419e2d0b6f 100644 --- a/emulators/virtualbox-ose-legacy/Makefile +++ b/emulators/virtualbox-ose-legacy/Makefile @@ -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) diff --git a/emulators/virtualbox-ose-legacy/files/patch-configure b/emulators/virtualbox-ose-legacy/files/patch-configure index d296d38cd70e..c6532c3db606 100644 --- a/emulators/virtualbox-ose-legacy/files/patch-configure +++ b/emulators/virtualbox-ose-legacy/files/patch-configure @@ -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 diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index 94377f31fbcd..d0419e2d0b6f 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -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) diff --git a/emulators/virtualbox-ose/files/patch-configure b/emulators/virtualbox-ose/files/patch-configure index d296d38cd70e..c6532c3db606 100644 --- a/emulators/virtualbox-ose/files/patch-configure +++ b/emulators/virtualbox-ose/files/patch-configure @@ -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 diff --git a/emulators/virtualbox/Makefile b/emulators/virtualbox/Makefile index 94377f31fbcd..d0419e2d0b6f 100644 --- a/emulators/virtualbox/Makefile +++ b/emulators/virtualbox/Makefile @@ -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) diff --git a/emulators/virtualbox/files/patch-configure b/emulators/virtualbox/files/patch-configure index d296d38cd70e..c6532c3db606 100644 --- a/emulators/virtualbox/files/patch-configure +++ b/emulators/virtualbox/files/patch-configure @@ -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 |