Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
9.2.2023: Due to updates GitLab will be unavailable for some minutes between 9:00 and 11:00.
Open sidebar
dcdb
dcdb
Commits
e170587a
Commit
e170587a
authored
May 09, 2018
by
Michael Ott
Browse files
Allow for .tgz extensions in DISTFILES
parent
aa93ef6e
Changes
1
Hide whitespace changes
Inline
Side-by-side
common.mk
View file @
e170587a
...
...
@@ -4,10 +4,11 @@ DCDBDEPLOYPATH ?= $(DCDBBASEPATH)/install
FETCH
=
wget
-c
--no-check-certificate
-O
MD5
=
$(
if
$(
shell
which md5 2>/dev/null
)
,md5,
$(
if
$(
shell
md5sum
--tag
Makefile 2&> /dev/null
||
true
)
,md5sum
--tag
,openssl md5
))
OS
=
$(
shell
uname
-s
)
MAKETHREADS
?=
$(
if
$(
findstring
$(
shell
uname
)
,Darwin
)
,
$(
shell
sysctl machdep.cpu.thread_count |
cut
-b
27-
)
,
\
$(
if
$(
findstring
$(
shell
uname
)
,Linux
)
,
$(
shell
cat
/proc/cpuinfo |
grep
processor |
wc
-l
)
,4
))
DISTFILESNAMES
=
$(
foreach
f,
$(DISTFILES)
,
$(
shell
echo
"
$(f)
"
|
sed
's/;.*//'
))
DISTFILESPATHS
=
$(
foreach
f,
$(DISTFILES)
,
$(
shell
echo
"
$(f)
"
|
sed
's/.tar.gz;.*//
'
|
sed
'
s/.zip;.*//'
))
DISTFILESPATHS
=
$(
foreach
f,
$(DISTFILES)
,
$(
shell
echo
"
$(f)
"
|
sed
's/.tar.gz;.*//
; s/.tgz;.*//;
s/.zip;.*//'
))
# If cross-compiling for ARM, adjust the build settings
ifeq
("$(ARCH)", "arm")
...
...
@@ -75,10 +76,10 @@ $(DCDBDEPSPATH)/%/.extracted: | $(DCDBDEPSPATH)/distfiles/$$(call getarchive,%)
exit
2
;
\
fi
;
\
echo
Extracting:
$(F)
;
\
if
[
"
$(
suffix
$(F)
)
"
=
"
.gz
"
]
;
then
\
cd
$(DCDBDEPSPATH)
&&
tar
xzf
distfiles/
$(F)
;
\
if
[
"
$(
suffix
$(F)
)
"
=
"
zip
"
]
;
then
\
cd
$(DCDBDEPSPATH)
&&
unzip
distfiles/
$(F)
;
\
else
\
cd
$(DCDBDEPSPATH)
&&
unzip
distfiles/
$(F)
>
/dev/null
;
\
cd
$(DCDBDEPSPATH)
&&
tar
xf
distfiles/
$(F)
>
/dev/null
;
\
fi
;
\
fi
@
touch
$@
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment