Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › fb6eeff
pkg: avoid a warning around enum pkg_shlib_flags
Pierre Pronchery committed 2 months ago
commit fb6eeff7da3e10d576435b4366e70adaeee1ccf9
parent 3b9bfd7
2 files changed +2 -1
modified libpkg/pkg_abi.c
@@ -592,7 +592,7 @@ pkg_analyse_files(struct pkgdb *db __unused, struct pkg *pkg, const char *stage)
			case PKG_SHLIB_FLAGS_COMPAT_LINUX:

				paths = pkg_config_get("SHLIB_PROVIDE_PATHS_COMPAT_LINUX");

				break;
- 
			case (PKG_SHLIB_FLAGS_COMPAT_32 | PKG_SHLIB_FLAGS_COMPAT_LINUX):
+ 
			case PKG_SHLIB_FLAGS_COMPAT_LINUX_32:

				paths = pkg_config_get("SHLIB_PROVIDE_PATHS_COMPAT_LINUX_32");

				break;

			default:
modified libpkg/private/pkg.h
@@ -858,6 +858,7 @@ enum pkg_shlib_flags {
	PKG_SHLIB_FLAGS_NONE = 0,

	PKG_SHLIB_FLAGS_COMPAT_32 = 1 << 0,

	PKG_SHLIB_FLAGS_COMPAT_LINUX = 1 << 1,
+ 
	PKG_SHLIB_FLAGS_COMPAT_LINUX_32 = (1 << 0) | (1 << 1),

};

/* Determine shlib flags by comparing the shlib abi with ctx.abi */

enum pkg_shlib_flags pkg_shlib_flags_from_abi(const struct pkg_abi *shlib_abi);