Permalink
Browse files

restore lz4 support

  • Loading branch information...
1 parent d11f2a8 commit 8ddbb7dd28870759bdbbebaffb5d02f50a2786d6 @bignaux bignaux committed Oct 18, 2016
Showing with 7 additions and 5 deletions.
  1. +1 −1 Makefile.runtime
  2. +3 −3 build.sh
  3. +3 −1 install-build-deps.sh
View
@@ -33,7 +33,7 @@ embed: 1024_blank_bytes runtime
runtime: runtime.o notify.o elf.o getsection.o
$(CC) $(CFLAGS) $^ ./squashfuse/.libs/libsquashfuse_ll.a \
./squashfuse/.libs/libsquashfuse.a ./squashfuse/.libs/libfuseprivate.a \
- -lfuse -lpthread -lz -linotifytools -ldl `pkg-config --libs liblzma` -o runtime
+ -lfuse -lpthread -lz -linotifytools -ldl `pkg-config --libs liblzma liblz4` -o runtime
install: runtime embed
$(MKDIR) build
View
@@ -22,7 +22,7 @@ if [ ! -e ./Makefile ] ; then
automake --force-missing --add-missing
autoconf
./configure --disable-demo --disable-high-level \
- --with-xz=/usr/lib/ --without-lz4 --without-lzo
+ --with-xz=/usr/lib/ --without-lzo
fi
bash --version
@@ -69,14 +69,14 @@ cc -DVERSION_NUMBER=\"$(git describe --tags --always --abbrev=7)\" -D_FILE_OFFSE
# Now statically link against libsquashfuse and liblzma - glib version
-cc data.o appimagetool.o ../elf.c ../getsection.c -DENABLE_BINRELOC ../binreloc.c ../squashfuse/.libs/libsquashfuse.a ../squashfuse/.libs/libfuseprivate.a -Wl,-Bdynamic -lfuse -lpthread $(pkg-config --libs glib-2.0 liblzma ) -lz -Wl,-Bdynamic -o appimagetool
+cc data.o appimagetool.o ../elf.c ../getsection.c -DENABLE_BINRELOC ../binreloc.c ../squashfuse/.libs/libsquashfuse.a ../squashfuse/.libs/libfuseprivate.a -Wl,-Bdynamic -lfuse -lpthread $(pkg-config --libs glib-2.0 liblzma liblz4) -lz -Wl,-Bdynamic -o appimagetool
# Version without glib
# cc -D_FILE_OFFSET_BITS=64 -I ../squashfuse -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -g -Os -c ../appimagetoolnoglib.c
# cc data.o appimagetoolnoglib.o -DENABLE_BINRELOC ../binreloc.c ../squashfuse/.libs/libsquashfuse.a ../squashfuse/.libs/libfuseprivate.a -Wl,-Bdynamic -lfuse -lpthread -lz -Wl,-Bstatic -llzma -Wl,-Bdynamic -o appimagetoolnoglib
# appimaged, an optional component
-cc -std=gnu99 ../getsection.c -Wl,-Bdynamic -DVERSION_NUMBER=\"$(git describe --tags --always --abbrev=7)\" ../elf.c ../appimaged.c ../squashfuse/.libs/libsquashfuse.a ../squashfuse/.libs/libfuseprivate.a -I../squashfuse/ -Wl,-Bstatic -linotifytools -Wl,-Bdynamic $(pkg-config --cflags --libs glib-2.0) $(pkg-config --cflags gio-2.0) $(pkg-config --libs gio-2.0) -ldl -lpthread -lz $(pkg-config --libs liblzma ) -o appimaged
+cc -std=gnu99 ../getsection.c -Wl,-Bdynamic -DVERSION_NUMBER=\"$(git describe --tags --always --abbrev=7)\" ../elf.c ../appimaged.c ../squashfuse/.libs/libsquashfuse.a ../squashfuse/.libs/libfuseprivate.a -I../squashfuse/ -Wl,-Bstatic -linotifytools -Wl,-Bdynamic $(pkg-config --cflags --libs glib-2.0) $(pkg-config --cflags gio-2.0) $(pkg-config --libs gio-2.0) -ldl -lpthread -lz $(pkg-config --libs liblzma liblz4) -o appimaged
cd ..
@@ -3,6 +3,8 @@
# Install build dependencies; TODO: Support systems that do not use apt-get (Pull Requests welcome!)
if [ -e /usr/bin/apt-get ] ; then
- sudo apt-get -y install git autoconf libtool make gcc libtool libfuse-dev liblzma-dev libglib2.0-dev libssl-dev libinotifytools0-dev
+ sudo apt-get -y install git autoconf libtool make gcc libtool libfuse-dev \
+ liblzma-dev libglib2.0-dev libssl-dev libinotifytools0-dev liblz4-dev
# libtool-bin might be required in newer distributions but is not available in precise
+ sudo cp pkgconfig/liblz4.pc /usr/lib/x86_64-linux-gnu/pkgconfig/
fi

0 comments on commit 8ddbb7d

Please sign in to comment.