---- zstd-1.0.0/lib/Makefile.orig 2016-09-16 19:05:28.934891649 +0200
-+++ zstd-1.0.0/lib/Makefile 2016-09-16 19:14:06.861552399 +0200
-@@ -63,17 +63,17 @@
-
- libzstd: $(ZSTD_FILES)
+--- zstd-1.3.7/lib/Makefile.orig 2018-10-17 05:58:52.000000000 +0200
++++ zstd-1.3.7/lib/Makefile 2018-11-14 05:40:43.128342635 +0100
+@@ -106,7 +106,7 @@
+ libzstd.a: ARFLAGS = rcs
+ libzstd.a: $(ZSTD_OBJ)
@echo compiling static library
-- @$(CC) $(FLAGS) -c $^
-- @$(AR) rcs $@.a *.o
-+ $(CC) $(FLAGS) -c $^
-+ $(AR) rcs $@.a *.o
+- @$(AR) $(ARFLAGS) $@ $^
++ $(AR) $(ARFLAGS) $@ $^
+
+ libzstd.a-mt: CPPFLAGS += -DZSTD_MULTITHREAD
+ libzstd.a-mt: libzstd.a
+@@ -125,10 +125,10 @@
+ $(LIBZSTD): LDFLAGS += -shared -fPIC -fvisibility=hidden
+ $(LIBZSTD): $(ZSTD_FILES)
@echo compiling dynamic library $(LIBVER)
-- @$(CC) $(FLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $@.$(SHARED_EXT_VER)
-+ $(CC) $(FLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $@.$(SHARED_EXT_VER)
+- @$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
++ $(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
@echo creating versioned links
-- @ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT_MAJOR)
-- @ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT)
-+ ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT_MAJOR)
-+ ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT)
+- @ln -sf $@ libzstd.$(SHARED_EXT_MAJOR)
+- @ln -sf $@ libzstd.$(SHARED_EXT)
++ ln -sf $@ libzstd.$(SHARED_EXT_MAJOR)
++ ln -sf $@ libzstd.$(SHARED_EXT)
+
+ endif
+
+@@ -154,13 +154,13 @@
+ libzstd-nomt: $(ZSTD_NOMT_FILES)
+ @echo compiling single-thread dynamic library $(LIBVER)
+ @echo files : $(ZSTD_NOMT_FILES)
+- @$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
++ $(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
clean:
-- @rm -f core *.o *.a *.gcda *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc
-- @rm -f decompress/*.o
-+ rm -f core *.o *.a *.gcda *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc
-+ rm -f decompress/*.o
+- @$(RM) -r *.dSYM # macOS-specific
+- @$(RM) core *.o *.a *.gcda *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc
+- @$(RM) dll/libzstd.dll dll/libzstd.lib libzstd-nomt*
+- @$(RM) common/*.o compress/*.o decompress/*.o dictBuilder/*.o legacy/*.o deprecated/*.o
++ $(RM) -r *.dSYM # macOS-specific
++ $(RM) core *.o *.a *.gcda *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc
++ $(RM) dll/libzstd.dll dll/libzstd.lib libzstd-nomt*
++ $(RM) common/*.o compress/*.o decompress/*.o dictBuilder/*.o legacy/*.o deprecated/*.o
@echo Cleaning library completed
- #------------------------------------------------------------------------
-@@ -83,22 +83,22 @@
+ #-----------------------------------------------------------------------------
+@@ -203,7 +203,7 @@ INSTALL_DATA ?= $(INSTALL) -m 644
libzstd.pc:
libzstd.pc: libzstd.pc.in
@echo creating pkgconfig
- @sed -e 's|@PREFIX@|$(PREFIX)|' \
+ sed -e 's|@PREFIX@|$(PREFIX)|' \
- -e 's|@LIBDIR@|$(LIBDIR)|' \
- -e 's|@INCLUDEDIR@|$(INCLUDEDIR)|' \
-e 's|@VERSION@|$(VERSION)|' \
$< >$@
- install: libzstd libzstd.pc
-- @install -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/
-- @install -m 755 libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER)
-- @cp -a libzstd.$(SHARED_EXT_MAJOR) $(DESTDIR)$(LIBDIR)
-- @cp -a libzstd.$(SHARED_EXT) $(DESTDIR)$(LIBDIR)
-- @cp -a libzstd.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
-- @install -m 644 libzstd.a $(DESTDIR)$(LIBDIR)/libzstd.a
-- @install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)/zstd.h
-- @install -m 644 common/zbuff.h $(DESTDIR)$(INCLUDEDIR)/zbuff.h
-- @install -m 644 dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)/zdict.h
-+ install -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/
-+ install -m 755 libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER)
-+ cp -a libzstd.$(SHARED_EXT_MAJOR) $(DESTDIR)$(LIBDIR)
-+ cp -a libzstd.$(SHARED_EXT) $(DESTDIR)$(LIBDIR)
-+ cp -a libzstd.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
-+ install -m 644 libzstd.a $(DESTDIR)$(LIBDIR)/libzstd.a
-+ install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)/zstd.h
-+ install -m 644 common/zbuff.h $(DESTDIR)$(INCLUDEDIR)/zbuff.h
-+ install -m 644 dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)/zdict.h
+@@ -209,39 +209,39 @@
@echo zstd static and shared library installed
+ install-pc: libzstd.pc
+- @$(INSTALL) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/
+- @$(INSTALL_DATA) libzstd.pc $(DESTDIR)$(PKGCONFIGDIR)/
++ $(INSTALL) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/
++ $(INSTALL_DATA) libzstd.pc $(DESTDIR)$(PKGCONFIGDIR)/
+
+ install-static: libzstd.a
+ @echo Installing static library
+- @$(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)/
+- @$(INSTALL_DATA) libzstd.a $(DESTDIR)$(LIBDIR)
++ $(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)/
++ $(INSTALL_DATA) libzstd.a $(DESTDIR)$(LIBDIR)
+
+ install-shared: libzstd
+ @echo Installing shared library
+- @$(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)/
+- @$(INSTALL_PROGRAM) $(LIBZSTD) $(DESTDIR)$(LIBDIR)
+- @ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
+- @ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT)
++ $(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)/
++ $(INSTALL_PROGRAM) $(LIBZSTD) $(DESTDIR)$(LIBDIR)
++ ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
++ ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT)
+
+ install-includes:
+ @echo Installing includes
+- @$(INSTALL) -d -m 755 $(DESTDIR)$(INCLUDEDIR)/
+- @$(INSTALL_DATA) zstd.h $(DESTDIR)$(INCLUDEDIR)
+- @$(INSTALL_DATA) common/zstd_errors.h $(DESTDIR)$(INCLUDEDIR)
+- @$(INSTALL_DATA) deprecated/zbuff.h $(DESTDIR)$(INCLUDEDIR) # prototypes generate deprecation warnings
+- @$(INSTALL_DATA) dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)
++ $(INSTALL) -d -m 755 $(DESTDIR)$(INCLUDEDIR)/
++ $(INSTALL_DATA) zstd.h $(DESTDIR)$(INCLUDEDIR)
++ $(INSTALL_DATA) common/zstd_errors.h $(DESTDIR)$(INCLUDEDIR)
++ $(INSTALL_DATA) deprecated/zbuff.h $(DESTDIR)$(INCLUDEDIR) # prototypes generate deprecation warnings
++ $(INSTALL_DATA) dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)
+
uninstall:
-@@ -106,10 +106,10 @@
- $(RM) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
- $(RM) $(DESTDIR)$(LIBDIR)/pkgconfig/libzstd.pc
- [ -x $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER) ] && $(RM) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER)
-- @[ -f $(DESTDIR)$(LIBDIR)/libzstd.a ] && $(RM) $(DESTDIR)$(LIBDIR)/libzstd.a
-- @[ -f $(DESTDIR)$(INCLUDEDIR)/zstd.h ] && $(RM) $(DESTDIR)$(INCLUDEDIR)/zstd.h
-- @[ -f $(DESTDIR)$(INCLUDEDIR)/zbuff.h ] && $(RM) $(DESTDIR)$(INCLUDEDIR)/zbuff.h
-- @[ -f $(DESTDIR)$(INCLUDEDIR)/zdict.h ] && $(RM) $(DESTDIR)$(INCLUDEDIR)/zdict.h
-+ [ -f $(DESTDIR)$(LIBDIR)/libzstd.a ] && $(RM) $(DESTDIR)$(LIBDIR)/libzstd.a
-+ [ -f $(DESTDIR)$(INCLUDEDIR)/zstd.h ] && $(RM) $(DESTDIR)$(INCLUDEDIR)/zstd.h
-+ [ -f $(DESTDIR)$(INCLUDEDIR)/zbuff.h ] && $(RM) $(DESTDIR)$(INCLUDEDIR)/zbuff.h
-+ [ -f $(DESTDIR)$(INCLUDEDIR)/zdict.h ] && $(RM) $(DESTDIR)$(INCLUDEDIR)/zdict.h
+- @$(RM) $(DESTDIR)$(LIBDIR)/libzstd.a
+- @$(RM) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT)
+- @$(RM) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
+- @$(RM) $(DESTDIR)$(LIBDIR)/$(LIBZSTD)
+- @$(RM) $(DESTDIR)$(PKGCONFIGDIR)/libzstd.pc
+- @$(RM) $(DESTDIR)$(INCLUDEDIR)/zstd.h
+- @$(RM) $(DESTDIR)$(INCLUDEDIR)/zstd_errors.h
+- @$(RM) $(DESTDIR)$(INCLUDEDIR)/zbuff.h # Deprecated streaming functions
+- @$(RM) $(DESTDIR)$(INCLUDEDIR)/zdict.h
++ $(RM) $(DESTDIR)$(LIBDIR)/libzstd.a
++ $(RM) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT)
++ $(RM) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
++ $(RM) $(DESTDIR)$(LIBDIR)/$(LIBZSTD)
++ $(RM) $(DESTDIR)$(PKGCONFIGDIR)/libzstd.pc
++ $(RM) $(DESTDIR)$(INCLUDEDIR)/zstd.h
++ $(RM) $(DESTDIR)$(INCLUDEDIR)/zstd_errors.h
++ $(RM) $(DESTDIR)$(INCLUDEDIR)/zbuff.h # Deprecated streaming functions
++ $(RM) $(DESTDIR)$(INCLUDEDIR)/zdict.h
@echo zstd libraries successfully uninstalled
endif
projects / packages / zstd.git / blobdiff