Bug 248101

Summary: emulators/qemu-utils fails build due to FreeBSD patches
Product: Ports & Packages Reporter: tech-lists
Component: Individual Port(s)Assignee: Kenneth D. Merry <ken>
Status: Closed FIXED    
Severity: Affects Only Me CC: dinoex
Priority: --- Flags: bugzilla: maintainer-feedback? (ken)
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
patch none

Description tech-lists 2020-07-19 12:51:40 UTC 
Hi,

portstree is at 542441

[00:00:00] package name: qemu-utils-4.2.1
[00:00:00] building for: FreeBSD pkg.zyxst.net 12.1-STABLE FreeBSD 12.1-STABLE 1201519 amd64
[00:00:00] maintained by: ken@FreeBSD.org
[00:00:00] Makefile ident:      $FreeBSD: head/emulators/qemu-utils/Makefile 518782 2019-12-01 15:52:07Z asomers $
[00:00:00] Poudriere version: 3.3.99.20200326
[00:00:00] Host OSVERSION: 1201519
[00:00:00] Jail OSVERSION: 1201519

[...]

fails here:

[00:00:18] ===========================================================================
[00:00:18] =======================<phase: patch-depends  >============================
[00:00:18] ===========================================================================
[00:00:18] =======================<phase: patch          >============================
[00:00:18] ===>  Patching for qemu-utils-4.2.1
[00:00:18] ===>  Applying extra patch /usr/ports/emulators/qemu-utils/files/patch-configure
[00:00:18] ===>  Applying FreeBSD patches for qemu-utils-4.2.1 from /usr/ports/emulators/qemu-utils/../qemu/files
[00:00:18] No file to patch.  Skipping...
[00:00:18] 1 out of 1 hunks ignored--saving rejects to pc-bios/spapr-rtas/Makefile.rej
[00:00:18] Can't create pc-bios/spapr-rtas/Makefile.rej, output is in /tmp/patchrNks1DS6kzt: No such file or directory
[00:00:18] ===>  FAILED Applying FreeBSD patch-pc-bios_spapr-rtas_Makefile
[00:00:18] ===> Cleanly applied FreeBSD patch(es)  patch-Makefile patch-configure patch-disas_libvixl_vixl_a64_disasm-a64.cc patch-include_net_net.h patch-include_qemu_atomic.h patch-net_tap-bsd.c
[00:00:18] ===> FAILED to apply cleanly FreeBSD patch(es)  patch-pc-bios_spapr-rtas_Makefile
[00:00:18] *** Error code 1
[00:00:18] 
[00:00:18] Stop.
[00:00:18] make: stopped in /usr/ports/emulators/qemu-utils
[00:03:30] =>> Cleaning up wrkdir
[00:03:30] ===>  Cleaning for qemu-utils-4.2.1
[00:03:31] build of emulators/qemu-utils | qemu-utils-4.2.1 ended at Sun Jul 19 05:04:29 BST 2020
[00:03:31] build time: 00:03:31
[00:03:31] !!! build failure encountered !!!
Comment 1 tech-lists 2020-07-25 12:43:44 UTC 
Slightly different error message now. Ports is at 543401 now:

[00:01:34] ===>   qemu-utils-4.2.1 depends on shared library: libglib-2.0.so - found (/usr/local/lib/libglib-2.0.so)
[00:01:34] ===>   Returning to build of qemu-utils-4.2.1
[00:01:34] ===>   qemu-utils-4.2.1 depends on shared library: libintl.so - found (/usr/local/lib/libintl.so)
[00:01:34] ===========================================================================
[00:01:34] =======================<phase: configure      >============================
[00:01:35] ===>  Configuring for qemu-utils-4.2.1
[00:01:35] /usr/bin/patch /wrkdirs/usr/ports/emulators/qemu-utils/work/qemu-4.2.1/Makefile /usr/ports/emulators/qemu-utils/files/patch-Makefile
[00:01:35] Hmm...  Looks like a unified diff to me...
[00:01:35] The text leading up to this was:
[00:01:35] --------------------------
[00:01:35] |--- Makefile.orig	2019-08-08 19:18:25.578250000 +0000
[00:01:35] |+++ Makefile	2019-08-08 19:20:21.482341000 +0000
[00:01:35] --------------------------
[00:01:35] Patching file /wrkdirs/usr/ports/emulators/qemu-utils/work/qemu-4.2.1/Makefile using Plan A...
[00:01:35] Hunk #1 failed at 355.
[00:01:35] Hunk #2 failed at 828.
[00:01:35] Hunk #3 succeeded at 932 with fuzz 2 (offset 47 lines).
[00:01:35] 2 out of 3 hunks failed--saving rejects to /wrkdirs/usr/ports/emulators/qemu-utils/work/qemu-4.2.1/Makefile.rej
[00:01:35] done
[00:01:35] *** Error code 1
[00:01:35] 
[00:01:35] Stop.
[00:01:35] make: stopped in /usr/ports/emulators/qemu-utils
[00:25:44] =>> Cleaning up wrkdir
[00:25:47] ===>  Cleaning for qemu-utils-4.2.1
[00:25:52] build of emulators/qemu-utils | qemu-utils-4.2.1 ended at Sat Jul 25 05:28:27 BST 2020
[00:25:52] build time: 00:25:51
[00:25:52] !!! build failure encountered !!!
Comment 2 Dirk Meyer freebsd_committer freebsd_triage 2020-09-18 12:15:47 UTC 
Created attachment 218050 [details]
patch

With this patch applied the package build successful.
Comment 3 tech-lists 2020-09-19 19:01:57 UTC 
(In reply to Dirk Meyer from comment #2)

Can confirm, thank you very much :D

(patched against ports r549048)
Comment 4 Dirk Meyer freebsd_committer freebsd_triage 2020-09-22 21:09:04 UTC 
port is still not patched yet.
waiting for maintainer approval.
Comment 5 Kenneth D. Merry freebsd_committer freebsd_triage 2020-09-22 21:14:44 UTC 
Looks good, Dirk can you commit it?

Thanks!
Comment 6 commit-hook freebsd_committer freebsd_triage 2020-09-23 09:26:25 UTC 
A commit references this bug:

Author: dinoex
Date: Wed Sep 23 09:25:46 UTC 2020
New revision: 549674
URL: https://svnweb.freebsd.org/changeset/ports/549674

Log:
  - fix build
  PR:		248101
  Approved by:	ken

Changes:
  head/emulators/qemu-utils/Makefile
  head/emulators/qemu-utils/files/patch-Makefile
Comment 7 Dirk Meyer freebsd_committer freebsd_triage 2020-09-23 11:43:02 UTC 
Committed, Thanks.