Attachment 230189 Details for Bug 260484 – Patch file

[patch] Patch file

x11_xorg-cf-files.patch (text/plain), 4.10 KB, created by Yasuhiro Kimura on 2021-12-17 02:50:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2021-12-17 02:50:40 UTC

Size: 4.10 KB

patch

obsolete

>From 7e2c6188d9317066a7e0b4cc13e5225dd59559a0 Mon Sep 17 00:00:00 2001
>From: Yasuhiro Kimura <yasu@FreeBSD.org>
>Date: Fri, 17 Dec 2021 11:16:47 +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
>
>Therefore change Imake.tmpl so 'l' options isn't used with 'ar'. As is
>explained above 'ar' of base system ignores 'l' option. So it should
>work fine even if devel/binutils isn't installed and 'ar' of base
>system is used.
>---
> x11/xorg-cf-files/Makefile               |  1 +
> x11/xorg-cf-files/files/patch-Imake.tmpl | 35 +++++++++++++++++++++---
> 2 files changed, 32 insertions(+), 4 deletions(-)
>
>diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile
>index 1bf0ef788ea4..ff35219e7f1d 100644
>--- a/x11/xorg-cf-files/Makefile
>+++ b/x11/xorg-cf-files/Makefile
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	xorg-cf-files
> PORTVERSION=	1.0.6
>+PORTREVISION=	1
> CATEGORIES=	x11
> 
> MAINTAINER=	x11@FreeBSD.org
>diff --git a/x11/xorg-cf-files/files/patch-Imake.tmpl b/x11/xorg-cf-files/files/patch-Imake.tmpl
>index 442fb64463b3..210f025cbc0f 100644
>--- a/x11/xorg-cf-files/files/patch-Imake.tmpl
>+++ b/x11/xorg-cf-files/files/patch-Imake.tmpl
>@@ -1,6 +1,33 @@
>---- Imake.tmpl.orig	Tue Jul 27 20:24:29 2004
>-+++ Imake.tmpl	Fri Sep 10 18:45:12 2004
>-@@ -1798,7 +1798,7 @@
>+--- Imake.tmpl.orig	2015-12-22 01:28:02 UTC
>++++ Imake.tmpl
>+@@ -1078,26 +1078,14 @@ TCLIBDIR = TclLibDir
>+ #define ArCmdBase ar
>+ #endif
>+ #ifndef ArCmd
>+-#if HasLargeTmp || SystemV4
>+ #define ArCmd ArCmdBase cq
>+-#else
>+-#define ArCmd ArCmdBase clq
>+ #endif
>+-#endif
>+ #ifndef ArAddCmd
>+-#if HasLargeTmp || SystemV4
>+ #define ArAddCmd ArCmdBase ru
>+-#else
>+-#define ArAddCmd ArCmdBase rul
>+ #endif
>+-#endif
>+ #ifndef ArExtCmd
>+-#if HasLargeTmp || SystemV4
>+ #define ArExtCmd ArCmdBase x
>+-#else
>+-#define ArExtCmd ArCmdBase xl
>+ #endif
>+-#endif
>+ #ifndef BootstrapCFlags
>+ #define BootstrapCFlags /**/
>+ #endif
>+@@ -1823,7 +1811,7 @@ CXXEXTRA_INCLUDES = CplusplusExtraIncludes
>         CXXOPTIONS = CplusplusOptions
>        CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES)
>         CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(DEFINES) $(CXXEXTRA_DEFINES)
>@@ -9,7 +36,7 @@
>  #endif
>           COMPRESS = CompressCmd
>            GZIPCMD = GzipCmd
>-@@ -2038,7 +2038,7 @@
>+@@ -2073,7 +2061,7 @@ MODLDCOMBINEFLAGS = ModuleLdCombineFlags
>   */
>        ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
>         ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
>-- 
>2.34.1
>

Actions: View | Diff

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