gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

sys-fs/squashfs-tools: Fix CFLAGS=-fno-common

Browse Source 
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Closes: https://bugs.gentoo.org/706456
Signed-off-by: Jeroen Roovers <jer@gentoo.org>
This commit is contained in:
Jeroen Roovers
2020-01-27 12:51:05 +01:00
parent 33904c2fd7
commit a9a132b4df
3 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sys-fs/squashfs-tools/files/squashfs-tools-4.4-fno-common.patch Normal file
View File

@@ -0,0 +1,11 @@
--- a/squashfs-tools/mksquashfs.h
+++ b/squashfs-tools/mksquashfs.h
@@ -143,7 +143,7 @@ struct append_file {
#endif
extern struct cache *reader_buffer, *fragment_buffer, *reserve_cache;
-struct cache *bwriter_buffer, *fwriter_buffer;
+extern struct cache *bwriter_buffer, *fwriter_buffer;
extern struct queue *to_reader, *to_deflate, *to_writer, *from_writer,
*to_frag, *locked_fragment, *to_process_frag;
extern struct append_file **file_mapping;

11
sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2019 Gentoo Authors
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -30,7 +30,9 @@ DEPEND="
${RDEPEND}
static? ( ${LIB_DEPEND} )
"
S=${WORKDIR}/${P}/${PN}
PATCHES=(
"${FILESDIR}"/${PN}-4.4-fno-common.patch
)
use10() { usex $1 1 0 ; }
@@ -55,12 +57,11 @@ src_configure() {
}
src_compile() {
emake "${EMAKE_SQUASHFS_CONF[@]}"
emake "${EMAKE_SQUASHFS_CONF[@]}" -C ${PN}
}
src_install() {
dobin mksquashfs unsquashfs
cd ..
dobin ${PN}/{mksquashfs,unsquashfs}
dodoc ACKNOWLEDGEMENTS CHANGES README*
dodoc -r RELEASE-READMEs
}

9
sys-fs/squashfs-tools/squashfs-tools-9999.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2019 Gentoo Authors
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -34,12 +34,12 @@ DEPEND="
"
PATCHES=(
"${FILESDIR}"/${PN}-4.3-sysmacros.patch
"${FILESDIR}"/${PN}-4.4-fno-common.patch
)
use10() { usex $1 1 0 ; }
src_configure() {
cd "${WORKDIR}"/${P}/${PN} || die
# set up make command line variables in EMAKE_SQUASHFS_CONF
EMAKE_SQUASHFS_CONF=(
@@ -57,11 +57,10 @@ src_configure() {
}
src_compile() {
cd "${WORKDIR}"/${P}/${PN} || die
emake "${EMAKE_SQUASHFS_CONF[@]}"
emake "${EMAKE_SQUASHFS_CONF[@]}" -C ${PN}
}
src_install() {
dobin "${WORKDIR}"/${P}/${PN}/{mksquashfs,unsquashfs}
dobin ${PN}/{mksquashfs,unsquashfs}
dodoc CHANGES README RELEASE-READMEs/*
}