From nobody Fri Aug 05 11:58:15 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Lzkd34gzdz4Xlpk; Fri, 5 Aug 2022 11:58:15 +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 4Lzkd32BpKz46B6; Fri, 5 Aug 2022 11:58:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659700695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ciMbago1qe2PwhOmhvj4Fa35FyiNsDWQdJkCoS2RgJ8=; b=an45FkoXcV3BqKbh/mfrvwRz/p0GKE2oqI0AVtE310UZDoACKMbxBzIjGSB7LPlPrZutO8 Bz9irF31CITlCLAYtkOWdcrSHZDvaBar4K9b3tCC1r2fAxF/DQEEcJn682V7VADWPVog4S b5loBZbAXFOgxQRhyn1LE798JZkXgPZjfaTyJEL2rAE8ji44HQj2AeCEUSh85+5dcDfcHN kvEjPJi5F5MdhMZmmVbZPhehi/P93i/c2QBUOqz/IRpEQh3842LrIm6Fw9fM1WvY96M2wC zINbkEGkmVmWa/CUKJ9NWRKg8a2eqHMjKSZuHHlxivckfH/KGvJxT6N++KvOCA== 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 4Lzkd31B9lzsTx; Fri, 5 Aug 2022 11:58:15 +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 275BwF1C048063; Fri, 5 Aug 2022 11:58:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 275BwF0Y048062; Fri, 5 Aug 2022 11:58:15 GMT (envelope-from git) Date: Fri, 5 Aug 2022 11:58:15 GMT Message-Id: <202208051158.275BwF0Y048062@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 9de7f58639d3 - main - x11-servers/xorg-server: fix build on powerpc List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9de7f58639d3a62cdaf375611f8d837cb543b674 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659700695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ciMbago1qe2PwhOmhvj4Fa35FyiNsDWQdJkCoS2RgJ8=; b=DH1vYMtnasWAKGuh24Z4S3HJbHN+nkO9Ryi+jcPnftKoGpGBI1LxzqnfyEmkHtamRnFvul QUhna63SI8TIltcOOHhyS8zVP4OP2KtB0HBZNpiMuADC/zBzr6ltkb4AVhqtzlCK7aWqxO mYnpglGZErGCDoxQvYdcebJIuIfzNK9zhXdVlqeXC/vQ5oT2ZRIXMzUdH63OiBColUbCeN tFZUHahEB+2EqNb4oUploCBIK/l99m240Ve7NrcJ6rwWrhgsyY3U9OyNkSYs296t9YKOFD jCynPmzHDJMRUAnHNebnxXE81gpI0cFu8zUOsJ21froKNEEf2qN65OtsGW8tSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659700695; a=rsa-sha256; cv=none; b=TOSqwv20fv9Mo1qY4vrolJw+DcWSaEGP6rnyjTMELZWcJzCEHQible0gddWrM7kvGhKDxM Mh2pwmz7RgFq9nnO0n5qqowiI34a3+sTNoOWExTkAGcZYTp0p8irjdgUKMY6Zc23eOcsFm anEkHwNyUf/P9nsrHWwe+a+ujIrMA0e2waNvXdIUWEd7BAVQ8sQjm84knE12yOhkmKHO51 72EGNusiHuJbIqAtS0VmmgESk0djVwCfB7w/96e/79bBfb00jOMRvzDEHPq2HBW0LBrvlx nMLiu8TL4YHk8cDEtn0nhX0R23B3w7We1VUASt6/kNAXUmdOWw7DTkDzdaR3Kg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=9de7f58639d3a62cdaf375611f8d837cb543b674 commit 9de7f58639d3a62cdaf375611f8d837cb543b674 Author: Piotr Kubaj AuthorDate: 2022-08-05 11:57:45 +0000 Commit: Piotr Kubaj CommitDate: 2022-08-05 11:58:09 +0000 x11-servers/xorg-server: fix build on powerpc --- .../xorg-server/files/patch-hw_xfree86_os-support_meson.build | 4 ++-- x11-servers/xorg-server/files/patch-meson.build | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_meson.build b/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_meson.build index 400068d37709..12373890385d 100644 --- a/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_meson.build +++ b/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_meson.build @@ -1,11 +1,11 @@ ---- hw/xfree86/os-support/meson.build.orig 2022-08-04 15:48:52 UTC +--- hw/xfree86/os-support/meson.build.orig 2022-07-12 13:27:57 UTC +++ hw/xfree86/os-support/meson.build @@ -113,7 +113,7 @@ elif host_machine.system().endswith('bsd') endif elif host_machine.cpu_family() == 'arm' srcs_xorg_os_support += 'bsd/arm_video.c' - elif host_machine.cpu_family() == 'powerpc' -+ elif host_machine.cpu_family() == 'powerpc' or host_machine.cpu_family() == 'ppc64' ++ elif host_machine.cpu_family() == 'ppc' or host_machine.cpu_family() == 'ppc64' srcs_xorg_os_support += 'bsd/ppc_video.c' elif host_machine.cpu_family() == 'sparc64' srcs_xorg_os_support += 'bsd/sparc64_video.c' diff --git a/x11-servers/xorg-server/files/patch-meson.build b/x11-servers/xorg-server/files/patch-meson.build new file mode 100644 index 000000000000..83f00aa7237e --- /dev/null +++ b/x11-servers/xorg-server/files/patch-meson.build @@ -0,0 +1,11 @@ +--- meson.build.orig 2022-08-05 11:53:38 UTC ++++ meson.build +@@ -249,7 +249,7 @@ if int10 == 'auto' + int10 = get_option('int10') + if int10 == 'auto' + int10 = 'x86emu' +- if host_machine.cpu() == 'powerpc' and host_machine.system() == 'freebsd' ++ if host_machine.cpu() == 'ppc' and host_machine.system() == 'freebsd' + int10 = 'stub' + endif + if host_machine.cpu() == 'arm'