void-packages/srcpkgs/pcc/patches/x86-build-fix.patch
Đoàn Trần Công Danh 49cb564d14 srcpkgs/p*: convert patches to -Np1
* par is kept at -Np0

```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
	for p in ${template%/template}/patches/*; do
		sed -i '
			\,^[+-][+-][+-] /dev/null,b
			/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
			s,^[*][*][*] ,&a/,
			/^--- /{
				s,\(^--- \)\(./\)*,\1a/,
				s,[.-][Oo][Rr][Ii][Gg]\([	/]\),\1,
				s/[.-][Oo][Rr][Ii][Gg]$//
				s/[.]patched[.]\([^.]\)/.\1/
				h
			}
			/^+++ -/{
				g
				s/^--- a/+++ b/
				b
			}
			s,\(^+++ \)\(./\)*,\1b/,
		' "$p"
	done
	sed -i '/^patch_args=/d' $template
done
```
2021-06-20 13:17:29 +07:00

18 lines
559 B
Diff

Fix x86 build failure: only use MULTIARCH_PATH if it's defined :-)
--xtraeme
--- a/pcc/cc/cc/cc.c 2014-12-18 14:57:43.961103113 +0100
+++ b/pcc/cc/cc/cc.c 2014-12-18 14:57:52.881207162 +0100
@@ -207,9 +207,9 @@ char *cppmdadd[] = CPPMDADD;
#endif
#ifndef DEFLIBDIRS /* default library search paths */
#ifdef MULTIARCH_PATH
-#define DEFLIBDIRS { "/usr/lib/", 0 }
-#else
#define DEFLIBDIRS { "/usr/lib/", "/usr/lib/" MULTIARCH_PATH "/", 0 }
+#else
+#define DEFLIBDIRS { "/usr/lib/", 0 }
#endif
#endif
#ifndef DEFLIBS /* default libraries included */