]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
Merge pull request #266 from jrmarino/master
authorYann Collet <yann.collet.73@gmail.com>
Sun, 31 Jul 2016 00:21:26 +0000 (02:21 +0200)
committerGitHub <noreply@github.com>
Sun, 31 Jul 2016 00:21:26 +0000 (02:21 +0200)
Enable build on FreeBSD ports (includes DragonFly BSD) [dev branch]

1  2 
Makefile
lib/Makefile
programs/Makefile

diff --cc Makefile
Simple merge
diff --cc lib/Makefile
Simple merge
index 77c62dc54fa3a3e1c20eaea57cb7b2b4cc71f285,e9c99fd97c0e83786bf3b868f41a6ada8601b2a8..be6fbf2c213f2ae446c094a9799051fcf97d9bf2
@@@ -170,13 -153,11 +170,13 @@@ clean
          datagen$(EXT) paramgrill$(EXT) roundTripCrash$(EXT)
        @echo Cleaning completed
  
 +cleano32:
 +      @rm -f ../lib/decompress/*.o
  
- #---------------------------------------------------------------------------------
- #make install is validated only for Linux, OSX, kFreeBSD, Hurd and OpenBSD targets
- #---------------------------------------------------------------------------------
- ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD))
+ #----------------------------------------------------------------------------------
+ #make install is validated only for Linux, OSX, kFreeBSD, Hurd and some BSD targets
+ #----------------------------------------------------------------------------------
+ ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD DragonFly))
  HOST_OS = POSIX
  install: zstd
        @echo Installing binaries