ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert install to normal zstd due to travis limitation (likely gcc 4.6)

Browse Source
This commit is contained in:
Yann Collet
2015-12-01 01:56:02 +01:00
parent d062f1379c
commit c620b48489
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+1 -1
View File
@@ -74,7 +74,7 @@ uninstall:
$(MAKE) -C $(PRGDIR) $@ $(MAKE) -C $(PRGDIR) $@
travis-install: travis-install:
sudo $(MAKE) install $(MAKE) install PREFIX=~/install_test_dir
test: test:
$(MAKE) -C $(PRGDIR) $@ $(MAKE) -C $(PRGDIR) $@
lib/Makefile
+4 -5
View File
@@ -65,9 +65,9 @@ ifeq ($(shell uname), Darwin)
SHARED_EXT = dylib SHARED_EXT = dylib
SHARED_EXT_MAJOR = $(LIBVER_MAJOR).$(SHARED_EXT) SHARED_EXT_MAJOR = $(LIBVER_MAJOR).$(SHARED_EXT)
SHARED_EXT_VER = $(LIBVER).$(SHARED_EXT) SHARED_EXT_VER = $(LIBVER).$(SHARED_EXT)
SONAME_FLAGS = -install_name $(PREFIX)/lib/libzstd.$(SHARED_EXT_MAJOR) -compatibility_version $(LIBVER_MAJOR) -current_version $(LIBVER) SONAME_FLAGS = -install_name $(PREFIX)/lib/$@.$(SHARED_EXT_MAJOR) -compatibility_version $(LIBVER_MAJOR) -current_version $(LIBVER)
else else
SONAME_FLAGS = -Wl,-soname=libzstd.$(SHARED_EXT).$(LIBVER_MAJOR) SONAME_FLAGS = -Wl,-soname=$@.$(SHARED_EXT).$(LIBVER_MAJOR)
SHARED_EXT = so SHARED_EXT = so
SHARED_EXT_MAJOR = $(SHARED_EXT).$(LIBVER_MAJOR) SHARED_EXT_MAJOR = $(SHARED_EXT).$(LIBVER_MAJOR)
SHARED_EXT_VER = $(SHARED_EXT).$(LIBVER) SHARED_EXT_VER = $(SHARED_EXT).$(LIBVER)
@@ -83,7 +83,7 @@ all: clean libzstd
libzstd: $(ZSTD_FILES) libzstd: $(ZSTD_FILES)
@echo compiling static library @echo compiling static library
@$(CC) $(FLAGS) -c $^ @$(CC) $(FLAGS) -c $^
@$(AR) rcs libzstd.a *.o @$(AR) rcs $@.a *.o
@echo compiling dynamic library $(LIBVER) @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)
@echo creating versioned links @echo creating versioned links
@@ -91,10 +91,9 @@ libzstd: $(ZSTD_FILES)
@ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT) @ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT)
clean: clean:
@rm -f core *.o *.a *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc @rm -f core *.o *.a *.gcda *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc
@echo Cleaning library completed @echo Cleaning library completed
#------------------------------------------------------------------------ #------------------------------------------------------------------------
#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets #make install is validated only for Linux, OSX, kFreeBSD and Hurd targets
ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU)) ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU))
programs/Makefile
+1 -1
View File
@@ -133,7 +133,7 @@ clean:
#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets #make install is validated only for Linux, OSX, kFreeBSD and Hurd targets
ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU)) ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU))
install: zstd-pgo install: zstd
@echo Installing binaries @echo Installing binaries
@install -d -m 755 $(DESTDIR)$(BINDIR)/ $(DESTDIR)$(MANDIR)/ @install -d -m 755 $(DESTDIR)$(BINDIR)/ $(DESTDIR)$(MANDIR)/
@install -m 755 zstd$(EXT) $(DESTDIR)$(BINDIR)/zstd$(EXT) @install -m 755 zstd$(EXT) $(DESTDIR)$(BINDIR)/zstd$(EXT)