File tree Expand file tree Collapse file tree 2 files changed +5
-3
lines changed
Expand file tree Collapse file tree 2 files changed +5
-3
lines changed Original file line number Diff line number Diff line change @@ -3591,6 +3591,7 @@ CFLAGS=`"${R_HOME}/bin/R" CMD config CFLAGS`
35913591CPPFLAGS=` " ${R_HOME} /bin/R" CMD config CPPFLAGS`
35923592CPPFLAGS=" ${GIT2R_CPPFLAGS} ${CPPFLAGS} "
35933593LDFLAGS=` " ${R_HOME} /bin/R" CMD config LDFLAGS`
3594+ CPICFLAGS=` " ${R_HOME} /bin/R" CMD config LDFLAGS`
35943595
35953596# Check for zlib
35963597have_zlib=no
@@ -3843,7 +3844,7 @@ if test "x${have_ssh2}" = xno; then
38433844 ./configure --with-pic --with-openssl --disable-examples-build \
38443845 --disable-shared --enable-static \
38453846 --prefix=$LIBSSH2_INST_DIR CC=" ${CC} " \
3846- CFLAGS=" ${CFLAGS} -Wno-deprecated-declarations" \
3847+ CFLAGS=" ${CFLAGS} ${CPICFLAGS} -Wno-deprecated-declarations" \
38473848 CPPFLAGS=" ${CPPFLAGS} " LDFLAGS=${LDFLAGS} \
38483849 && make && make install && have_ssh2=yes
38493850 cd ..
Original file line number Diff line number Diff line change 11# git2r, R bindings to the libgit2 library.
2- # Copyright (C) 2013-2014 The git2r contributors
2+ # Copyright (C) 2013-2015 The git2r contributors
33#
44# This program is free software; you can redistribute it and/or modify
55# it under the terms of the GNU General Public License, version 2,
@@ -110,6 +110,7 @@ CFLAGS=`"${R_HOME}/bin/R" CMD config CFLAGS`
110110CPPFLAGS=`"${R_HOME}/bin/R" CMD config CPPFLAGS`
111111CPPFLAGS="${GIT2R_CPPFLAGS} ${CPPFLAGS}"
112112LDFLAGS=`"${R_HOME}/bin/R" CMD config LDFLAGS`
113+ CPICFLAGS=`"${R_HOME}/bin/R" CMD config LDFLAGS`
113114
114115# Check for zlib
115116have_zlib=no
@@ -181,7 +182,7 @@ if test "x${have_ssh2}" = xno; then
181182 ./configure --with-pic --with-openssl --disable-examples-build \
182183 --disable-shared --enable-static \
183184 --prefix=$LIBSSH2_INST_DIR CC="${CC}" \
184- CFLAGS="${CFLAGS} -Wno-deprecated-declarations" \
185+ CFLAGS="${CFLAGS} ${CPICFLAGS} -Wno-deprecated-declarations" \
185186 CPPFLAGS="${CPPFLAGS}" LDFLAGS=${LDFLAGS} \
186187 && make && make install && have_ssh2=yes
187188 cd ..
You can’t perform that action at this time.
0 commit comments