Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Z
zstd
Manage
Activity
Members
Plan
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CodeLinaro
yocto-mirrors
zstd
Commits
f37a84ec
Unverified
Commit
f37a84ec
authored
5 years ago
by
Yann Collet
Committed by
GitHub
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
fix installation with MSYS2+mingw-w64 (#1960)
Co-authored-by:
vtorri
<
vincent.torri@gmail.com
>
parent
76e01f35
Branches
x1e80100
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Makefile
+1
-1
1 addition, 1 deletion
Makefile
lib/Makefile
+16
-3
16 additions, 3 deletions
lib/Makefile
programs/Makefile
+1
-1
1 addition, 1 deletion
programs/Makefile
with
18 additions
and
5 deletions
Makefile
+
1
−
1
View file @
f37a84ec
...
...
@@ -132,7 +132,7 @@ clean:
#------------------------------------------------------------------------------
# make install is validated only for Linux, macOS, Hurd and some BSD targets
#------------------------------------------------------------------------------
ifneq
(,$(filter
$(shell uname),
Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD DragonFly NetBSD MSYS_NT Haiku))
ifneq
(,$(filter Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD DragonFly NetBSD MSYS_NT Haiku
MINGW%,$(shell uname)
))
HOST_OS
=
POSIX
CMAKE_PARAMS
=
-DZSTD_BUILD_CONTRIB
:BOOL
=
ON
-DZSTD_BUILD_STATIC
:BOOL
=
ON
-DZSTD_BUILD_TESTS
:BOOL
=
ON
-DZSTD_ZLIB_SUPPORT
:BOOL
=
ON
-DZSTD_LZMA_SUPPORT
:BOOL
=
ON
-DCMAKE_BUILD_TYPE
=
Release
...
...
This diff is collapsed.
Click to expand it.
lib/Makefile
+
16
−
3
View file @
f37a84ec
...
...
@@ -158,10 +158,10 @@ libzstd.a-mt: libzstd.a
ifneq
(,$(filter Windows%,$(OS)))
LIBZSTD
=
dll
\
l
ibzstd.dll
LIBZSTD
=
dll
/
libzstd
-
$(
LIBVER_MAJOR
)
.dll
$(LIBZSTD)
:
$(ZSTD_FILES)
@
echo
compiling dynamic library
$(
LIBVER
)
$(
CC
)
$(
FLAGS
)
-DZSTD_DLL_EXPORT
=
1
-Wl
,--out-implib,dll
\
l
ibzstd.dll.a
-shared
$^
-o
$@
$(
CC
)
$(
FLAGS
)
-DZSTD_DLL_EXPORT
=
1
-Wl
,--out-implib,dll
/
libzstd.dll.a
-shared
$^
-o
$@
else
...
...
@@ -210,7 +210,7 @@ clean:
#-----------------------------------------------------------------------------
# make install is validated only for Linux, macOS, BSD, Hurd and Solaris targets
#-----------------------------------------------------------------------------
ifneq
(,$(filter
$(shell uname),
Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku))
ifneq
(,$(filter Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku
MINGW%,$(shell uname)
))
DESTDIR
?=
# directory variables : GNU conventions prefer lowercase
...
...
@@ -223,6 +223,8 @@ libdir ?= $(exec_prefix)/lib
LIBDIR
?=
$(
libdir
)
includedir
?=
$(
PREFIX
)
/include
INCLUDEDIR
?=
$(
includedir
)
bindir
?=
$(
PREFIX
)
/bin
BINDIR
?=
$(
bindir
)
ifneq
(,$(filter $(shell uname),FreeBSD NetBSD DragonFly))
PKGCONFIGDIR
?=
$(
PREFIX
)
/libdata/pkgconfig
...
...
@@ -262,9 +264,15 @@ install-static: libzstd.a
install-shared
:
libzstd
@
echo
Installing shared library
@$(
INSTALL
)
-d
-m
755
$(
DESTDIR
)$(
LIBDIR
)
/
ifneq
(,$(filter MINGW%,$(shell uname)))
@$(
INSTALL
)
-d
-m
755
$(
DESTDIR
)$(
BINDIR
)
/
@$(
INSTALL_PROGRAM
)
$(
LIBZSTD
)
$(
DESTDIR
)$(
BINDIR
)
@$(
INSTALL_PROGRAM
)
dll/libzstd.dll.a
$(
DESTDIR
)$(
LIBDIR
)
else
@$(
INSTALL_PROGRAM
)
$(
LIBZSTD
)
$(
DESTDIR
)$(
LIBDIR
)
@
ln
-sf
$(
LIBZSTD
)
$(
DESTDIR
)$(
LIBDIR
)
/libzstd.
$(
SHARED_EXT_MAJOR
)
@
ln
-sf
$(
LIBZSTD
)
$(
DESTDIR
)$(
LIBDIR
)
/libzstd.
$(
SHARED_EXT
)
endif
install-includes
:
@
echo
Installing includes
...
...
@@ -276,9 +284,14 @@ install-includes:
uninstall
:
@$(
RM
)
$(
DESTDIR
)$(
LIBDIR
)
/libzstd.a
ifneq
(,$(filter MINGW%,$(shell uname)))
@$(
RM
)
$(
DESTDIR
)$(
BINDIR
)
/
$(
LIBZSTD
)
@$(
RM
)
$(
DESTDIR
)$(
LIBDIR
)
/libzstd.dll.a
else
@$(
RM
)
$(
DESTDIR
)$(
LIBDIR
)
/libzstd.
$(
SHARED_EXT
)
@$(
RM
)
$(
DESTDIR
)$(
LIBDIR
)
/libzstd.
$(
SHARED_EXT_MAJOR
)
@$(
RM
)
$(
DESTDIR
)$(
LIBDIR
)
/
$(
LIBZSTD
)
endif
@$(
RM
)
$(
DESTDIR
)$(
PKGCONFIGDIR
)
/libzstd.pc
@$(
RM
)
$(
DESTDIR
)$(
INCLUDEDIR
)
/zstd.h
@$(
RM
)
$(
DESTDIR
)$(
INCLUDEDIR
)
/zstd_errors.h
...
...
This diff is collapsed.
Click to expand it.
programs/Makefile
+
1
−
1
View file @
f37a84ec
...
...
@@ -290,7 +290,7 @@ preview-man: clean-man man
#-----------------------------------------------------------------------------
# make install is validated only for Linux, macOS, BSD, Hurd and Solaris targets
#-----------------------------------------------------------------------------
ifneq
(,$(filter
$(shell uname),
Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku))
ifneq
(,$(filter Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku
MINGW%,$(shell uname)
))
HAVE_COLORNEVER
=
$(
shell
echo
a | egrep
--color
=
never a
>
/dev/null 2> /dev/null
&&
echo
1
||
echo
0
)
EGREP_OPTIONS
?=
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment