Wed Feb 22 07:44:55 2023 UTC ()
xorg-cf-files: update to 1.0.8.

This package contains the configuration files, platform data, & Makefile
templates for the archaic Imake build tool.  This is a minor update to
ship the contributed support for Linux on RISC-V & LoongArch, and
AArch64 on Darwin (MacOS), as well as to fix incompatibility when using
GNU binutils 2.36 and later on FreeBSD, and to correct the setting of
the rarely (never?) used ENCODINGSDIR in site.def.

As before, while we continue to accept patches and publish updates for the
benefit of other packages which still use Imake to build, we have not been
actively maintaining, testing, or adding new OS or platform support for
Imake since 2005.  X.Org strongly encourages anyone still using Imake to
move to meson or another modern/maintained build tool.

For example, this release adds support for installing with meson as well
as the traditional GNU autoconf.  Please test building with meson and
report any issues you hit to our gitlab issue tracker at:
https://gitlab.freedesktop.org/xorg/util/cf/-/issues
as we plan on removing the autoconf build support in a future release.

Alan Coopersmith (12):
      gitlab CI: add a basic build test
      Build xz tarballs instead of bzip2
      Fix spelling/wording issues
      Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters
      gitlab CI: stop requiring Signed-off-by in commits
      More typo fixes
      configure.ac: Don't pass through '${FONTROOTDIR}' into site.def
      meson: Add option to build with meson
      meson: modernize some usage in meson.build & .gitlab-CI.yml
      meson: simplify installation of empty *.def files
      configure: Switch to XORG_DEFAULT_NOCODE_OPTIONS
      xorg-cf-files 1.0.8

Emil Velikov (1):
      autogen.sh: use quoted string variables

Marek Szuba (1):
      Linux/RISC-V support

Peter Hutterer (1):
      autogen.sh: use exec instead of waiting for configure to finish

WANG Xuerui (1):
      Add support for Linux/LoongArch

Weijia (1):
      Add support for aarch64-darwin

Yasuhiro Kimura (1):
      Fix incompatibility issue of GNU binutils 2.36 and later on FreeBSD.


(wiz)
diff -r1.41 -r1.42 pkgsrc/x11/xorg-cf-files/Makefile
diff -r1.36 -r1.37 pkgsrc/x11/xorg-cf-files/distinfo
diff -r1.5 -r1.6 pkgsrc/x11/xorg-cf-files/patches/patch-ac
diff -r1.5 -r1.6 pkgsrc/x11/xorg-cf-files/patches/patch-ae
diff -r1.2 -r1.3 pkgsrc/x11/xorg-cf-files/patches/patch-ad
diff -r1.10 -r1.11 pkgsrc/x11/xorg-cf-files/patches/patch-af
diff -r1.8 -r1.9 pkgsrc/x11/xorg-cf-files/patches/patch-ag
diff -r1.6 -r1.7 pkgsrc/x11/xorg-cf-files/patches/patch-ai
diff -r1.3 -r1.4 pkgsrc/x11/xorg-cf-files/patches/patch-ak
cvs diff -r1.41 -r1.42 pkgsrc/x11/xorg-cf-files/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xorg-cf-files/Makefile 2023/01/20 22:46:34 1.41
+++ pkgsrc/x11/xorg-cf-files/Makefile 2023/02/22 07:44:55 1.42
@@ -1,20 +1,19 @@ @@ -1,20 +1,19 @@
1# $NetBSD: Makefile,v 1.41 2023/01/20 22:46:34 mrg Exp $ 1# $NetBSD: Makefile,v 1.42 2023/02/22 07:44:55 wiz Exp $
2 2
3DISTNAME= xorg-cf-files-1.0.7 3DISTNAME= xorg-cf-files-1.0.8
4PKGREVISION= 2 
5CATEGORIES= x11 devel 4CATEGORIES= x11 devel
6MASTER_SITES= ${MASTER_SITE_XORG:=util/} 5MASTER_SITES= ${MASTER_SITE_XORG:=util/}
7EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.xz
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://xorg.freedesktop.org/ 9HOMEPAGE= https://xorg.freedesktop.org/
11COMMENT= Xorg imake rules 10COMMENT= Xorg imake rules
12 11
13GNU_CONFIGURE= yes 12GNU_CONFIGURE= yes
14USE_TOOLS+= pkg-config 13USE_TOOLS+= pkg-config
15 14
16.include "../../mk/bsd.prefs.mk" 15.include "../../mk/bsd.prefs.mk"
17 16
18DARWIN_USE_QUARTZ?= 1 17DARWIN_USE_QUARTZ?= 1
19 18
20# SmartOS puts compiler tools in /usr/bin and does not come with lex/yacc. 19# SmartOS puts compiler tools in /usr/bin and does not come with lex/yacc.
cvs diff -r1.36 -r1.37 pkgsrc/x11/xorg-cf-files/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/xorg-cf-files/distinfo 2023/01/20 22:46:34 1.36
+++ pkgsrc/x11/xorg-cf-files/distinfo 2023/02/22 07:44:55 1.37
@@ -1,21 +1,20 @@ @@ -1,21 +1,20 @@
1$NetBSD: distinfo,v 1.36 2023/01/20 22:46:34 mrg Exp $ 1$NetBSD: distinfo,v 1.37 2023/02/22 07:44:55 wiz Exp $
2 2
3BLAKE2s (xorg-cf-files-1.0.7.tar.bz2) = 7c971e7951a9369904f766fb5a9e6c78fd07703131e2a042e858e53480f27fd7 3BLAKE2s (xorg-cf-files-1.0.8.tar.xz) = e8a410f3363e12daafc5566b665b019177c0bba86dd6f82bdf2073a150199fc8
4SHA512 (xorg-cf-files-1.0.7.tar.bz2) = 0dd73b9db9fc16bddc94ef23f11434be6ea2f8e0c7bc5ef3c3bfe6749e13843f88d397eed9f980bbbe9e74147172326bd3c3ccb7adedc9150302756e4b07191e 4SHA512 (xorg-cf-files-1.0.8.tar.xz) = cc633af889cd82346c3098df9185245c21aa9db7484343f8be9719f6e0b1fc0a9b09afb13b9b864668aa51944f2da797bbe896c807f629e89fc91506e6e63fb9
5Size (xorg-cf-files-1.0.7.tar.bz2) = 345575 bytes 5Size (xorg-cf-files-1.0.8.tar.xz) = 290280 bytes
6SHA1 (patch-OpenBSDLib.rules) = 65b02b660839adb6e9c13287396a794a4586d927 6SHA1 (patch-OpenBSDLib.rules) = 65b02b660839adb6e9c13287396a794a4586d927
7SHA1 (patch-X11.rules) = 2dac9bcc111f63b2dd887967ea5fab656f52f06b 7SHA1 (patch-X11.rules) = 2dac9bcc111f63b2dd887967ea5fab656f52f06b
8SHA1 (patch-X11.tmpl) = 3f0c5b8ad7a60cd0e1e47afcddaace936b9aaeed 8SHA1 (patch-X11.tmpl) = 3f0c5b8ad7a60cd0e1e47afcddaace936b9aaeed
9SHA1 (patch-aa) = 850672428eec76facfc7862bb9a2a8e1a00ee56d 9SHA1 (patch-aa) = 850672428eec76facfc7862bb9a2a8e1a00ee56d
10SHA1 (patch-ab) = c30b0ac9e661aa76a65877ef7cd4c422a8f0405b 10SHA1 (patch-ac) = 2c0864d2a6bcbdeba12ffa4318df6bd80bea1f0e
11SHA1 (patch-ac) = e084d790e7713897ba2366145b2088f933aa94e0 11SHA1 (patch-ad) = 0a231ebd8b615bf3c8e630f0ebc394619b2c3e23
12SHA1 (patch-ad) = fcdddf191f676287b7f42e2b16729ed34afc6786 12SHA1 (patch-ae) = 4f97fba73c5ce7d4d9b402921605bcd9d9975abf
13SHA1 (patch-ae) = d89ea1af22b3d0fab3cc431e3353c9efe4a92264 13SHA1 (patch-af) = e158cf3aca506dbc86c35c2a94cec9e47a238308
14SHA1 (patch-af) = 42c0e0738a5ca20c2f7aa09684630093970c1dee 14SHA1 (patch-ag) = 6c9d9f28f93edf615822c7882bed33b05a2de9f3
15SHA1 (patch-ag) = b7c07619141df8d8ae718732343fd185098bdafb 
16SHA1 (patch-ah) = 9b64b2e5f419ab190d47dd8156b8f84634fd6a36 15SHA1 (patch-ah) = 9b64b2e5f419ab190d47dd8156b8f84634fd6a36
17SHA1 (patch-ai) = ec2523615802a89c63d7015089a908133438b812 16SHA1 (patch-ai) = 5725df2f2321363b630171cf9316f97ade9f4b3f
18SHA1 (patch-aj) = 3be677041b6bff008caa1375d1e6dd5c90d9f501 17SHA1 (patch-aj) = 3be677041b6bff008caa1375d1e6dd5c90d9f501
19SHA1 (patch-ak) = ec4e8c30782e3081a84b8c3bd8ab71961a0f13cb 18SHA1 (patch-ak) = 8c683fce8a3a42715ad11d7f917263e48dbf4fba
20SHA1 (patch-gnuLib.rules) = 44a39881b4f4b6a10250f7ae4b4508af76cef71d 19SHA1 (patch-gnuLib.rules) = 44a39881b4f4b6a10250f7ae4b4508af76cef71d
21SHA1 (patch-sv4Lib.rules) = f7ea2b29a8d3f4e866578fc81d0bbb6a3e598bb3 20SHA1 (patch-sv4Lib.rules) = f7ea2b29a8d3f4e866578fc81d0bbb6a3e598bb3
cvs diff -r1.5 -r1.6 pkgsrc/x11/xorg-cf-files/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/x11/xorg-cf-files/patches/patch-ac 2023/01/20 22:46:34 1.5
+++ pkgsrc/x11/xorg-cf-files/patches/patch-ac 2023/02/22 07:44:55 1.6
@@ -1,59 +1,59 @@ @@ -1,59 +1,59 @@
1$NetBSD: patch-ac,v 1.5 2023/01/20 22:46:34 mrg Exp $ 1$NetBSD: patch-ac,v 1.6 2023/02/22 07:44:55 wiz Exp $
2 2
3--- linux.cf.orig 2021-08-01 18:00:38.000000000 -0700 3--- linux.cf.orig 2023-02-22 02:28:43.000000000 +0000
4+++ linux.cf 2023-01-18 14:02:08.805022786 -0800 4+++ linux.cf
5@@ -90,6 +90,10 @@ XCOMM platform: $XFree86: xc/config/cf/ 5@@ -94,6 +94,10 @@ XCOMM platform: $XFree86: xc/config/cf/
6 # define LinuxBinUtilsMajorVersion DefaultLinuxBinUtilsMajorVersion 6 #define HasGnuAr YES
7 #endif 7 #endif
8  8
9+#ifndef HasGnuAr 9+#ifndef HasGnuAr
10+#define HasGnuAr YES 10+#define HasGnuAr YES
11+#endif 11+#endif
12+ 12+
13 XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) 13 XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
14 XCOMM libc: (LinuxCLibMajorVersion./**/LinuxCLibMinorVersion./**/LinuxCLibTeenyVersion) 14 XCOMM libc: (LinuxCLibMajorVersion./**/LinuxCLibMinorVersion./**/LinuxCLibTeenyVersion)
15 XCOMM binutils: (LinuxBinUtilsMajorVersion) 15 XCOMM binutils: (LinuxBinUtilsMajorVersion)
16@@ -615,10 +619,10 @@ InstallNamedTargetNoClobber(install,file 16@@ -619,10 +623,10 @@ InstallNamedTargetNoClobber(install,file
17 # if defined (i386Architecture) && ((GccMajorVersion >3) \ 17 # if defined (i386Architecture) && ((GccMajorVersion >3) \
18 || ((GccMajorVersion == 3) && (GccMinorVersion >= 1))) 18 || ((GccMajorVersion == 3) && (GccMinorVersion >= 1)))
19 # ifndef CcCmd 19 # ifndef CcCmd
20-# define CcCmd gcc -m32 20-# define CcCmd gcc -m32
21+# define CcCmd gcc 21+# define CcCmd gcc
22 # endif 22 # endif
23 # ifndef CplusplusCmd 23 # ifndef CplusplusCmd
24-# define CplusplusCmd c++ -m32 24-# define CplusplusCmd c++ -m32
25+# define CplusplusCmd c++ 25+# define CplusplusCmd c++
26 # endif 26 # endif
27 # endif 27 # endif
28 # if defined (Ppc64Architecture) 28 # if defined (Ppc64Architecture)
29@@ -785,7 +789,6 @@ InstallNamedTargetNoClobber(install,file 29@@ -789,7 +793,6 @@ InstallNamedTargetNoClobber(install,file
30 #define YaccCmd bison -y 30 #define YaccCmd bison -y
31 #define LexCmd flex -l 31 #define LexCmd flex -l
32 #define HasFlex YES 32 #define HasFlex YES
33-#define LexLib -lfl 33-#define LexLib -lfl
34 #define PreProcessCmd CcCmd -E 34 #define PreProcessCmd CcCmd -E
35 #define PostIncDir DefaultGccIncludeDir 35 #define PostIncDir DefaultGccIncludeDir
36 #define LdCombineFlags -r 36 #define LdCombineFlags -r
37@@ -859,7 +862,7 @@ InstallNamedTargetNoClobber(install,file 37@@ -863,7 +866,7 @@ InstallNamedTargetNoClobber(install,file
38  38
39 #ifdef i386Architecture 39 #ifdef i386Architecture
40 # ifndef OptimizedCDebugFlags 40 # ifndef OptimizedCDebugFlags
41-# define OptimizedCDebugFlags DefaultGcc2i386Opt 41-# define OptimizedCDebugFlags DefaultGcc2i386Opt
42+# define OptimizedCDebugFlags -O2 -fPIC -D_FORTIFY_SOURCE=2 -I/usr/pkg/include -I/usr/X11R7/include 42+# define OptimizedCDebugFlags -O2 -fPIC -D_FORTIFY_SOURCE=2 -I/usr/pkg/include -I/usr/X11R7/include
43 # endif 43 # endif
44 # define LinuxMachineDefines -D__i386__ 44 # define LinuxMachineDefines -D__i386__
45 # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME 45 # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
46@@ -1066,20 +1069,12 @@ InstallNamedTargetNoClobber(install,file 46@@ -1106,20 +1109,12 @@ InstallNamedTargetNoClobber(install,file
47 #endif 47 #endif
48  48
49  49
50-#define HasGnuMake YES 50-#define HasGnuMake YES
51- 51-
52-#define MakeNamedTargetSubdir(dir,flags,subname)\ 52-#define MakeNamedTargetSubdir(dir,flags,subname)\
53- $(MAKE) -C dir $(MFLAGS) $(PARALLELMFLAGS) flags subname 53- $(MAKE) -C dir $(MFLAGS) $(PARALLELMFLAGS) flags subname
54- 54-
55 #define ArchitectureDefines -DLINUX_ARCHITECTURE 55 #define ArchitectureDefines -DLINUX_ARCHITECTURE
56  56
57 #define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB) 57 #define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB)
58 #define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB) 58 #define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
59  59
cvs diff -r1.5 -r1.6 pkgsrc/x11/xorg-cf-files/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/x11/xorg-cf-files/patches/patch-ae 2022/12/01 21:14:09 1.5
+++ pkgsrc/x11/xorg-cf-files/patches/patch-ae 2023/02/22 07:44:55 1.6
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1$NetBSD: patch-ae,v 1.5 2022/12/01 21:14:09 jperkin Exp $ 1$NetBSD: patch-ae,v 1.6 2023/02/22 07:44:55 wiz Exp $
2 2
3--- DragonFly.cf.orig 2021-08-02 01:00:38 3--- DragonFly.cf.orig 2023-02-22 02:28:43.000000000 +0000
4+++ DragonFly.cf 4+++ DragonFly.cf
5@@ -96,12 +96,12 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS 5@@ -96,12 +96,12 @@ XCOMM operating system: OSName (OSMajor
6 #define HasFlex YES 6 #define HasFlex YES
7  7
8 #ifndef CcCmd 8 #ifndef CcCmd
9-# define CcCmd cc 9-# define CcCmd cc
10+# define CcCmd @@PKGSRC_CC@@ 10+# define CcCmd @@PKGSRC_CC@@
11 #endif 11 #endif
12 #ifndef CplusplusCmd 12 #ifndef CplusplusCmd
13-# define CplusplusCmd c++ 13-# define CplusplusCmd c++
14+# define CplusplusCmd @@PKGSRC_CXX@@ 14+# define CplusplusCmd @@PKGSRC_CXX@@
15 #endif 15 #endif
16-#define CppCmd /usr/bin/cpp 16-#define CppCmd /usr/bin/cpp
17+#define CppCmd @@PKGSRC_CPP@@ 17+#define CppCmd @@PKGSRC_CPP@@
18 #define PreProcessCmd CppCmd 18 #define PreProcessCmd CppCmd
19 #define StandardCppOptions -traditional 19 #define StandardCppOptions -traditional
20 #define StandardCppDefines /**/ 20 #define StandardCppDefines /**/
21@@ -115,10 +115,6 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS 21@@ -116,10 +116,6 @@ XCOMM operating system: OSName (OSMajor
22 # define NoSystemWarn 
23 # endif 22 # endif
24 # define DefaultCCOptions -ansi NoSystemWarn -Dasm=__asm GccWarningOptions 23 # define DefaultCCOptions -ansi NoSystemWarn -Dasm=__asm GccWarningOptions
25-#endif 24 #endif
26-#ifndef ExtraLibraries 25-#ifndef ExtraLibraries
27-/* support for multi-byte locales is in libxpg4 rather than libc */ 26-/* support for multi-byte locales is in libxpg4 rather than libc */
28-#define ExtraLibraries -lxpg4 27-#define ExtraLibraries -lxpg4
29 #endif 28-#endif
30 #define HasSetUserContext YES 29 #define HasSetUserContext YES
31 #define HasGetpeereid YES 30 #define HasGetpeereid YES
 31 #define HasMTRRSupport YES
cvs diff -r1.2 -r1.3 pkgsrc/x11/xorg-cf-files/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/x11/xorg-cf-files/patches/patch-ad 2022/12/01 21:14:09 1.2
+++ pkgsrc/x11/xorg-cf-files/patches/patch-ad 2023/02/22 07:44:55 1.3
@@ -1,68 +1,68 @@ @@ -1,68 +1,68 @@
1$NetBSD: patch-ad,v 1.2 2022/12/01 21:14:09 jperkin Exp $ 1$NetBSD: patch-ad,v 1.3 2023/02/22 07:44:55 wiz Exp $
2 2
3Support aarch64. 3Support aarch64.
4 4
5--- darwin.cf.orig 2021-08-02 01:00:38 5--- darwin.cf.orig 2023-02-22 02:28:43.000000000 +0000
6+++ darwin.cf 6+++ darwin.cf
7@@ -97,7 +97,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS 7@@ -97,7 +97,7 @@ XCOMM operating system: OSName (OSMajor
8 * Turn off to build on raw Darwin systems. 8 * Turn off to build on raw Darwin systems.
9 */ 9 */
10 #ifndef DarwinQuartzSupport 10 #ifndef DarwinQuartzSupport
11-# define DarwinQuartzSupport YES 11-# define DarwinQuartzSupport YES
12+# define DarwinQuartzSupport @@DARWIN_USE_QUARTZ@@ 12+# define DarwinQuartzSupport @@DARWIN_USE_QUARTZ@@
13 #endif 13 #endif
14  14
15 #if DarwinQuartzSupport 15 #if DarwinQuartzSupport
16@@ -170,7 +170,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS 16@@ -170,7 +170,7 @@ XCOMM operating system: OSName (OSMajor
17 * so we use the 3.1-based version in this case. 17 * so we use the 3.1-based version in this case.
18 */ 18 */
19 #if (GccMajorVersion == 3) && (GccMinorVersion == 3) 19 #if (GccMajorVersion == 3) && (GccMinorVersion == 3)
20-# define CppCmd /usr/bin/cpp3 20-# define CppCmd /usr/bin/cpp3
21+# define CppCmd /usr/bin/cpp 21+# define CppCmd /usr/bin/cpp
22 #else 22 #else
23 # define CppCmd /usr/bin/cpp 23 # define CppCmd /usr/bin/cpp
24 #endif 24 #endif
25@@ -184,8 +184,8 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS 25@@ -184,8 +184,8 @@ XCOMM operating system: OSName (OSMajor
26 #endif 26 #endif
27  27
28 /* we have a gcc compatible compiler, but its not called gcc */ 28 /* we have a gcc compatible compiler, but its not called gcc */
29-#define CcCmd /usr/bin/cc 29-#define CcCmd /usr/bin/cc
30-#define CplusplusCmd /usr/bin/c++ 30-#define CplusplusCmd /usr/bin/c++
31+#define CcCmd @@PKGSRC_CC@@ 31+#define CcCmd @@PKGSRC_CC@@
32+#define CplusplusCmd @@PKGSRC_CXX@@ 32+#define CplusplusCmd @@PKGSRC_CXX@@
33  33
34 /* default flags to pass to cc */ 34 /* default flags to pass to cc */
35 #ifndef DefaultCCOptions 35 #ifndef DefaultCCOptions
36@@ -213,7 +213,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS 36@@ -213,7 +213,7 @@ XCOMM operating system: OSName (OSMajor
37 #ifdef PpcDarwinArchitecture 37 #ifdef PpcDarwinArchitecture
38 # define DarwinMachineDefines -D__powerpc__ 38 # define DarwinMachineDefines -D__powerpc__
39 # if HasGcc3 39 # if HasGcc3
40-# define OptimizedCDebugFlags -Os 40-# define OptimizedCDebugFlags -Os
41+# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ 41+# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@
42 # else 42 # else
43 # define OptimizedCDebugFlags -O2 43 # define OptimizedCDebugFlags -O2
44 # endif 44 # endif
45@@ -223,13 +223,22 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS 45@@ -223,13 +223,22 @@ XCOMM operating system: OSName (OSMajor
46 #ifdef i386DarwinArchitecture 46 #ifdef i386DarwinArchitecture
47 # define DarwinMachineDefines -D__i386__ 47 # define DarwinMachineDefines -D__i386__
48 # if HasGcc3 48 # if HasGcc3
49-# define OptimizedCDebugFlags -Os 49-# define OptimizedCDebugFlags -Os
50+# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ 50+# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@
51 # else 51 # else
52 # define OptimizedCDebugFlags -O2 -fno-strength-reduce 52 # define OptimizedCDebugFlags -O2 -fno-strength-reduce
53 # endif 53 # endif
54 # define ByteOrder X_LITTLE_ENDIAN 54 # define ByteOrder X_LITTLE_ENDIAN
55 #endif /* i386DarwinArchitecture */ 55 #endif /* i386DarwinArchitecture */
56  56
57+#ifdef aarch64DarwinArchitecture 57+#ifdef aarch64DarwinArchitecture
58+# define DarwinMachineDefines -D__aarch64__ 58+# define DarwinMachineDefines -D__aarch64__
59+# if HasGcc3 59+# if HasGcc3
60+# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ 60+# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@
61+# else 61+# else
62+# define OptimizedCDebugFlags -O2 -fno-strength-reduce 62+# define OptimizedCDebugFlags -O2 -fno-strength-reduce
63+# endif 63+# endif
64+# define ByteOrder X_LITTLE_ENDIAN 64+# define ByteOrder X_LITTLE_ENDIAN
65+#endif 65+#endif
66  
67 #ifdef x86_64DarwinArchitecture 66 #ifdef x86_64DarwinArchitecture
68 # define DarwinMachineDefines -D__x86_64__ 67 # define DarwinMachineDefines -D__x86_64__
 68 # if HasGcc3
cvs diff -r1.10 -r1.11 pkgsrc/x11/xorg-cf-files/patches/patch-af (expand / switch to unified diff)

--- pkgsrc/x11/xorg-cf-files/patches/patch-af 2022/12/01 21:14:09 1.10
+++ pkgsrc/x11/xorg-cf-files/patches/patch-af 2023/02/22 07:44:55 1.11
@@ -1,46 +1,46 @@ @@ -1,46 +1,46 @@
1$NetBSD: patch-af,v 1.10 2022/12/01 21:14:09 jperkin Exp $ 1$NetBSD: patch-af,v 1.11 2023/02/22 07:44:55 wiz Exp $
2 2
3- Ensure all programs and libraries have a LOCALBASE rpath. 3- Ensure all programs and libraries have a LOCALBASE rpath.
4- Disable Solaris64bitSubdir, at least until multi-arch is supported. 4- Disable Solaris64bitSubdir, at least until multi-arch is supported.
5- Use pkgsrc CC, CXX, CFLAGS and INSTALL. 5- Use pkgsrc CC, CXX, CFLAGS and INSTALL.
6 6
7--- sun.cf.orig 2021-08-02 01:00:39 7--- sun.cf.orig 2023-02-22 02:28:43.000000000 +0000
8+++ sun.cf 8+++ sun.cf
9@@ -430,9 +430,9 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/Cpl 9@@ -430,9 +430,9 @@ XCOMM SunPro C++ CplusplusCompilerMajorV
10 # endif 10 # endif
11 # endif 11 # endif
12 # if OSMinorVersion > 10 12 # if OSMinorVersion > 10
13-# define InstallCmd /usr/gnu/bin/install 13-# define InstallCmd /usr/gnu/bin/install
14+# define InstallCmd @@INSTALL@@ 14+# define InstallCmd @@INSTALL@@
15 # elif OSMinorVersion > 3 15 # elif OSMinorVersion > 3
16-# define InstallCmd /usr/ucb/install 16-# define InstallCmd /usr/ucb/install
17+# define InstallCmd @@INSTALL@@ 17+# define InstallCmd @@INSTALL@@
18 # endif 18 # endif
19 #ifndef LargefileDefines 19 #ifndef LargefileDefines
20 # if (OSMajorVersion > 5) || (OSMajorVersion == 5 && OSMinorVersion >= 6) 20 # if (OSMajorVersion > 5) || (OSMajorVersion == 5 && OSMinorVersion >= 6)
21@@ -682,29 +682,29 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/Cpl 21@@ -682,29 +682,29 @@ XCOMM SunPro C++ CplusplusCompilerMajorV
22 # endif 22 # endif
23 # if HasGcc2 23 # if HasGcc2
24 # ifndef CcCmd 24 # ifndef CcCmd
25-# define CcCmd gcc 25-# define CcCmd gcc
26+# define CcCmd @@PKGSRC_CC@@ 26+# define CcCmd @@PKGSRC_CC@@
27 # endif 27+# endif
28+# ifndef CppCmd 28+# ifndef CppCmd
29+# define CppCmd @@PKGSRC_CPP@@ 29+# define CppCmd @@PKGSRC_CPP@@
30+# endif 30+# endif
31+# ifndef CplusplusCmd 31+# ifndef CplusplusCmd
32+# define CplusplusCmd @@PKGSRC_CXX@@ 32+# define CplusplusCmd @@PKGSRC_CXX@@
33+# endif 33 # endif
34 # ifndef AsCmd 34 # ifndef AsCmd
35 # define AsCmd CcCmd -c -x assembler 35 # define AsCmd CcCmd -c -x assembler
36 # endif 36 # endif
37 # ifndef OptimizedCDebugFlags 37 # ifndef OptimizedCDebugFlags
38-# ifdef i386Architecture 38-# ifdef i386Architecture
39-# define OptimizedCDebugFlags DefaultGcc2i386Opt 39-# define OptimizedCDebugFlags DefaultGcc2i386Opt
40-# elif defined(AMD64Architecture) 40-# elif defined(AMD64Architecture)
41-# define OptimizedCDebugFlags DefaultGcc2AMD64Opt 41-# define OptimizedCDebugFlags DefaultGcc2AMD64Opt
42-# else 42-# else
43-# define OptimizedCDebugFlags -O2 43-# define OptimizedCDebugFlags -O2
44-# endif 44-# endif
45+# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ 45+# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@
46 # endif 46 # endif
@@ -48,40 +48,40 @@ $NetBSD: patch-af,v 1.10 2022/12/01 21:1 @@ -48,40 +48,40 @@ $NetBSD: patch-af,v 1.10 2022/12/01 21:1
48-# if OSMajorVersion == 5 && OSMinorVersion > 6 && defined(i386Architecture) 48-# if OSMajorVersion == 5 && OSMinorVersion > 6 && defined(i386Architecture)
49+# if OSMajorVersion == 5 && OSMinorVersion > 6 && OSMinorVersion < 8 && defined(i386Architecture) 49+# if OSMajorVersion == 5 && OSMinorVersion > 6 && OSMinorVersion < 8 && defined(i386Architecture)
50 /* This is to work around what appears to be a PIC bug in some gcc/egcs 50 /* This is to work around what appears to be a PIC bug in some gcc/egcs
51 versions that shows up with the Solaris 7/x86 <ctype.h>. */ 51 versions that shows up with the Solaris 7/x86 <ctype.h>. */
52 # define SharedLibraryLdCmd $(LD) 52 # define SharedLibraryLdCmd $(LD)
53 # define SharedLibraryLoadFlags -G -z textwarn 53 # define SharedLibraryLoadFlags -G -z textwarn
54 # else 54 # else
55 # define SharedLibraryLdCmd $(CC) 55 # define SharedLibraryLdCmd $(CC)
56-# define SharedLibraryLoadFlags -shared -z text 56-# define SharedLibraryLoadFlags -shared -z text
57+# define SharedLibraryLoadFlags -shared -z text RpathLoadFlags 57+# define SharedLibraryLoadFlags -shared -z text RpathLoadFlags
58 # endif 58 # endif
59 # endif 59 # endif
60 # else 60 # else
61@@ -829,7 +829,7 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/Cpl 61@@ -829,7 +829,7 @@ XCOMM SunPro C++ CplusplusCompilerMajorV
62 # endif 62 # endif
63 #endif 63 #endif
64 #ifndef Mapfile_NoExData 64 #ifndef Mapfile_NoExData
65-# if defined(SparcArchitecture) 65-# if defined(SparcArchitecture)
66+# if defined(SparcArchitecture) || defined(Sparc64Architecture) 66+# if defined(SparcArchitecture) || defined(Sparc64Architecture)
67 /* SPARC archictecture requires PLT section in .data be executable, so 67 /* SPARC architecture requires PLT section in .data be executable, so
68 we can only make .bss, not all of .data no-exec on SPARC */ 68 we can only make .bss, not all of .data no-exec on SPARC */
69 # define Mapfile_NoExData /**/ 69 # define Mapfile_NoExData /**/
70@@ -846,7 +846,7 @@ MAPFILES_FOR_PROGS = Mapfile_BssAlign Mapfile_NoExStac 70@@ -846,7 +846,7 @@ XCOMM SunPro C++ CplusplusCompilerMajorV
71 MAPFILES_FOR_PROGS = Mapfile_BssAlign Mapfile_NoExStack 71 MAPFILES_FOR_PROGS = Mapfile_BssAlign Mapfile_NoExStack
72 /* ExtraLoadFlags apply to all binaries - programs & libraries */ 72 /* ExtraLoadFlags apply to all binaries - programs & libraries */
73 # ifndef ExtraLoadFlags 73 # ifndef ExtraLoadFlags
74-# define ExtraLoadFlags LazyLoadFlag $(MAPFILES_FOR_ALL) 74-# define ExtraLoadFlags LazyLoadFlag $(MAPFILES_FOR_ALL)
75+# define ExtraLoadFlags RpathLoadFlags LazyLoadFlag $(MAPFILES_FOR_ALL) 75+# define ExtraLoadFlags RpathLoadFlags LazyLoadFlag $(MAPFILES_FOR_ALL)
76 # endif 76 # endif
77 /* ExtraLoadOptions only apply to programs */ 77 /* ExtraLoadOptions only apply to programs */
78 # ifndef ExtraLoadOptions 78 # ifndef ExtraLoadOptions
79@@ -863,7 +863,7 @@ MAPFILES_FOR_PROGS = Mapfile_BssAlign Mapfile_NoExStac 79@@ -863,7 +863,7 @@ MAPFILES_FOR_PROGS = Mapfile_BssAlign Ma
80 # endif 80 # endif
81 #endif 81 #endif
82  82
83-#ifdef Solaris64bitSubdir 83-#ifdef Solaris64bitSubdir
84+#ifdef NotYetSolaris64bitSubdir 84+#ifdef NotYetSolaris64bitSubdir
85 # define LibDirName Concat3(lib,/,Solaris64bitSubdir) 85 # define LibDirName Concat3(lib,/,Solaris64bitSubdir)
86 #endif 86 #endif
87  87
cvs diff -r1.8 -r1.9 pkgsrc/x11/xorg-cf-files/patches/patch-ag (expand / switch to unified diff)

--- pkgsrc/x11/xorg-cf-files/patches/patch-ag 2022/12/01 21:14:09 1.8
+++ pkgsrc/x11/xorg-cf-files/patches/patch-ag 2023/02/22 07:44:55 1.9
@@ -1,62 +1,62 @@ @@ -1,62 +1,62 @@
1$NetBSD: patch-ag,v 1.8 2022/12/01 21:14:09 jperkin Exp $ 1$NetBSD: patch-ag,v 1.9 2023/02/22 07:44:55 wiz Exp $
2 2
3Add __ppc64__ and __arm__ 3Add __ppc64__ and __arm__
4Recognize __sun as well as sun 4Recognize __sun as well as sun
5Add __ia64__ 5Add __ia64__
6Also recognize __sparc__ apparently now needed for gcc49 on solaris sparc 6Also recognize __sparc__ apparently now needed for gcc49 on solaris sparc
7to avoid -M /usr/lib/ld/map.noexdata which in does not work on SPARC 7to avoid -M /usr/lib/ld/map.noexdata which in does not work on SPARC
8 8
9--- Imake.cf.orig 2021-08-02 01:00:38 9--- Imake.cf.orig 2023-02-22 02:28:43.000000000 +0000
10+++ Imake.cf 10+++ Imake.cf
11@@ -25,14 +25,19 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/1 11@@ -25,14 +25,19 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v
12 # define MacroIncludeFile <darwin.cf> 12 # define MacroIncludeFile <darwin.cf>
13 # define MacroFile darwin.cf 13 # define MacroFile darwin.cf
14 # define DarwinArchitecture 14 # define DarwinArchitecture
15-# ifdef __ppc__ 15-# ifdef __ppc__
16+# if defined __ppc__ || defined __ppc64__ 16+# if defined __ppc__ || defined __ppc64__
17 # define PpcDarwinArchitecture 17 # define PpcDarwinArchitecture
18 # undef __ppc__ 18 # undef __ppc__
19+# undef __ppc64__ 19+# undef __ppc64__
20 # endif 20 # endif
21 # ifdef __i386__ 21 # ifdef __i386__
22 # define i386DarwinArchitecture 22 # define i386DarwinArchitecture
23 # undef __i386__ 23 # undef __i386__
24 # endif 24 # endif
25+# ifdef __aarch64__ 25+# ifdef __aarch64__
26+# define aarch64DarwinArchitecture 26+# define aarch64DarwinArchitecture
27+# undef __aarch64__ 27+# undef __aarch64__
28+# endif 28+# endif
29 # ifdef __x86_64__ 29 # ifdef __x86_64__
30 # define x86_64DarwinArchitecture 30 # define x86_64DarwinArchitecture
31 # undef __x86_64__ 31 # undef __x86_64__
32@@ -255,6 +260,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/1 32@@ -259,6 +264,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v
33 # define AMD64Architecture 33 # define AMD64Architecture
34 # undef __x86_64__ 34 # undef __x86_64__
35 # endif 35 # endif
36+# ifdef __ia64__ 36+# ifdef __ia64__
37+# define ia64Architecture 37+# define ia64Architecture
38+# undef __ia64__ 38+# undef __ia64__
39+# endif 39+# endif
40 #endif /* NetBSD */ 40 #endif /* NetBSD */
41  41
42 /* Systems based on kernel of NetBSD */ 42 /* Systems based on kernel of NetBSD */
43@@ -352,7 +361,7 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/1 43@@ -356,7 +365,7 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v
44 # endif 44 # endif
45 #endif /* AMOEBA */ 45 #endif /* AMOEBA */
46  46
47-#ifdef sun 47-#ifdef sun
48+#if defined(sun) || defined(__sun) 48+#if defined(sun) || defined(__sun)
49 # define MacroIncludeFile <sun.cf> 49 # define MacroIncludeFile <sun.cf>
50 # define MacroFile sun.cf 50 # define MacroFile sun.cf
51 # ifdef SVR4 51 # ifdef SVR4
52@@ -361,6 +370,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/1 52@@ -367,6 +376,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v
53 # endif 
54 # ifdef sparc 
55 # undef sparc 53 # undef sparc
56+# define SparcArchitecture 
57+# endif 
58+# ifdef __sparc__ 
59+# undef __sparc__ 
60 # define SparcArchitecture 54 # define SparcArchitecture
61 # endif 55 # endif
 56+# ifdef __sparc__
 57+# undef __sparc__
 58+# define SparcArchitecture
 59+# endif
62 # ifdef __sparcv9 60 # ifdef __sparcv9
 61 # undef __sparcv9
 62 # define Sparc64Architecture
cvs diff -r1.6 -r1.7 pkgsrc/x11/xorg-cf-files/patches/patch-ai (expand / switch to unified diff)

--- pkgsrc/x11/xorg-cf-files/patches/patch-ai 2023/01/20 22:46:34 1.6
+++ pkgsrc/x11/xorg-cf-files/patches/patch-ai 2023/02/22 07:44:55 1.7
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-ai,v 1.6 2023/01/20 22:46:34 mrg Exp $ 1$NetBSD: patch-ai,v 1.7 2023/02/22 07:44:55 wiz Exp $
2 2
3--- Imake.tmpl.orig 2021-08-01 18:00:38.000000000 -0700 3--- Imake.tmpl.orig 2023-02-22 02:28:43.000000000 +0000
4+++ Imake.tmpl 2023-01-18 14:02:36.645134759 -0800 4+++ Imake.tmpl
5@@ -898,24 +898,18 @@ TCLIBDIR = TclLibDir 5@@ -898,24 +898,18 @@ TCLIBDIR = TclLibDir
6 #ifndef ManPath 6 #ifndef ManPath
7 #define ManPath ManDirectoryRoot 7 #define ManPath ManDirectoryRoot
8 #endif 8 #endif
9-#ifndef ManSourcePath 9-#ifndef ManSourcePath
10+#undef ManSourcePath 10+#undef ManSourcePath
11 #define ManSourcePath $(MANPATH)/man 11 #define ManSourcePath $(MANPATH)/man
12-#endif 12-#endif
13-#ifndef ManDir 13-#ifndef ManDir
14+#undef ManDir 14+#undef ManDir
15 #define ManDir $(MANSOURCEPATH)$(MANSUFFIX) 15 #define ManDir $(MANSOURCEPATH)$(MANSUFFIX)
16-#endif 16-#endif
17-#ifndef LibmanDir 17-#ifndef LibmanDir
@@ -23,35 +23,27 @@ $NetBSD: patch-ai,v 1.6 2023/01/20 22:46 @@ -23,35 +23,27 @@ $NetBSD: patch-ai,v 1.6 2023/01/20 22:46
23 #define FileManDir $(MANSOURCEPATH)$(FILEMANSUFFIX) 23 #define FileManDir $(MANSOURCEPATH)$(FILEMANSUFFIX)
24-#endif 24-#endif
25-#ifndef MiscManDir 25-#ifndef MiscManDir
26+#undef MiscManDir 26+#undef MiscManDir
27 #define MiscManDir $(MANSOURCEPATH)$(MISCMANSUFFIX) 27 #define MiscManDir $(MANSOURCEPATH)$(MISCMANSUFFIX)
28-#endif 28-#endif
29-#ifndef DriverManDir 29-#ifndef DriverManDir
30+#undef DriverManDir 30+#undef DriverManDir
31 #define DriverManDir $(MANSOURCEPATH)$(DRIVERMANSUFFIX) 31 #define DriverManDir $(MANSOURCEPATH)$(DRIVERMANSUFFIX)
32-#endif 32-#endif
33 #ifndef AppLoadDefs 33 #ifndef AppLoadDefs
34 #define AppLoadDefs -D__apploaddir__=$(XAPPLOADDIR) 34 #define AppLoadDefs -D__apploaddir__=$(XAPPLOADDIR)
35 #endif 35 #endif
36@@ -1078,21 +1072,21 @@ TCLIBDIR = TclLibDir 36@@ -1085,14 +1079,14 @@ TCLIBDIR = TclLibDir
37 #define ArCmdBase ar 
38 #endif 
39 #ifndef ArCmd 
40-#if HasLargeTmp || SystemV4 || LinuxBinUtilsMajorVersion 
41+#if HasLargeTmp || SystemV4 || HasGnuAr 
42 #define ArCmd ArCmdBase cq 
43 #else 
44 #define ArCmd ArCmdBase clq 
45 #endif 37 #endif
46 #endif 38 #endif
47 #ifndef ArAddCmd 39 #ifndef ArAddCmd
48-#if HasLargeTmp || SystemV4 40-#if HasLargeTmp || SystemV4
49+#if HasLargeTmp || SystemV4 || HasGnuAr 41+#if HasLargeTmp || SystemV4 || HasGnuAr
50 #define ArAddCmd ArCmdBase ru 42 #define ArAddCmd ArCmdBase ru
51 #else 43 #else
52 #define ArAddCmd ArCmdBase rul 44 #define ArAddCmd ArCmdBase rul
53 #endif 45 #endif
54 #endif 46 #endif
55 #ifndef ArExtCmd 47 #ifndef ArExtCmd
56-#if HasLargeTmp || SystemV4 48-#if HasLargeTmp || SystemV4
57+#if HasLargeTmp || SystemV4 || HasGnuAr 49+#if HasLargeTmp || SystemV4 || HasGnuAr
cvs diff -r1.3 -r1.4 pkgsrc/x11/xorg-cf-files/patches/patch-ak (expand / switch to unified diff)

--- pkgsrc/x11/xorg-cf-files/patches/patch-ak 2022/12/01 21:14:09 1.3
+++ pkgsrc/x11/xorg-cf-files/patches/patch-ak 2023/02/22 07:44:55 1.4
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1$NetBSD: patch-ak,v 1.3 2022/12/01 21:14:09 jperkin Exp $ 1$NetBSD: patch-ak,v 1.4 2023/02/22 07:44:55 wiz Exp $
2 2
3The standard says that failing () doesn't stop the shell, even when -e 3The standard says that failing () doesn't stop the shell, even when -e
4is set, so () constructs need || exit $? on the end. (Which needs to be 4is set, so () constructs need || exit $? on the end. (Which needs to be
5$$? when it's coming from inside make.) 5$$? when it's coming from inside make.)
6 6
7--- Imake.rules.orig 2021-08-02 01:00:38 7--- Imake.rules.orig 2023-02-22 02:28:43.000000000 +0000
8+++ Imake.rules 8+++ Imake.rules
9@@ -534,9 +534,9 @@ -if [ -f program ]; then RemoveFile(Concat(program,~)) 9@@ -534,9 +534,9 @@ clean cleantc:: @@\
10 set +x; \ @@\ 10 set +x; \ @@\
11 else \ @@\ 11 else \ @@\
12 if [ -h dir ]; then \ @@\ 12 if [ -h dir ]; then \ @@\
13- (set -x; rm -f dir); \ @@\ 13- (set -x; rm -f dir); \ @@\
14+ (set -x; rm -f dir) || exit $$?; \ @@\ 14+ (set -x; rm -f dir) || exit $$?; \ @@\
15 fi; \ @@\ 15 fi; \ @@\
16- (set -x; $(MKDIRHIER) dir); \ @@\ 16- (set -x; $(MKDIRHIER) dir); \ @@\
17+ (set -x; $(MKDIRHIER) dir) || exit $$?; \ @@\ 17+ (set -x; $(MKDIRHIER) dir) || exit $$?; \ @@\
18 fi 18 fi
19 #endif /* MakeDir */ 19 #endif /* MakeDir */
20  20
21@@ -545,9 +545,9 @@ -if [ -f program ]; then RemoveFile(Concat(program,~)) 21@@ -545,9 +545,9 @@ clean cleantc:: @@\
22 :; \ @@\ 22 :; \ @@\
23 else \ @@\ 23 else \ @@\
24 if [ -h dir ]; then \ @@\ 24 if [ -h dir ]; then \ @@\
25- (set -x; rm -f dir); \ @@\ 25- (set -x; rm -f dir); \ @@\
26+ (set -x; rm -f dir) || exit $$?; \ @@\ 26+ (set -x; rm -f dir) || exit $$?; \ @@\
27 fi; \ @@\ 27 fi; \ @@\
28- (set -x; $(MKDIRHIER) dir); \ @@\ 28- (set -x; $(MKDIRHIER) dir); \ @@\
29+ (set -x; $(MKDIRHIER) dir) || exit $$?; \ @@\ 29+ (set -x; $(MKDIRHIER) dir) || exit $$?; \ @@\
30 fi 30 fi
31 #endif /* MakeDirInline */ 31 #endif /* MakeDirInline */
32  32
33@@ -571,7 +571,7 @@ includes:: srclist @@\ 33@@ -571,7 +571,7 @@ includes:: srclist @@\
34 @(set -x; cd $(BUILDINCDIR) && for i in srclist; do \ @@\ 34 @(set -x; cd $(BUILDINCDIR) && for i in srclist; do \ @@\
@@ -47,113 +47,113 @@ $$? when it's coming from inside make.) @@ -47,113 +47,113 @@ $$? when it's coming from inside make.)
47+ done) || exit $$? 47+ done) || exit $$?
48 #endif /* BuildIncludes */ 48 #endif /* BuildIncludes */
49  49
50 /* 50 /*
51@@ -604,7 +604,7 @@ interfaces:: @@\ 51@@ -604,7 +604,7 @@ interfaces:: @@\
52 @(set -x; cd $(BUILDINCDIR)/dstsubdir && for i in srclist; do \ @@\ 52 @(set -x; cd $(BUILDINCDIR)/dstsubdir && for i in srclist; do \ @@\
53 RemoveFile($$i); \ @@\ 53 RemoveFile($$i); \ @@\
54 $(LN) $(BUILDINCTOP)/dstupdir/$(CURRENT_DIR)/$$i .; \ @@\ 54 $(LN) $(BUILDINCTOP)/dstupdir/$(CURRENT_DIR)/$$i .; \ @@\
55- done) 55- done)
56+ done) || exit $$? 56+ done) || exit $$?
57 #endif /* BuildInterfaces */ 57 #endif /* BuildInterfaces */
58  58
59 /* 59 /*
60@@ -1280,20 +1280,18 @@ InstallTarget(install.ln,Concat(llib-l,libname.ln),$(I 60@@ -1280,20 +1280,18 @@ InstallTarget(install.ln,Concat(llib-l,l
61 * (the limit for using source code control systems on files systems with 61 * (the limit for using source code control systems on files systems with
62 * short file names). 62 * short file names).
63 */ 63 */
64-#ifndef InstallManPageLong 64-#ifndef InstallManPageLong
65+#undef InstallManPageLong 65+#undef InstallManPageLong
66 #define InstallManPageLong(file,destdir,dest) @@\ 66 #define InstallManPageLong(file,destdir,dest) @@\
67 BuildInstallHtmlManPage(file,dest,$(MANSUFFIX)) @@\ 67 BuildInstallHtmlManPage(file,dest,$(MANSUFFIX)) @@\
68 @@\ 68 @@\
69 CppManTarget(file,$(EXTRAMANDEFS)) @@\ 69 CppManTarget(file,$(EXTRAMANDEFS)) @@\
70 @@\ 70 @@\
71 InstallNamedTarget(install.man,file.$(MANNEWSUFFIX),$(INSTMANFLAGS),destdir,dest.$(MANSUFFIX)) 71 InstallNamedTarget(install.man,file.$(MANNEWSUFFIX),$(INSTMANFLAGS),destdir,dest.$(MANSUFFIX))
72-#endif /* InstallManPageLong */ 72-#endif /* InstallManPageLong */
73  
74- 73-
 74
75 /* 75 /*
76 * InstallManPageAliases - generate rules to install manual page aliases. 76 * InstallManPageAliases - generate rules to install manual page aliases.
77 */ 77 */
78-#ifndef InstallManPageAliases 78-#ifndef InstallManPageAliases
79+#undef InstallManPageAliases 79+#undef InstallManPageAliases
80 #define InstallManPageAliases(file,destdir,aliases) @@\ 80 #define InstallManPageAliases(file,destdir,aliases) @@\
81 InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX)) @@\ 81 InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX)) @@\
82 @@\ 82 @@\
83@@ -1302,17 +1300,15 @@ install.man:: @@\ 83@@ -1302,17 +1300,15 @@ install.man:: @@\
84 RemoveFile($${TMP}); \ @@\ 84 RemoveFile($${TMP}); \ @@\
85 echo .so `basename destdir`/file.$(MANSUFFIX) > $${TMP}; \ @@\ 85 echo .so `basename destdir`/file.$(MANSUFFIX) > $${TMP}; \ @@\
86 for i in aliases; do (set -x; \ @@\ 86 for i in aliases; do (set -x; \ @@\
87- $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/$$i.$(MANSUFFIX)); \ @@\ 87- $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/$$i.$(MANSUFFIX)); \ @@\
88+ $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/$$i.$(MANSUFFIX)) || exit $$?; \ @@\ 88+ $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/$$i.$(MANSUFFIX)) || exit $$?; \ @@\
89 done; \ @@\ 89 done; \ @@\
90 RemoveFile($${TMP})) 90 RemoveFile($${TMP}))
91-#endif /* InstallManPageAliases */ 91-#endif /* InstallManPageAliases */
92  
93- 92-
 93
94 /* 94 /*
95 * InstallGenManPageLong - More general rules for installing manual pages -- 95 * InstallGenManPageLong - More general rules for installing manual pages --
96 * doesn't assume MANSUFFIX. 96 * doesn't assume MANSUFFIX.
97 */ 97 */
98-#ifndef InstallGenManPageLong 98-#ifndef InstallGenManPageLong
99+#undef InstallGenManPageLong 99+#undef InstallGenManPageLong
100 #define InstallGenManPageLong(file,destdir,dest,suffix) @@\ 100 #define InstallGenManPageLong(file,destdir,dest,suffix) @@\
101 BuildInstallHtmlManPage(file,dest,suffix) @@\ 101 BuildInstallHtmlManPage(file,dest,suffix) @@\
102 @@\ 102 @@\
103@@ -1322,13 +1318,11 @@ install.man:: file.$(MANNEWSUFFIX) @@\ 103@@ -1322,13 +1318,11 @@ install.man:: file.$(MANNEWSUFFIX) @
104 MakeDir($(DESTDIR)destdir) @@\ 104 MakeDir($(DESTDIR)destdir) @@\
105 $(INSTALL) -c $(INSTMANFLAGS) file.$(MANNEWSUFFIX) \ @@\ 105 $(INSTALL) -c $(INSTMANFLAGS) file.$(MANNEWSUFFIX) \ @@\
106 $(DESTDIR)destdir/dest.suffix 106 $(DESTDIR)destdir/dest.suffix
107-#endif /* InstallGenManPageLong */ 107-#endif /* InstallGenManPageLong */
108  
109- 108-
 109
110 /* 110 /*
111 * InstallGenManPageAliases - general equivalent of InstallManPageAliases 111 * InstallGenManPageAliases - general equivalent of InstallManPageAliases
112 */ 112 */
113-#ifndef InstallGenManPageAliases 113-#ifndef InstallGenManPageAliases
114+#undef InstallGenManPageAliases 114+#undef InstallGenManPageAliases
115 #define InstallGenManPageAliases(file,destdir,suffix,aliases) @@\ 115 #define InstallGenManPageAliases(file,destdir,suffix,aliases) @@\
116 InstallHtmlManPageAliases(file,aliases,suffix) @@\ 116 InstallHtmlManPageAliases(file,aliases,suffix) @@\
117 @@\ 117 @@\
118@@ -1337,14 +1331,13 @@ install.man:: @@\ 118@@ -1337,14 +1331,13 @@ install.man:: @@\
119 RemoveFile($${TMP}); \ @@\ 119 RemoveFile($${TMP}); \ @@\
120 echo .so `basename destdir`/file.suffix > $${TMP}; \ @@\ 120 echo .so `basename destdir`/file.suffix > $${TMP}; \ @@\
121 for i in aliases; do (set -x; \ @@\ 121 for i in aliases; do (set -x; \ @@\
122- $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/$$i.suffix); \ @@\ 122- $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/$$i.suffix); \ @@\
123+ $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/$$i.suffix) || exit $$?; \ @@\ 123+ $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/$$i.suffix) || exit $$?; \ @@\
124 done; \ @@\ 124 done; \ @@\
125 RemoveFile($${TMP})) 125 RemoveFile($${TMP}))
126-#endif /* InstallGenManPageAliases */ 126-#endif /* InstallGenManPageAliases */
127  127
128 #else /* CompressManPages */ 128 #else /* CompressManPages */
129  129
130-#ifndef InstallManPageLong 130-#ifndef InstallManPageLong
131+#undef InstallManPageLong 131+#undef InstallManPageLong
132 #define InstallManPageLong(file,destdir,dest) @@\ 132 #define InstallManPageLong(file,destdir,dest) @@\
133 BuildInstallHtmlManPage(file,dest,$(MANSUFFIX)) @@\ 133 BuildInstallHtmlManPage(file,dest,$(MANSUFFIX)) @@\
134 @@\ 134 @@\
135@@ -1356,9 +1349,8 @@ install.man:: file.$(MANNEWSUFFIX) @@\ 135@@ -1356,9 +1349,8 @@ install.man:: file.$(MANNEWSUFFIX) @
136 $(INSTALL) -c $(INSTMANFLAGS) file.$(MANNEWSUFFIX) \ @@\ 136 $(INSTALL) -c $(INSTMANFLAGS) file.$(MANNEWSUFFIX) \ @@\
137 $(DESTDIR)destdir/dest.$(MANSUFFIX) @@\ 137 $(DESTDIR)destdir/dest.$(MANSUFFIX) @@\
138 -$(COMPRESSMANCMD) $(DESTDIR)destdir/dest.$(MANSUFFIX) 138 -$(COMPRESSMANCMD) $(DESTDIR)destdir/dest.$(MANSUFFIX)
139-#endif 139-#endif
140  140
141-#ifndef InstallGenManPageLong 141-#ifndef InstallGenManPageLong
142+#undef InstallGenManPageLong 142+#undef InstallGenManPageLong
143 #define InstallGenManPageLong(file,destdir,dest,suffix) @@\ 143 #define InstallGenManPageLong(file,destdir,dest,suffix) @@\
144 BuildInstallHtmlManPage(file,dest,suffix) @@\ 144 BuildInstallHtmlManPage(file,dest,suffix) @@\
145 @@\ 145 @@\
146@@ -1370,9 +1362,8 @@ install.man:: file.$(MANNEWSUFFIX) @@\ 146@@ -1370,9 +1362,8 @@ install.man:: file.$(MANNEWSUFFIX) @
147 $(INSTALL) -c $(INSTMANFLAGS) file.$(MANNEWSUFFIX) \ @@\ 147 $(INSTALL) -c $(INSTMANFLAGS) file.$(MANNEWSUFFIX) \ @@\
148 $(DESTDIR)destdir/dest.suffix @@\ 148 $(DESTDIR)destdir/dest.suffix @@\
149 -$(COMPRESSMANCMD) $(DESTDIR)destdir/dest.suffix 149 -$(COMPRESSMANCMD) $(DESTDIR)destdir/dest.suffix
150-#endif 150-#endif
151  151
152-#ifndef InstallMultipleMan 152-#ifndef InstallMultipleMan
153+#undef InstallMultipleMan 153+#undef InstallMultipleMan
154 #define InstallMultipleMan(list,dest) @@\ 154 #define InstallMultipleMan(list,dest) @@\
155 install.man:: list @@\ 155 install.man:: list @@\
156 MakeDir($(DESTDIR)dest) @@\ 156 MakeDir($(DESTDIR)dest) @@\
157@@ -1385,39 +1376,35 @@ install.man:: list @@\ 157@@ -1385,39 +1376,35 @@ install.man:: list @@\
158 $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX); \ @@\ 158 $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX); \ @@\
159 $(COMPRESSMANCMD) $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX)); \ @@\ 159 $(COMPRESSMANCMD) $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX)); \ @@\
@@ -189,27 +189,27 @@ $$? when it's coming from inside make.) @@ -189,27 +189,27 @@ $$? when it's coming from inside make.)
189 /* 189 /*
190 * InstallGenManPageAliases - install soft links for aliases. 190 * InstallGenManPageAliases - install soft links for aliases.
191 */ 191 */
192-#ifndef InstallGenManPageAliases 192-#ifndef InstallGenManPageAliases
193+#undef InstallGenManPageAliases 193+#undef InstallGenManPageAliases
194 #define InstallGenManPageAliases(file,destdir,suffix,aliases) @@\ 194 #define InstallGenManPageAliases(file,destdir,suffix,aliases) @@\
195 InstallHtmlManPageAliases(file,aliases,suffix) @@\ 195 InstallHtmlManPageAliases(file,aliases,suffix) @@\
196 @@\ 196 @@\
197 InstallManPageAliasesBase(file,destdir,aliases) 197 InstallManPageAliasesBase(file,destdir,aliases)
198-#endif 198-#endif
199  199
200 #endif /* CompressManPages */ 200 #endif /* CompressManPages */
201  201
202@@ -1425,19 +1412,17 @@ InstallManPageAliasesBase(file,destdir,aliases) 202@@ -1425,19 +1412,17 @@ InstallManPageAliasesBase(file,destdir,a
203 /* 203 /*
204 * InstallManPage - generate rules to install the indicated manual page. 204 * InstallManPage - generate rules to install the indicated manual page.
205 */ 205 */
206-#ifndef InstallManPage 206-#ifndef InstallManPage
207+#undef InstallManPage 207+#undef InstallManPage
208 #define InstallManPage(file,destdir) @@\ 208 #define InstallManPage(file,destdir) @@\
209 InstallManPageLong(file,destdir,file) 209 InstallManPageLong(file,destdir,file)
210-#endif /* InstallManPage */ 210-#endif /* InstallManPage */
211  211
212  212
213 /* 213 /*
214 * InstallGenManPage - general equivalent of InstallManPage 214 * InstallGenManPage - general equivalent of InstallManPage
215 */ 215 */
@@ -221,36 +221,36 @@ $$? when it's coming from inside make.) @@ -221,36 +221,36 @@ $$? when it's coming from inside make.)
221  221
222  222
223 /* 223 /*
224@@ -1499,7 +1484,8 @@ install.man:: file.suffix.html @@\ 224@@ -1499,7 +1484,8 @@ install.man:: file.suffix.html @@\
225 for i in aliases; do (set -x; \ @@\ 225 for i in aliases; do (set -x; \ @@\
226 RemoveFile($(DESTDIR)$(DOCHTMLDIR)/$$i.$$SUF.html); \ @@\ 226 RemoveFile($(DESTDIR)$(DOCHTMLDIR)/$$i.$$SUF.html); \ @@\
227 (cd $(DESTDIR)$(DOCHTMLDIR); \ @@\ 227 (cd $(DESTDIR)$(DOCHTMLDIR); \ @@\
228- $(LN) file.$$SUF.html $$i.$$SUF.html)); \ @@\ 228- $(LN) file.$$SUF.html $$i.$$SUF.html)); \ @@\
229+ $(LN) file.$$SUF.html $$i.$$SUF.html) || exit $$? \ @@\ 229+ $(LN) file.$$SUF.html $$i.$$SUF.html) || exit $$? \ @@\
230+ ) || exit $$?; \ @@\ 230+ ) || exit $$?; \ @@\
231 done 231 done
232 #else 232 #else
233 #define InstallHtmlManPageAliases(file,aliases,suffix) /**/ 233 #define InstallHtmlManPageAliases(file,aliases,suffix) /**/
234@@ -1681,7 +1667,7 @@ InstallNamedTargetNoClobber(install,srcname,$(INSTBINF 234@@ -1681,7 +1667,7 @@ InstallNamedTargetNoClobber(install,srcn
235 #ifndef MakeNamedTargetSubdir 235 #ifndef MakeNamedTargetSubdir
236 #define MakeNamedTargetSubdir(dir,flags,subname)\ 236 #define MakeNamedTargetSubdir(dir,flags,subname)\
237 (cd dir && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) \ @@\ 237 (cd dir && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) \ @@\
238- flags subname) 238- flags subname)
239+ flags subname) || exit $$? 239+ flags subname) || exit $$?
240 #endif 240 #endif
241  241
242 /* 242 /*
243@@ -1692,7 +1678,7 @@ step:: @@\ 243@@ -1692,7 +1678,7 @@ InstallNamedTargetNoClobber(install,srcn
244 step:: @@\ 244 step:: @@\
245 @MakeFlagsToShellFlags(i,set +e); \ @@\ 245 @MakeFlagsToShellFlags(i,set +e); \ @@\
246 echo " cd" dir; cd dir && \ @@\ 246 echo " cd" dir; cd dir && \ @@\
247- for i in list; do (set -x; $(LN) -f sub/$$i .); done 247- for i in list; do (set -x; $(LN) -f sub/$$i .); done
248+ for i in list; do (set -x; $(LN) -f sub/$$i .) || exit $$?; done 248+ for i in list; do (set -x; $(LN) -f sub/$$i .) || exit $$?; done
249 #endif 249 #endif
250  250
251  251
252@@ -1809,7 +1795,7 @@ step:: list @@\ 252@@ -1809,7 +1795,7 @@ step:: list @@\
253 MakeDir($(DESTDIR)dest) @@\ 253 MakeDir($(DESTDIR)dest) @@\
254 @MakeFlagsToShellFlags(i,set +e); \ @@\ 254 @MakeFlagsToShellFlags(i,set +e); \ @@\
255 for i in list; do \ @@\ 255 for i in list; do \ @@\
256- (set -x; $(INSTALL) $(INSTALLFLAGS) flags $$i $(DESTDIR)dest); \ @@\ 256- (set -x; $(INSTALL) $(INSTALLFLAGS) flags $$i $(DESTDIR)dest); \ @@\
@@ -278,27 +278,27 @@ $$? when it's coming from inside make.) @@ -278,27 +278,27 @@ $$? when it's coming from inside make.)
278 #endif /* LinkBuildLibraryMaybe */ 278 #endif /* LinkBuildLibraryMaybe */
279  279
280@@ -2615,7 +2602,9 @@ clean:: @@\ 280@@ -2615,7 +2602,9 @@ clean:: @@\
281 #else 281 #else
282 #define LinkBuildSonameLibrary(lib) MakeDirInline($(BUILDLIBDIR));\ @@\ 282 #define LinkBuildSonameLibrary(lib) MakeDirInline($(BUILDLIBDIR));\ @@\
283 (set -x; RemoveFile($(BUILDLIBDIR)/lib);\ @@\ 283 (set -x; RemoveFile($(BUILDLIBDIR)/lib);\ @@\
284- (cd $(BUILDLIBDIR) && $(LN) $(BUILDLIBTOP)/$(CURRENT_DIR)/lib .)) 284- (cd $(BUILDLIBDIR) && $(LN) $(BUILDLIBTOP)/$(CURRENT_DIR)/lib .))
285+ (cd $(BUILDLIBDIR) && \ @@\ 285+ (cd $(BUILDLIBDIR) && \ @@\
286+ $(LN) $(BUILDLIBTOP)/$(CURRENT_DIR)/lib .) || exit $$? \ @@\ 286+ $(LN) $(BUILDLIBTOP)/$(CURRENT_DIR)/lib .) || exit $$? \ @@\
287+ ) || exit $$? 287+ ) || exit $$?
288 #endif 288 #endif
289 #endif /* LinkBuildSonameLibrary */ 289 #endif /* LinkBuildSonameLibrary */
290  290
291@@ -2713,9 +2702,9 @@ LibraryTargetName(libname): objlist1 objlist2 objlist3 291@@ -2713,9 +2702,9 @@ AllTarget(LibraryTargetName(libname))
292 @@\ 292 @@\
293 LibraryTargetName(libname): objlist1 objlist2 objlist3 $(EXTRALIBRARYDEPS) @@\ 293 LibraryTargetName(libname): objlist1 objlist2 objlist3 $(EXTRALIBRARYDEPS) @@\
294 RemoveFile($@) @@\ 294 RemoveFile($@) @@\
295- (cd down && MakeLibrary(up/$@,objlist1)) @@\ 295- (cd down && MakeLibrary(up/$@,objlist1)) @@\
296- (cd down && MakeLibrary(up/$@,objlist2)) @@\ 296- (cd down && MakeLibrary(up/$@,objlist2)) @@\
297- (cd down && MakeLibrary(up/$@,objlist3)) @@\ 297- (cd down && MakeLibrary(up/$@,objlist3)) @@\
298+ (cd down && MakeLibrary(up/$@,objlist1)) || exit $$? @@\ 298+ (cd down && MakeLibrary(up/$@,objlist1)) || exit $$? @@\
299+ (cd down && MakeLibrary(up/$@,objlist2)) || exit $$? @@\ 299+ (cd down && MakeLibrary(up/$@,objlist2)) || exit $$? @@\
300+ (cd down && MakeLibrary(up/$@,objlist3)) || exit $$? @@\ 300+ (cd down && MakeLibrary(up/$@,objlist3)) || exit $$? @@\
301 RanLibrary($@) @@\ 301 RanLibrary($@) @@\
302 _LinkBuildLibrary($@) 302 _LinkBuildLibrary($@)
303 #endif /* UnsharedLibraryTarget3 */ 303 #endif /* UnsharedLibraryTarget3 */
304@@ -2952,7 +2941,7 @@ step:: dir srclist @@\ 304@@ -2952,7 +2941,7 @@ step:: dir srclist @@\
@@ -312,31 +312,31 @@ $$? when it's coming from inside make.) @@ -312,31 +312,31 @@ $$? when it's coming from inside make.)
312 dir:: @@\ 312 dir:: @@\
313@@ -2974,8 +2963,9 @@ name:: @@\ 313@@ -2974,8 +2963,9 @@ name:: @@\
314 @MakeFlagsToShellFlags(ik,set +e); \ @@\ 314 @MakeFlagsToShellFlags(ik,set +e); \ @@\
315 for i in dirs ;\ @@\ 315 for i in dirs ;\ @@\
316 do \ @@\ 316 do \ @@\
317- echo verb "in $(CURRENT_DIR)/$$i..."; \ @@\ 317- echo verb "in $(CURRENT_DIR)/$$i..."; \ @@\
318- (cd $$i && LANG=lang $(MAKE) $(MFLAGS) flags subname);\ @@\ 318- (cd $$i && LANG=lang $(MAKE) $(MFLAGS) flags subname);\ @@\
319+ echo verb "in $(CURRENT_DIR)/$$i..."; \ @@\ 319+ echo verb "in $(CURRENT_DIR)/$$i..."; \ @@\
320+ (cd $$i && \ @@\ 320+ (cd $$i && \ @@\
321+ LANG=lang $(MAKE) $(MFLAGS) flags subname) || exit $$?; \ @@\ 321+ LANG=lang $(MAKE) $(MFLAGS) flags subname) || exit $$?; \ @@\
322 done 322 done
323 #endif 323 #endif
324  324
325@@ -3384,7 +3374,7 @@ step:: @@\ 325@@ -3384,7 +3374,7 @@ clean:: @@\
326 step:: @@\ 326 step:: @@\
327 DirFailPrefix@MakeFlagsToShellFlags(i,set +e); \ @@\ 327 DirFailPrefix@MakeFlagsToShellFlags(i,set +e); \ @@\
328 for i in dirs; do if [ -d $(DESTDIR)$$i ]; then \ @@\ 328 for i in dirs; do if [ -d $(DESTDIR)$$i ]; then \ @@\
329- set +x; else (set -x; $(MKDIRHIER) $(DESTDIR)$$i); fi; \ @@\ 329- set +x; else (set -x; $(MKDIRHIER) $(DESTDIR)$$i); fi; \ @@\
330+ set +x; else (set -x; $(MKDIRHIER) $(DESTDIR)$$i) || exit $$?; fi; \ @@\ 330+ set +x; else (set -x; $(MKDIRHIER) $(DESTDIR)$$i) || exit $$?; fi; \ @@\
331 done 331 done
332 #endif /* MakeDirectories */ 332 #endif /* MakeDirectories */
333  333
334@@ -3610,7 +3600,7 @@ objname.Osuf: Concat3(libpath,/lib,libname.a) @@\ 334@@ -3610,7 +3600,7 @@ objname.Osuf: Concat3(libpath,/lib,libna
335 @$(CP) Concat3(libpath,/lib,libname.a) tmp @@\ 335 @$(CP) Concat3(libpath,/lib,libname.a) tmp @@\
336 @(cd tmp; set -x; ArExtCmd Concat(lib,libname.a); \ @@\ 336 @(cd tmp; set -x; ArExtCmd Concat(lib,libname.a); \ @@\
337 $(LD) $(LDCOMBINEFLAGS) *.Osuf -o ../$@; \ @@\ 337 $(LD) $(LDCOMBINEFLAGS) *.Osuf -o ../$@; \ @@\
338- RemoveFiles(*.Osuf)) @@\ 338- RemoveFiles(*.Osuf)) @@\
339+ RemoveFiles(*.Osuf)) || exit $$? @@\ 339+ RemoveFiles(*.Osuf)) || exit $$? @@\
340 @$(RM) -r tmp @@\ 340 @$(RM) -r tmp @@\
341 @@\ 341 @@\
342 clean:: @@\ 342 clean:: @@\