Skip to content

Commit cdcc037

Browse files
krizsanits gaborkrizsanits gabor
authored andcommitted
build with static linking
1 parent 3e7f826 commit cdcc037

File tree

2 files changed

+2
-11
lines changed

2 files changed

+2
-11
lines changed

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
git submodule update --init --recursive
22
cd support/libssh/build
3-
cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_BUILD_TYPE=Debug ..
3+
cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_BUILD_TYPE=Debug -DWITH_STATIC_LIB=ON ..
44
make install
55
PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
66
export PKG_CONFIG_PATH

wscript

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@ def configure(conf):
1616
'pkg-config --libs libssh'
1717
).readline().strip())
1818
conf.env.append_value('LINKFLAGS', libs)
19-
20-
if not conf.find_program('pkg-config') :
21-
conf.fatal('pkg-config not found')
22-
23-
if os.system('pkg-config --exists libssh') != 0 :
24-
conf.fatal('libssh pkg-config package (libssh.pc) not found')
2519

2620
def build(bld):
2721
ssh = bld.new_task_gen('cxx', 'shlib', 'node_addon')
@@ -30,8 +24,5 @@ def build(bld):
3024
'src/init.cc', 'src/sshBase.cc', 'src/sftp.cc', 'src/tunnel.cc'
3125
]
3226
ssh.cxxflags = [ '-D_FILE_OFFSET_BITS=64', '-D_LARGEFILE_SOURCE' ]
33-
ssh.cxxflags.append(
34-
os.popen('pkg-config --cflags libssh').readline().strip()
35-
)
3627

37-
ssh.uselib = 'SSH'
28+
ssh.lib = 'SSH'

0 commit comments

Comments
 (0)