diff options
Diffstat (limited to 'dev-libs/nspr/nspr-4.22.ebuild')
| -rw-r--r-- | dev-libs/nspr/nspr-4.22.ebuild | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/dev-libs/nspr/nspr-4.22.ebuild b/dev-libs/nspr/nspr-4.22.ebuild index 8cbe6d0ff4fa..a76257f19ee2 100644 --- a/dev-libs/nspr/nspr-4.22.ebuild +++ b/dev-libs/nspr/nspr-4.22.ebuild @@ -13,7 +13,11 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz" LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )" SLOT="0" +<<<<<<< HEAD KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +======= +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +>>>>>>> next IUSE="debug elibc_musl" MULTILIB_CHOST_TOOLS=( |