Attachment 237253 Details for Bug 260484 – Updated patch file

[patch] Updated patch file

x11_xorg-cf-files.patch (text/plain), 5.06 KB, created by Yasuhiro Kimura on 2022-10-13 07:14:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2022-10-13 07:14:20 UTC

Size: 5.06 KB

patch

obsolete

>From a0c89fd59911bb939bf5f796c4ec6971ee35dec9 Mon Sep 17 00:00:00 2001
>From: Yasuhiro Kimura <yasu@FreeBSD.org>
>Date: Thu, 13 Oct 2022 15:50:30 +0900
>Subject: [PATCH] x11/xorg-cf-files: Stop using 'l' option with 'ar'
>
>In the ar(1) man page of base system 'l' option is explained as
>following.
>
>     -l      This option is accepted for compatibility with GNU ar(1), but is
>             ignored.
>
>However, since binutils 2.36 GNU ar changed the meaning of 'l'
>option. According to the ar(1) man page of binutils 2.37 it is
>explained as following.
>
>       l   Specify dependencies of this library.  The dependencies must
>           immediately follow this option character, must use the same syntax
>           as the linker command line, and must be specified within a single
>           argument.  I.e., if multiple items are needed, they must be quoted
>           to form a single command line argument.  For example L
>           "-L/usr/local/lib -lmydep1 -lmydep2"
>
>And this incompatible change affects to the build of ports that uses
>'USES=imake' if devel/binutils is installed and /usr/local/bin is
>before /usr/bin in the value of PATH environment variable. For example
>build of textproc/docbook-to-man fails as following.
>
>rm -f libtptregexp.a
>ar clq libtptregexp.a regexp.o regsub.o regerror.o
>ar: libdeps specified more than once
>*** Error code 1
>
>Stop.
>make[3]: stopped in /usr0/freebsd/ports/work/usr/ports/textproc/docbook-to-man/work/docbook-to-man/Instant/tptregexp
>*** Error code 1
>
>Stop.
>make[2]: stopped in /usr0/freebsd/ports/work/usr/ports/textproc/docbook-to-man/work/docbook-to-man/Instant
>*** Error code 1
>
>Stop.
>make[1]: stopped in /usr0/freebsd/ports/work/usr/ports/textproc/docbook-to-man/work/docbook-to-man
>*** Error code 1
>
>Stop.
>make: stopped in /usr/ports/textproc/docbook-to-man
>
>Version 1.0.7 includes the fix of the error but it assumes the issue
>is specific to Linux. So add patch to change source tree so it is also
>fixed on FreeBSD.
>---
> x11/xorg-cf-files/Makefile             |  1 +
> x11/xorg-cf-files/files/patch-binutils | 72 ++++++++++++++++++++++++++
> 2 files changed, 73 insertions(+)
> create mode 100644 x11/xorg-cf-files/files/patch-binutils
>
>diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile
>index 7316d51b5539..991816a7bc41 100644
>--- a/x11/xorg-cf-files/Makefile
>+++ b/x11/xorg-cf-files/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	xorg-cf-files
> PORTVERSION=	1.0.7
>+PORTREVISION=	1
> CATEGORIES=	x11
> 
> MAINTAINER=	x11@FreeBSD.org
>diff --git a/x11/xorg-cf-files/files/patch-binutils b/x11/xorg-cf-files/files/patch-binutils
>new file mode 100644
>index 000000000000..817ea80fc0e4
>--- /dev/null
>+++ b/x11/xorg-cf-files/files/patch-binutils
>@@ -0,0 +1,72 @@
>+From 4192727d86baf84800f97597a110210b038d38b1 Mon Sep 17 00:00:00 2001
>+From: Yasuhiro Kimura <yasu@utahime.org>
>+Date: Thu, 13 Oct 2022 15:22:02 +0900
>+Subject: [PATCH] Fix incompatibility issue of GNU binutils 2.36 and later on
>+ FreeBSD.
>+
>+Commit a6d4d6223ef75119d5373fa4cc04161bcdb4e769 fixes incompatibility
>+issue of GNU binutils 2.36 and later. If I check the diff of the
>+commit, there seems to be asumption that the issue is specific to
>+Linux. But it also happens on FreeBSD if user installs GNU binutils
>+from FreeBSD ports/packages collections and '/usr/local/bin' comes
>+before '/usr/bin' in the value of PATH enviroment variable. So fix the
>+issue also on FreeBSD with following way.
>+
>+1. Introduce new macro 'HasGnuAr'.
>+2. Change Imake.tmpl so it defines 'ArCmd' as 'ArCmdBase cq' if
>+   'HasGnuAr' is defined.
>+3. Define 'HasGnuAr' in both FreeBSD.cf and linux.cf.
>+
>+Since 'ar' command of FreeBSD base system simply ignores 'l' option,
>+it also works fine even if GNU binutils isn't installed.
>+---
>+ FreeBSD.cf | 3 +++
>+ Imake.tmpl | 2 +-
>+ linux.cf   | 4 ++++
>+ 3 files changed, 8 insertions(+), 1 deletion(-)
>+
>+diff --git FreeBSD.cf FreeBSD.cf
>+index 8f9cac3..4a49bda 100644
>+--- FreeBSD.cf
>++++ FreeBSD.cf
>+@@ -153,6 +153,9 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
>+ #ifndef HasFlex
>+ #define HasFlex			YES
>+ #endif
>++#ifndef HasGnuAr
>++#define HasGnuAr		YES
>++#endif
>+ 
>+ #ifndef HasMktemp
>+ #if (OSMajorVersion >= 4) || (OSMajorVersion == 3 && OSMinorVersion >= 1) || \
>+diff --git Imake.tmpl Imake.tmpl
>+index 8c26d56..0f8832f 100644
>+--- Imake.tmpl
>++++ Imake.tmpl
>+@@ -1078,7 +1078,7 @@ TCLIBDIR = TclLibDir
>+ #define ArCmdBase ar
>+ #endif
>+ #ifndef ArCmd
>+-#if HasLargeTmp || SystemV4 || LinuxBinUtilsMajorVersion
>++#if HasLargeTmp || SystemV4 || HasGnuAr
>+ #define ArCmd ArCmdBase cq
>+ #else
>+ #define ArCmd ArCmdBase clq
>+diff --git linux.cf linux.cf
>+index 517ae5c..5a6580d 100644
>+--- linux.cf
>++++ linux.cf
>+@@ -90,6 +90,10 @@ XCOMM platform:  $XFree86: xc/config/cf/linux.cf,v 3.220 2003/12/30 22:38:33 tsi
>+ # define LinuxBinUtilsMajorVersion	DefaultLinuxBinUtilsMajorVersion
>+ #endif
>+ 
>++#ifndef HasGnuAr
>++#define HasGnuAr	YES
>++#endif
>++
>+ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
>+ XCOMM libc:	(LinuxCLibMajorVersion./**/LinuxCLibMinorVersion./**/LinuxCLibTeenyVersion)
>+ XCOMM binutils:	(LinuxBinUtilsMajorVersion)
>+-- 
>+2.38.0
>+
>-- 
>2.38.0
>

Actions: View | Diff

Attachments on bug 260484: 230189 | 230194 | 237253 | 242681