kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pull over / convert to upstream fixes for newer binutils

Browse source 
90b66dc73d

also apply to a couple of other ArCmd uses.  thanks tnn@ for pointing
me to the above change.

bump pkg revision.
This commit is contained in:
mrg 2023-01-20 22:46:34 +00:00
parent d1a81d3583
commit 4d0253611a
6 changed files with 90 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
x11/xorg-cf-files/Makefile
View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.40 2023/01/17 05:28:59 mrg Exp $ # $NetBSD: Makefile,v 1.41 2023/01/20 22:46:34 mrg Exp $
DISTNAME= xorg-cf-files-1.0.7 DISTNAME= xorg-cf-files-1.0.7
PKGREVISION= 1 PKGREVISION= 2
CATEGORIES= x11 devel CATEGORIES= x11 devel
MASTER_SITES= ${MASTER_SITE_XORG:=util/} MASTER_SITES= ${MASTER_SITE_XORG:=util/}
EXTRACT_SUFX= .tar.bz2 EXTRACT_SUFX= .tar.bz2

10
x11/xorg-cf-files/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.35 2023/01/17 05:28:59 mrg Exp $ $NetBSD: distinfo,v 1.36 2023/01/20 22:46:34 mrg Exp $
BLAKE2s (xorg-cf-files-1.0.7.tar.bz2) = 7c971e7951a9369904f766fb5a9e6c78fd07703131e2a042e858e53480f27fd7 BLAKE2s (xorg-cf-files-1.0.7.tar.bz2) = 7c971e7951a9369904f766fb5a9e6c78fd07703131e2a042e858e53480f27fd7
SHA512 (xorg-cf-files-1.0.7.tar.bz2) = 0dd73b9db9fc16bddc94ef23f11434be6ea2f8e0c7bc5ef3c3bfe6749e13843f88d397eed9f980bbbe9e74147172326bd3c3ccb7adedc9150302756e4b07191e SHA512 (xorg-cf-files-1.0.7.tar.bz2) = 0dd73b9db9fc16bddc94ef23f11434be6ea2f8e0c7bc5ef3c3bfe6749e13843f88d397eed9f980bbbe9e74147172326bd3c3ccb7adedc9150302756e4b07191e
@ -6,15 +6,15 @@ Size (xorg-cf-files-1.0.7.tar.bz2) = 345575 bytes
SHA1 (patch-OpenBSDLib.rules) = 65b02b660839adb6e9c13287396a794a4586d927 SHA1 (patch-OpenBSDLib.rules) = 65b02b660839adb6e9c13287396a794a4586d927
SHA1 (patch-X11.rules) = 2dac9bcc111f63b2dd887967ea5fab656f52f06b SHA1 (patch-X11.rules) = 2dac9bcc111f63b2dd887967ea5fab656f52f06b
SHA1 (patch-X11.tmpl) = 3f0c5b8ad7a60cd0e1e47afcddaace936b9aaeed SHA1 (patch-X11.tmpl) = 3f0c5b8ad7a60cd0e1e47afcddaace936b9aaeed
SHA1 (patch-aa) = a5edc4de740bc20f173a8deaa0d0a68f06955a08 SHA1 (patch-aa) = 850672428eec76facfc7862bb9a2a8e1a00ee56d
SHA1 (patch-ab) = f8f816409eb233ae4d8430bd9d43b9bf83c5711d SHA1 (patch-ab) = c30b0ac9e661aa76a65877ef7cd4c422a8f0405b
SHA1 (patch-ac) = 1f977650d9e903a4ea72afc8541b7649cb989ab8 SHA1 (patch-ac) = e084d790e7713897ba2366145b2088f933aa94e0
SHA1 (patch-ad) = fcdddf191f676287b7f42e2b16729ed34afc6786 SHA1 (patch-ad) = fcdddf191f676287b7f42e2b16729ed34afc6786
SHA1 (patch-ae) = d89ea1af22b3d0fab3cc431e3353c9efe4a92264 SHA1 (patch-ae) = d89ea1af22b3d0fab3cc431e3353c9efe4a92264
SHA1 (patch-af) = 42c0e0738a5ca20c2f7aa09684630093970c1dee SHA1 (patch-af) = 42c0e0738a5ca20c2f7aa09684630093970c1dee
SHA1 (patch-ag) = b7c07619141df8d8ae718732343fd185098bdafb SHA1 (patch-ag) = b7c07619141df8d8ae718732343fd185098bdafb
SHA1 (patch-ah) = 9b64b2e5f419ab190d47dd8156b8f84634fd6a36 SHA1 (patch-ah) = 9b64b2e5f419ab190d47dd8156b8f84634fd6a36
SHA1 (patch-ai) = 62867c76ddc14d2e87a04325057a80beb9f116b8 SHA1 (patch-ai) = ec2523615802a89c63d7015089a908133438b812
SHA1 (patch-aj) = 3be677041b6bff008caa1375d1e6dd5c90d9f501 SHA1 (patch-aj) = 3be677041b6bff008caa1375d1e6dd5c90d9f501
SHA1 (patch-ak) = ec4e8c30782e3081a84b8c3bd8ab71961a0f13cb SHA1 (patch-ak) = ec4e8c30782e3081a84b8c3bd8ab71961a0f13cb
SHA1 (patch-gnuLib.rules) = 44a39881b4f4b6a10250f7ae4b4508af76cef71d SHA1 (patch-gnuLib.rules) = 44a39881b4f4b6a10250f7ae4b4508af76cef71d

51
x11/xorg-cf-files/patches/patch-aa
View file

@ -1,8 +1,8 @@
$NetBSD: patch-aa,v 1.5 2022/12/01 21:14:09 jperkin Exp $ $NetBSD: patch-aa,v 1.6 2023/01/20 22:46:34 mrg Exp $
--- NetBSD.cf.orig 2021-08-02 01:00:38 --- NetBSD.cf.orig 2021-08-01 18:00:38.000000000 -0700
+++ NetBSD.cf +++ NetBSD.cf 2023-01-18 14:02:16.164685843 -0800
@@ -126,7 +126,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS @@ -126,7 +126,7 @@ XCOMM operating system: OSName (OSMajor
# if ((OSMajorVersion == 2 && OSMinorVersion == 99 && OSTeenyVersion < 11) || \ # if ((OSMajorVersion == 2 && OSMinorVersion == 99 && OSTeenyVersion < 11) || \
(OSMajorVersion == 2 && OSMinorVersion < 99) || \ (OSMajorVersion == 2 && OSMinorVersion < 99) || \
(OSMajorVersion < 2)) (OSMajorVersion < 2))
@ -11,25 +11,7 @@ $NetBSD: patch-aa,v 1.5 2022/12/01 21:14:09 jperkin Exp $
# endif # endif
# define SystemMTDefines -D_REENTRANT # define SystemMTDefines -D_REENTRANT
# define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI # define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
@@ -150,7 +150,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS @@ -199,6 +199,8 @@ XCOMM operating system: OSName (OSMajor
#define MkdirHierCmd mkdir -p
#undef CcCmd
-#define CcCmd gcc
+#define CcCmd @@PKGSRC_CC@@
#ifndef DefaultCCOptions
#if defined(UseInstalled)
#define DefaultCCOptions /**/
@@ -166,7 +166,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
#endif
#endif
-#define CppCmd cpp
+#define CppCmd @@PKGSRC_CPP@@
#define StandardCppOptions -traditional
#define StandardCppDefines /**/
#define PreProcessCmd CcCmd -E
@@ -199,6 +199,8 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
# ifndef DoLoadableServer # ifndef DoLoadableServer
# define DoLoadableServer YES # define DoLoadableServer YES
# endif # endif
@ -38,14 +20,25 @@ $NetBSD: patch-aa,v 1.5 2022/12/01 21:14:09 jperkin Exp $
#else #else
# ifndef DoLoadableServer # ifndef DoLoadableServer
# define DoLoadableServer NO # define DoLoadableServer NO
@@ -342,6 +344,10 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS @@ -333,6 +335,10 @@ XCOMM operating system: OSName (OSMajor
*/
#ifndef HasPerl #define HasFlex YES
#define HasPerl NO
+#ifndef HasGnuAr
+#define HasGnuAr YES
+#endif +#endif
+ +
+#if defined(AMD64Architecture) /* NetBSD doesn't have gperf in the base install */
+# define HasMTRRBuiltin YES #define DontRebuildGperfOutput YES
@@ -344,6 +350,10 @@ XCOMM operating system: OSName (OSMajor
#define HasPerl NO
#endif #endif
+#if defined(AMD64Architecture)
+# define HasMTRRBuiltin YES
+#endif
+
/* /*
* NetBSD doesn't have gperf in default system
* you may override this in host.def if you installed perl from the packages

31
x11/xorg-cf-files/patches/patch-ab
View file

@ -1,33 +1,42 @@
$NetBSD: patch-ab,v 1.2 2010/05/21 22:09:43 schwarz Exp $ $NetBSD: patch-ab,v 1.3 2023/01/20 22:46:34 mrg Exp $
--- FreeBSD.cf.orig 2010-05-16 12:24:16.000000000 +0200 --- FreeBSD.cf.orig 2021-08-01 18:00:38.000000000 -0700
+++ FreeBSD.cf 2010-05-16 12:24:38.000000000 +0200 +++ FreeBSD.cf 2023-01-18 14:01:52.364609268 -0800
@@ -173,12 +173,12 @@ @@ -153,6 +153,9 @@ XCOMM operating system: OSName (OSMajor
#ifndef HasFlex
#define HasFlex YES
#endif
+#ifndef HasGnuAr
+#define HasGnuAr YES
+#endif
#ifndef HasMktemp
#if (OSMajorVersion >= 4) || (OSMajorVersion == 3 && OSMinorVersion >= 1) || \
@@ -173,12 +176,12 @@ XCOMM operating system: OSName (OSMajor
#endif #endif
#ifndef CcCmd #ifndef CcCmd
-#define CcCmd cc -#define CcCmd cc
+#define CcCmd @@PKGSRC_CC@@ +#define CcCmd gcc
#endif #endif
#ifndef CplusplusCmd #ifndef CplusplusCmd
-#define CplusplusCmd c++ #define CplusplusCmd c++
+#define CplusplusCmd @@PKGSRC_CXX@@
#endif #endif
-#define CppCmd /usr/bin/cpp -#define CppCmd /usr/bin/cpp
+#define CppCmd @@PKGSRC_CPP@@ +#define CppCmd cpp
#define PreProcessCmd CppCmd #define PreProcessCmd CppCmd
#define StandardCppOptions -traditional #define StandardCppOptions -traditional
#define StandardCppDefines /**/ #define StandardCppDefines /**/
@@ -470,7 +470,7 @@ @@ -470,7 +473,7 @@ XCOMM operating system: OSName (OSMajor
/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */ /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
#ifndef DefaultGcc2i386Opt #ifndef DefaultGcc2i386Opt
#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5) #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
-#define DefaultGcc2i386Opt -O2 GccAliasingArgs -#define DefaultGcc2i386Opt -O2 GccAliasingArgs
+#define DefaultGcc2i386Opt @@PKGSRC_CFLAGS@@ +#define DefaultGcc2i386Opt -O2 -fPIC -D_FORTIFY_SOURCE=2 -I/usr/pkg/include -I/usr/X11R7/include
#endif #endif
#endif #endif
@@ -504,7 +504,7 @@ @@ -504,7 +507,7 @@ XCOMM operating system: OSName (OSMajor
* Compress manual pages * Compress manual pages
*/ */
#ifndef CompressManPages #ifndef CompressManPages

42
x11/xorg-cf-files/patches/patch-ac
View file

@ -1,32 +1,32 @@
$NetBSD: patch-ac,v 1.4 2008/01/12 21:57:04 joerg Exp $ $NetBSD: patch-ac,v 1.5 2023/01/20 22:46:34 mrg Exp $
--- linux.cf.orig 2005-10-21 21:10:27.000000000 +0200 --- linux.cf.orig 2021-08-01 18:00:38.000000000 -0700
+++ linux.cf +++ linux.cf 2023-01-18 14:02:08.805022786 -0800
@@ -609,10 +609,10 @@ InstallNamedTargetNoClobber(install,file @@ -90,6 +90,10 @@ XCOMM platform: $XFree86: xc/config/cf/
# 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)
@@ -615,10 +619,10 @@ InstallNamedTargetNoClobber(install,file
# if defined (i386Architecture) && ((GccMajorVersion >3) \ # if defined (i386Architecture) && ((GccMajorVersion >3) \
|| ((GccMajorVersion == 3) && (GccMinorVersion >= 1))) || ((GccMajorVersion == 3) && (GccMinorVersion >= 1)))
# ifndef CcCmd # ifndef CcCmd
-# define CcCmd gcc -m32 -# define CcCmd gcc -m32
+# define CcCmd @@PKGSRC_CC@@ +# define CcCmd gcc
# endif # endif
# ifndef CplusplusCmd # ifndef CplusplusCmd
-# define CplusplusCmd c++ -m32 -# define CplusplusCmd c++ -m32
+# define CplusplusCmd @@PKGSRC_CXX@@ +# define CplusplusCmd c++
# endif # endif
# endif # endif
# if defined (Ppc64Architecture) # if defined (Ppc64Architecture)
@@ -624,8 +624,8 @@ InstallNamedTargetNoClobber(install,file @@ -785,7 +789,6 @@ InstallNamedTargetNoClobber(install,file
# endif
# endif
# ifndef CcCmd
-# define CcCmd gcc
-# define CplusplusCmd c++
+# define CcCmd @@PKGSRC_CC@@
+# define CplusplusCmd @@PKGSRC_CXX@@
# endif
# ifndef AsCmd
# define AsCmd CcCmd -c -x assembler
@@ -779,7 +779,6 @@ InstallNamedTargetNoClobber(install,file
#define YaccCmd bison -y #define YaccCmd bison -y
#define LexCmd flex -l #define LexCmd flex -l
#define HasFlex YES #define HasFlex YES
@ -34,16 +34,16 @@ $NetBSD: patch-ac,v 1.4 2008/01/12 21:57:04 joerg Exp $
#define PreProcessCmd CcCmd -E #define PreProcessCmd CcCmd -E
#define PostIncDir DefaultGccIncludeDir #define PostIncDir DefaultGccIncludeDir
#define LdCombineFlags -r #define LdCombineFlags -r
@@ -853,7 +852,7 @@ InstallNamedTargetNoClobber(install,file @@ -859,7 +862,7 @@ InstallNamedTargetNoClobber(install,file
#ifdef i386Architecture #ifdef i386Architecture
# ifndef OptimizedCDebugFlags # ifndef OptimizedCDebugFlags
-# define OptimizedCDebugFlags DefaultGcc2i386Opt -# define OptimizedCDebugFlags DefaultGcc2i386Opt
+# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ +# define OptimizedCDebugFlags -O2 -fPIC -D_FORTIFY_SOURCE=2 -I/usr/pkg/include -I/usr/X11R7/include
# endif # endif
# define LinuxMachineDefines -D__i386__ # define LinuxMachineDefines -D__i386__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
@@ -1042,20 +1041,12 @@ InstallNamedTargetNoClobber(install,file @@ -1066,20 +1069,12 @@ InstallNamedTargetNoClobber(install,file
#endif #endif

24
x11/xorg-cf-files/patches/patch-ai
View file

@ -1,7 +1,7 @@
$NetBSD: patch-ai,v 1.5 2023/01/17 05:28:59 mrg Exp $ $NetBSD: patch-ai,v 1.6 2023/01/20 22:46:34 mrg Exp $
--- Imake.tmpl.orig 2021-08-01 18:00:38.000000000 -0700 --- Imake.tmpl.orig 2021-08-01 18:00:38.000000000 -0700
+++ Imake.tmpl 2023-01-16 21:19:48.832729868 -0800 +++ Imake.tmpl 2023-01-18 14:02:36.645134759 -0800
@@ -898,24 +898,18 @@ TCLIBDIR = TclLibDir @@ -898,24 +898,18 @@ TCLIBDIR = TclLibDir
#ifndef ManPath #ifndef ManPath
#define ManPath ManDirectoryRoot #define ManPath ManDirectoryRoot
@ -33,15 +33,31 @@ $NetBSD: patch-ai,v 1.5 2023/01/17 05:28:59 mrg Exp $
#ifndef AppLoadDefs #ifndef AppLoadDefs
#define AppLoadDefs -D__apploaddir__=$(XAPPLOADDIR) #define AppLoadDefs -D__apploaddir__=$(XAPPLOADDIR)
#endif #endif
@@ -1078,7 +1072,7 @@ TCLIBDIR = TclLibDir @@ -1078,21 +1072,21 @@ TCLIBDIR = TclLibDir
#define ArCmdBase ar #define ArCmdBase ar
#endif #endif
#ifndef ArCmd #ifndef ArCmd
-#if HasLargeTmp || SystemV4 || LinuxBinUtilsMajorVersion -#if HasLargeTmp || SystemV4 || LinuxBinUtilsMajorVersion
+#if HasLargeTmp || SystemV4 || LinuxBinUtilsMajorVersion || defined(NetBSDArchitecture) +#if HasLargeTmp || SystemV4 || HasGnuAr
#define ArCmd ArCmdBase cq #define ArCmd ArCmdBase cq
#else #else
#define ArCmd ArCmdBase clq #define ArCmd ArCmdBase clq
#endif
#endif
#ifndef ArAddCmd
-#if HasLargeTmp || SystemV4
+#if HasLargeTmp || SystemV4 || HasGnuAr
#define ArAddCmd ArCmdBase ru
#else
#define ArAddCmd ArCmdBase rul
#endif
#endif
#ifndef ArExtCmd
-#if HasLargeTmp || SystemV4
+#if HasLargeTmp || SystemV4 || HasGnuAr
#define ArExtCmd ArCmdBase x
#else
#define ArExtCmd ArCmdBase xl
@@ -1447,9 +1441,9 @@ TCLIBDIR = TclLibDir @@ -1447,9 +1441,9 @@ TCLIBDIR = TclLibDir
#ifndef DependCmd #ifndef DependCmd
#if UseGccMakeDepend #if UseGccMakeDepend