File tree Expand file tree Collapse file tree 1 file changed +8
-5
lines changed
Expand file tree Collapse file tree 1 file changed +8
-5
lines changed Original file line number Diff line number Diff line change @@ -55,10 +55,6 @@ if [ ! -e "./openssl-1.1.0c/build/lib/libssl.a" ] ; then
5555 cd -
5656fi
5757
58- # Patch squashfuse-tools Makefile to link against static llzma
59- sed -i " s|CFLAGS += -DXZ_SUPPORT|CFLAGS += -DXZ_SUPPORT -I../../xz-5.2.3/build/include|g" squashfs-tools/squashfs-tools/Makefile
60- sed -i " s|LIBS += -llzma|LIBS += -L../../xz-5.2.3/build/lib -llzma|g" squashfs-tools/squashfs-tools/Makefile
61-
6258# Patch squashfuse_ll to be a library rather than an executable
6359
6460cd squashfuse
@@ -75,9 +71,16 @@ if [ ! -e ./Makefile ] ; then
7571 autoreconf -fi || true # Errors out, but the following succeeds then?
7672 autoconf
7773 sed -i ' /PKG_CHECK_MODULES.*/,/,:./d' configure # https://github.com/vasi/squashfuse/issues/12
78- ./configure --disable-demo --disable-high-level --without-lzo --without-lz4 --with-xz=` pwd` /../xz-5.2.3/build/
74+ ./configure --disable-demo --disable-high-level --without-lzo --without-lz4 --with-xz=` pwd` /../xz-5.2.3/build
7975fi
8076
77+ # Patch make file to use static lzma
78+ sed -i " s|XZ_LIBS = -llzma -L$( pwd) /../xz-5.2.3/build/lib|XZ_LIBS = -Bstatic -llzma -L$( pwd) /../xz-5.2.3/build/lib|g" Makefile
79+
80+ # Patch squashfuse-tools Makefile to link against static llzma
81+ sed -i " s|CFLAGS += -DXZ_SUPPORT|CFLAGS += -DXZ_SUPPORT -I../../xz-5.2.3/build/include|g" ../squashfs-tools/squashfs-tools/Makefile
82+ sed -i " s|LIBS += -llzma|LIBS += -Bstatic -llzma -L../../xz-5.2.3/build/lib|g" ../squashfs-tools/squashfs-tools/Makefile
83+
8184bash --version
8285
8386make
You can’t perform that action at this time.
0 commit comments