diff options
| author |   Joonas Niilola <juippis@gentoo.org> | 2023-05-09 16:16:03 +0300 |
|---|---|---|
| committer | Joonas Niilola <juippis@gentoo.org> | 2023-05-09 16:16:03 +0300 |
| commit | af8fbdf37728cc694b65e7b297acc21374755934 (patch) | |
| tree | af8accf2ac68f5921221fdfd3ebf5310e87c5112 | |
| parent | sys-libs/libcap: Stabilize 2.68 ppc64, #906014 (diff) | |
| download | gentoo-af8fbdf37728cc694b65e7b297acc21374755934.tar.gz gentoo-af8fbdf37728cc694b65e7b297acc21374755934.tar.bz2 gentoo-af8fbdf37728cc694b65e7b297acc21374755934.zip | |
dev-libs/nspr: musl fixes
Closes: https://bugs.gentoo.org/905998
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
| -rw-r--r-- | dev-libs/nspr/files/nspr-4.35-bgo-905998-lfs64-musl.patch | 15 | ||||
| -rw-r--r-- | dev-libs/nspr/nspr-4.35-r1.ebuild | 7 |
2 files changed, 20 insertions, 2 deletions
diff --git a/dev-libs/nspr/files/nspr-4.35-bgo-905998-lfs64-musl.patch b/dev-libs/nspr/files/nspr-4.35-bgo-905998-lfs64-musl.patch new file mode 100644 index 000000000000..d834c3e0b295 --- /dev/null +++ b/dev-libs/nspr/files/nspr-4.35-bgo-905998-lfs64-musl.patch @@ -0,0 +1,15 @@ +needed since https://github.com/bminor/musl/commit/25e6fee27f4a293728dd15b659170e7b9c7db9bc +-- +diff --git a/nspr/pr/include/md/_unixos.h b/nspr/pr/include/md/_unixos.h +index 7d444cd..0099d2c 100644 +--- a/nspr/pr/include/md/_unixos.h ++++ b/nspr/pr/include/md/_unixos.h +@@ -589,7 +589,7 @@ typedef off64_t _MDOff64_t; + + #elif defined(_PR_HAVE_OFF64_T) + typedef struct stat64 _MDStat64; +-typedef off64_t _MDOff64_t; ++typedef off_t _MDOff64_t; + #elif defined(_PR_HAVE_LARGE_OFF_T) + typedef struct stat _MDStat64; + typedef off_t _MDOff64_t; diff --git a/dev-libs/nspr/nspr-4.35-r1.ebuild b/dev-libs/nspr/nspr-4.35-r1.ebuild index 878f4793dffd..88c8c77686a0 100644 --- a/dev-libs/nspr/nspr-4.35-r1.ebuild +++ b/dev-libs/nspr/nspr-4.35-r1.ebuild @@ -21,9 +21,9 @@ MULTILIB_CHOST_TOOLS=( ) PATCHES=( + "${FILESDIR}"/${PN}-4.10.6-solaris.patch "${FILESDIR}"/${PN}-4.23-prtime.patch "${FILESDIR}"/${PN}-4.7.1-solaris.patch - "${FILESDIR}"/${PN}-4.10.6-solaris.patch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch "${FILESDIR}"/${PN}-4.8.9-link-flags.patch # We do not need to pass -L$libdir via nspr-config --libs @@ -37,7 +37,10 @@ src_prepare() { default - use elibc_musl && eapply "${FILESDIR}"/${PN}-4.21-ipv6-musl-support.patch + if use elibc_musl; then + eapply "${FILESDIR}"/${PN}-4.21-ipv6-musl-support.patch + eapply "${FILESDIR}"/nspr-4.35-bgo-905998-lfs64-musl.patch + fi # rename configure.in to configure.ac for new autotools compatibility if [[ -e "${S}"/nspr/configure.in ]] ; then |