Attachment 230194 Details for Bug 260484 – Updated patch file

[patch] Updated patch file

x11_xorg-cf-files.patch (text/plain), 5.04 KB, created by Yasuhiro Kimura on 2021-12-17 06:46:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2021-12-17 06:46:47 UTC

Size: 5.04 KB

patch

obsolete

>From 949d7e4778a85fbc6b91533e64934748058b4340 Mon Sep 17 00:00:00 2001
>From: Yasuhiro Kimura <yasu@FreeBSD.org>
>Date: Fri, 17 Dec 2021 15:34:28 +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 add definition of ArCmd, ArAddCmd and ArExtCmd in FreeBSD.cf
>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-FreeBSD.cf | 43 ++++++++++++++++--------
> 2 files changed, 30 insertions(+), 14 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-FreeBSD.cf b/x11/xorg-cf-files/files/patch-FreeBSD.cf
>index 827c369e239a..b133b8ccebea 100644
>--- a/x11/xorg-cf-files/files/patch-FreeBSD.cf
>+++ b/x11/xorg-cf-files/files/patch-FreeBSD.cf
>@@ -1,6 +1,6 @@
>---- ./FreeBSD.cf.orig	2009-10-16 23:45:42.000000000 +0200
>-+++ ./FreeBSD.cf	2013-06-27 17:14:30.661790922 +0200
>-@@ -78,6 +78,7 @@
>+--- FreeBSD.cf.orig	2015-12-22 01:28:02 UTC
>++++ FreeBSD.cf
>+@@ -78,6 +78,7 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
>  #define HasIssetugid		YES
>  #define HasPoll			YES
>  #endif
>@@ -8,7 +8,7 @@
>  
>  #if OSMajorVersion >= 4
>  #define HasGetIfAddrs		YES
>-@@ -117,14 +118,8 @@
>+@@ -117,14 +118,8 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
>  # if (OSRelVersion < 500043)
>  #  define NeedUIThrStubs	YES
>  # endif
>@@ -25,7 +25,22 @@
>  #endif
>  
>  /* This fixes linking C programs against libGLU on FreeBSD 3.x */
>-@@ -178,7 +173,9 @@
>+@@ -172,13 +167,24 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
>+ #endif
>+ #endif
>+ 
>++#ifndef ArCmd
>++#define ArCmd			ar cq
>++#endif
>++#ifndef ArAddCmd
>++#define ArAddCmd		ar ru
>++#endif
>++#ifndef ArExtCmd
>++#define ArExtCmd		ar x
>++#endif
>+ #ifndef CcCmd
>+ #define CcCmd			cc
>+ #endif
>  #ifndef CplusplusCmd
>  #define CplusplusCmd		c++
>  #endif
>@@ -35,7 +50,7 @@
>  #define PreProcessCmd		CppCmd
>  #define StandardCppOptions	-traditional
>  #define StandardCppDefines	/**/
>-@@ -338,7 +335,7 @@
>+@@ -338,7 +344,7 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
>  #ifndef LibraryRpathLoadFlags
>  # if UseRpath
>  #  if UseElfFormat
>@@ -44,7 +59,7 @@
>  #  else
>  #   define LibraryRpathLoadFlags	-R $(USRLIBDIRPATH)
>  #  endif
>-@@ -470,14 +467,14 @@
>+@@ -470,14 +476,14 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
>  /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
>  #ifndef DefaultGcc2i386Opt
>  #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
>@@ -61,14 +76,14 @@
>  #endif
>  
>  #ifndef PreIncDir
>-@@ -498,6 +495,10 @@
>+@@ -496,6 +502,10 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OS
>+ #define DefaultSystemPath	/bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR)
>+ #ifndef SystemManDirectory
>  #define SystemManDirectory	/usr/share/man
>- #endif
>- 
>-+#ifndef UseConfDirForAppDefaults
>-+#define UseConfDirForAppDefaults	NO
> +#endif
> +
>- #define InstKmemFlags	-g kmem -m 2755
>++#ifndef UseConfDirForAppDefaults
>++#define UseConfDirForAppDefaults	NO
>+ #endif
>  
>- /*
>+ #define InstKmemFlags	-g kmem -m 2755
>-- 
>2.34.1
>

Actions: View | Diff

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