From nobody Sun Dec 28 06:33:57 2025 X-Original-To: dev-commits-ports-all@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 4df8h53fctz6MX93 for ; Sun, 28 Dec 2025 06:33:57 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4df8h52ljWz3KJx for ; Sun, 28 Dec 2025 06:33:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766903637; 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=yuiW56ObMT9oi55xdugJpU0JR5DMn5JNqllFUbj6Kw0=; b=pIj5uvgyzEZU0DO1pPJdz0eIFn4Bm2rxIfg8RnIUxO80vsGWlys3BfXjy3pcTTcuyKWHZk 4U/ayaz3OSpABDaC7Dwpf7CwFAbLktYdjj38/xcmtrOHHlw5xBkTBIqRyI6x5ShbHjxpaR 7PuxvNZ8pmVS5Y+r5mJi4S8RG/qscfoSDM1zsj13ybiEoGApzu0IGkDy1qJwJ62J1TESmY xkvwzIoj5vCSHPF4ni6qK0oFkKsWhPlDACZZxZ9oDuxdKDj0JXHiDIpxIGkQvlEME4+x1m FCwyEnUuHkmlcc9/T6kbrXhRA2tj2jZn8mBIBjsYxuGpZWJHG21mqA7etV6FFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766903637; 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=yuiW56ObMT9oi55xdugJpU0JR5DMn5JNqllFUbj6Kw0=; b=Zzw54kBk2N8bw+soEa5oYwD1cP9JhAYGuVDj3UNbxzG3VtSrdQZg/uDijzD3ZrpSAMEzSu 3PlLpRDURSn37HOZ5CgNseBqzY0Db6+iMYE6tCvlCUJqSwf7PKef9AApaQThwz8cRwYAeV uNNgd59KqN2bqzNTO04HQVOodcdeugZC0iyXS3++K8EdQXfZHHF/++6pc/KZvt97zpPPsS mXMnz3Q1C0L6zln89N5UrzMum5mQ+K/j2ODywQUuJDdsIFeQ7KfobI1oFXIBY+iJ9Bc1Wg nCTcgDHINZ9Fsu4FDDwGk3G01c6LZny8ZL1PAH8d568P4NijSCCI7WrHR6WGww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766903637; a=rsa-sha256; cv=none; b=YY/fHgQ5HOTUjHn0MZ+B95qkHrIbpaXLsHd+q297CnlRsy/h70rf73+1FIgFswsWVz/qDA 8e20eJVQWYy5/822olIV3PmsZQLeDM47DiDrG34Qm1hU5EXyNmyYOP3k7Y3Bj5eIG1Qbxl fSSa/1o4VQlKVcqGqGzi5XmONGb7fe8pJWmBiGkrXiq9eaq3by7JHes2glizdwIbFC/sa7 ymuLNzlfsHxYE76BlHSHM97wyd5sRvshDyn/Y7i/khjFMlbcJBbmx0K7eeQc2D9whfIXKQ c+ANLJGvSV2Xmgq8XzIF/os1OU3tH6OqBoLPwvXkv2zoA0yRxZHRe7/7ma4zTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4df8h52239zZBt for ; Sun, 28 Dec 2025 06:33:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32691 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Dec 2025 06:33:57 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Don Lewis Subject: git: f1aef852ca18 - main - editors/openoffice-*: sporadic parallel build fail List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: truckman X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f1aef852ca18b2d749a8c14f35cdbf879f51095d Auto-Submitted: auto-generated Date: Sun, 28 Dec 2025 06:33:57 +0000 Message-Id: <6950cf55.32691.73151a36@gitrepo.freebsd.org> The branch main has been updated by truckman: URL: https://cgit.FreeBSD.org/ports/commit/?id=f1aef852ca18b2d749a8c14f35cdbf879f51095d commit f1aef852ca18b2d749a8c14f35cdbf879f51095d Author: Don Lewis AuthorDate: 2025-12-28 06:22:42 +0000 Commit: Don Lewis CommitDate: 2025-12-28 06:30:02 +0000 editors/openoffice-*: sporadic parallel build fail Attempt to fix an intermittent parallel build failure in the icu module by tweaking a dependency in one of the makefiles. pet portlint No PORTREVISION bump because the package is not changed. --- .../files/patch-icu_icu-parallel-build.patch | 23 ++++++++++++++++++++++ editors/openoffice-4/files/patch-icu_makefile.mk | 10 ++++++++++ editors/openoffice-devel/Makefile | 2 +- .../files/patch-icu_icu-parallel-build.patch | 23 ++++++++++++++++++++++ .../openoffice-devel/files/patch-icu_makefile.mk | 10 ++++++++++ 5 files changed, 67 insertions(+), 1 deletion(-) diff --git a/editors/openoffice-4/files/patch-icu_icu-parallel-build.patch b/editors/openoffice-4/files/patch-icu_icu-parallel-build.patch new file mode 100644 index 000000000000..c2cddf33eb54 --- /dev/null +++ b/editors/openoffice-4/files/patch-icu_icu-parallel-build.patch @@ -0,0 +1,23 @@ +--- icu/icu-parallel-build.patch.orig 2025-12-27 09:03:46 UTC ++++ icu/icu-parallel-build.patch +@@ -0,0 +1,20 @@ ++diff -ur misc/icu/source/extra/uconv/Makefile.in misc/build/icu/source/extra/uconv/Makefile.in ++--- misc/icu/source/extra/uconv/Makefile.in 2009-07-01 11:50:32.000000000 -0700 +++++ misc/build/icu/source/extra/uconv/Makefile.in ++@@ -140,14 +140,14 @@ ++ $(LINK.cc) $(OUTOPT)$@ $(OBJECTS) $(LIBS) ++ $(POST_BUILD_STEP) ++ ++-resfiles: $(RESFILES) package-resfiles +++resfiles: package-resfiles ++ ++ ifeq ($(UCONVMSG_STATIC),YES) ++ $(UCONVMSG_LIB): resfiles ++ endif ++ ++ ++-package-resfiles: $(RESDIR)/$(RESDIR).lst pkgdata.inc +++package-resfiles: $(RESFILES) $(RESDIR)/$(RESDIR).lst pkgdata.inc $(RESFILES) ++ $(INVOKE) $(PKGDATA_INVOKE_OPTS) $(TOOLBINDIR)/pkgdata -p $(MSGNAME) $(PKGDATA_OPTS) -m $(PKGMODE) -s $(RESDIR) -d $(RESDIR) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst ++ ++ $(RESDIR)/$(RESDIR).lst: Makefile $(srcdir)/resfiles.mk diff --git a/editors/openoffice-4/files/patch-icu_makefile.mk b/editors/openoffice-4/files/patch-icu_makefile.mk new file mode 100644 index 000000000000..bfb383fe9db3 --- /dev/null +++ b/editors/openoffice-4/files/patch-icu_makefile.mk @@ -0,0 +1,10 @@ +--- icu/makefile.mk.orig 2025-12-27 09:25:15 UTC ++++ icu/makefile.mk +@@ -44,6 +44,7 @@ PATCH_FILES=${TARFILE_NAME}.patch icu-win-layout.patch + + # TODO file icu-mp.patch does not seem to be required + PATCH_FILES=${TARFILE_NAME}.patch icu-win-layout.patch \ ++ icu-parallel-build.patch \ + icu-format-security.patch icu-win-icutu-dll-version.patch + .IF "$(OS)"=="MACOSX" + PATCH_FILES+=icu-darwin.patch diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index d49fbb25f3ef..7693a29da70c 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -229,7 +229,7 @@ WITH= SDK .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1500000 # nm: '../unxfbsdi.pro/slo/b2dcubicbezier.o': Invalid argument -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-nm +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-nm .endif .if defined(WITH_DEBUG) diff --git a/editors/openoffice-devel/files/patch-icu_icu-parallel-build.patch b/editors/openoffice-devel/files/patch-icu_icu-parallel-build.patch new file mode 100644 index 000000000000..c2cddf33eb54 --- /dev/null +++ b/editors/openoffice-devel/files/patch-icu_icu-parallel-build.patch @@ -0,0 +1,23 @@ +--- icu/icu-parallel-build.patch.orig 2025-12-27 09:03:46 UTC ++++ icu/icu-parallel-build.patch +@@ -0,0 +1,20 @@ ++diff -ur misc/icu/source/extra/uconv/Makefile.in misc/build/icu/source/extra/uconv/Makefile.in ++--- misc/icu/source/extra/uconv/Makefile.in 2009-07-01 11:50:32.000000000 -0700 +++++ misc/build/icu/source/extra/uconv/Makefile.in ++@@ -140,14 +140,14 @@ ++ $(LINK.cc) $(OUTOPT)$@ $(OBJECTS) $(LIBS) ++ $(POST_BUILD_STEP) ++ ++-resfiles: $(RESFILES) package-resfiles +++resfiles: package-resfiles ++ ++ ifeq ($(UCONVMSG_STATIC),YES) ++ $(UCONVMSG_LIB): resfiles ++ endif ++ ++ ++-package-resfiles: $(RESDIR)/$(RESDIR).lst pkgdata.inc +++package-resfiles: $(RESFILES) $(RESDIR)/$(RESDIR).lst pkgdata.inc $(RESFILES) ++ $(INVOKE) $(PKGDATA_INVOKE_OPTS) $(TOOLBINDIR)/pkgdata -p $(MSGNAME) $(PKGDATA_OPTS) -m $(PKGMODE) -s $(RESDIR) -d $(RESDIR) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst ++ ++ $(RESDIR)/$(RESDIR).lst: Makefile $(srcdir)/resfiles.mk diff --git a/editors/openoffice-devel/files/patch-icu_makefile.mk b/editors/openoffice-devel/files/patch-icu_makefile.mk new file mode 100644 index 000000000000..020ad4af9766 --- /dev/null +++ b/editors/openoffice-devel/files/patch-icu_makefile.mk @@ -0,0 +1,10 @@ +--- icu/makefile.mk.orig 2025-09-13 05:44:18 UTC ++++ icu/makefile.mk +@@ -44,6 +44,7 @@ PATCH_FILES=${TARFILE_NAME}.patch icu-win-layout.patch + + # TODO file icu-mp.patch does not seem to be required + PATCH_FILES=${TARFILE_NAME}.patch icu-win-layout.patch \ ++ icu-parallel-build.patch \ + icu-format-security.patch icu-win-icutu-dll-version.patch + + .IF "$(OS)"=="MACOSX"