From owner-dev-commits-ports-main@freebsd.org Sun Apr 11 14:57:22 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6193A5D1342; Sun, 11 Apr 2021 14:57:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FJFMk2KyXz3mQC; Sun, 11 Apr 2021 14:57:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3EFFA25EC8; Sun, 11 Apr 2021 14:57:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13BEvMZx024126; Sun, 11 Apr 2021 14:57:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13BEvM32024125; Sun, 11 Apr 2021 14:57:22 GMT (envelope-from git) Date: Sun, 11 Apr 2021 14:57:22 GMT Message-Id: <202104111457.13BEvM32024125@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 423f3dfd755f - main - emulators/virtualbox-ose: Fix build with ports provided SSL library on 11.x MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 423f3dfd755f7c98bf2d28083aac19783cf4e9a6 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Apr 2021 14:57:22 -0000 The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=423f3dfd755f7c98bf2d28083aac19783cf4e9a6 commit 423f3dfd755f7c98bf2d28083aac19783cf4e9a6 Author: Guido Falsi AuthorDate: 2021-04-11 14:55:35 +0000 Commit: Guido Falsi CommitDate: 2021-04-11 14:55:35 +0000 emulators/virtualbox-ose: Fix build with ports provided SSL library on 11.x Due to a compiler/linker command line ordering issue, VirtualBox 6 fails to compile on 11.x when a ports provided SSL library is used. Fix the order of -L options passed to the linker where the ssl library is used. Thanks to Chad Jacob Milios for suggesting the correct fix. PR: 254295 Submitted by: russo@bogodyn.org MFH: 2021Q2 --- .../files/patch-src_VBox_RDP_client-1.8.4_Makefile.kmk | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_RDP_client-1.8.4_Makefile.kmk b/emulators/virtualbox-ose/files/patch-src_VBox_RDP_client-1.8.4_Makefile.kmk new file mode 100644 index 000000000000..c23a6e6fbb16 --- /dev/null +++ b/emulators/virtualbox-ose/files/patch-src_VBox_RDP_client-1.8.4_Makefile.kmk @@ -0,0 +1,13 @@ +--- src/VBox/RDP/client-1.8.4/Makefile.kmk.orig 2021-01-07 15:41:47 UTC ++++ src/VBox/RDP/client-1.8.4/Makefile.kmk +@@ -117,8 +117,8 @@ rdesktop-vrdp_SOURCES.solaris = \ + rdesktop-vrdp_SOURCES.freebsd = \ + rdpsnd_oss.c + rdesktop-vrdp_LIBPATH = \ +- /usr/lib \ +- $(VBOX_LIBPATH_X11) ++ $(VBOX_LIBPATH_X11)/lib \ ++ /usr/lib + rdesktop-vrdp_LIBS = \ + X11 \ + $(LIB_RUNTIME)