Merge pull request #1310 from citrus-it/fixes

Build fixes
omniosorg · Jun 25, 2023 · 4539c1c · 4539c1c
2 parents 87c1f3e + 0a32f47
commit 4539c1c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/build/gdb/patches/fix-null-ptr.patch b/build/gdb/patches/fix-null-ptr.patch
@@ -6,7 +6,7 @@ diff -wpruN '--exclude=*.orig' a~/gdb/osabi.c a/gdb/osabi.c
    { "SVR4", NULL },
    { "GNU/Hurd", NULL },
 -  { "Solaris", NULL },
-+  { "illumos", "solaris[2-9]\.[0-9][0-9]" },
++  { "illumos", "solaris[2-9]\\.[0-9][0-9]" },
    { "GNU/Linux", "linux(-gnu[^-]*)?" },
    { "FreeBSD", NULL },
    { "NetBSD", NULL },
diff --git a/build/x11/libxcb/build.sh b/build/x11/libxcb/build.sh
@@ -39,8 +39,8 @@ prep_build
 build_dependency -merge libpthread-stubs libpthread-stubs-$PSTUBVER \
     x11/libpthread-stubs libpthread-stubs $PSTUBVER
 
-addpath PKG_CONFIG_PATH32 $DEPROOT$PREFIX/lib/pkgconfig
-addpath PKG_CONFIG_PATH64 $DEPROOT$PREFIX/lib/amd64/pkgconfig
+addpath PKG_CONFIG_PATH[i386] $DEPROOT$PREFIX/lib/pkgconfig
+addpath PKG_CONFIG_PATH[amd64] $DEPROOT$PREFIX/lib/amd64/pkgconfig
 
 ######################################################################