chiark
/
gitweb
/
~mdw
/
termux-packages
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
99365d0
)
nodejs: Fix conflict with nodejs-current
author
Fredrik Fornwall
<fredrik@fornwall.net>
Wed, 1 Nov 2017 21:35:19 +0000
(22:35 +0100)
committer
Fredrik Fornwall
<fredrik@fornwall.net>
Wed, 1 Nov 2017 21:35:19 +0000
(22:35 +0100)
packages/nodejs/build.sh
patch
|
blob
|
blame
|
history
diff --git
a/packages/nodejs/build.sh
b/packages/nodejs/build.sh
index 3667beff113fcf3d7ad1c0b6c4c323ae358737f9..373ce5d86a49176b05c94ec8688b263bd62ee8f7 100644
(file)
--- a/
packages/nodejs/build.sh
+++ b/
packages/nodejs/build.sh
@@
-9,7
+9,7
@@
TERMUX_PKG_SRCURL=https://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_
TERMUX_PKG_DEPENDS="openssl, c-ares"
TERMUX_PKG_RM_AFTER_INSTALL="lib/node_modules/npm/html lib/node_modules/npm/make.bat share/systemtap lib/dtrace"
TERMUX_PKG_BUILD_IN_SRC=yes
TERMUX_PKG_DEPENDS="openssl, c-ares"
TERMUX_PKG_RM_AFTER_INSTALL="lib/node_modules/npm/html lib/node_modules/npm/make.bat share/systemtap lib/dtrace"
TERMUX_PKG_BUILD_IN_SRC=yes
-TERMUX_PKG_CONFLICTS="nodejs"
+TERMUX_PKG_CONFLICTS="nodejs
-current
"
termux_step_configure () {
if [ $TERMUX_ARCH = "arm" ]; then
termux_step_configure () {
if [ $TERMUX_ARCH = "arm" ]; then