Skip to content

Commit d087c39

Browse files
committed
Remove extraneous build env vars; Fix lib path
- ensure /usr/local/lib is in lib path - fix app runtime lib path; was pointing to build dir Was getting ``` ld /app/vendor/bundle/ruby/2.3.0/gems/tiny_tds-2.1.0/lib/tiny_tds/tiny_tds.so ld: warning: libsybdb.so.5, needed by /app/vendor/bundle/ruby/2.3.0/gems/tiny_tds-2.1.0/lib/tiny_tds/tiny_tds.so, not found (try using -rpath or -rpath-link) ```
1 parent 7a79086 commit d087c39

File tree

1 file changed

+9
-15
lines changed

1 file changed

+9
-15
lines changed

bin/compile

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,13 @@ if [ ! -f "$CACHED_TAR" ]; then
9999
export PATH="${APP_TARGET_DIR}/bin:$PATH"
100100
# tiny_tds extconf.rb uses FREETDS_DIR
101101
# https://github.com/rails-sqlserver/tiny_tds/blob/5046755ca91594003f8b3ca541d136f3ed859973/ext/tiny_tds/extconf.rb#L36-L38
102+
# ldd freetds/lib/libsybdb.so
103+
# bin/rails r 'require "tiny_tds"' should succeed
104+
# try /sbin/ldconfig /usr/local/lib; bundle exec gem uninstall tiny_tds; bundle
105+
# See https://github.com/rails-sqlserver/tiny_tds/issues/210 https://github.com/rails-sqlserver/tiny_tds/issues/74 https://github.com/rails-sqlserver/tiny_tds/issues/50
102106
export FREETDS_DIR="${APP_TARGET_DIR}"
103-
export LD_LIBRARY_PATH="${BUILD_TARGET_DIR}/lib:${LD_LIBRARY_PATH:-}"
104-
export LIBRARY_PATH="${BUILD_TARGET_DIR}/lib:${LIBRARY_PATH:-}"
105-
export SYBASE="$BUILD_TARGET_DIR"
106-
export CPPATH="${BUILD_TARGET_DIR}/include:${CPPATH:-}"
107-
export CPATH="${BUILD_TARGET_DIR}/include:${CPATH:-}"
108-
export PKG_CONFIG_PATH="${BUILD_TARGET_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH:-}"
109-
export INCLUDE_PATH="${BUILD_TARGET_DIR}/include:${BUILD_TARGET_DIR}/include/openssl:${INCLUDE_PATH:-}"
107+
export LD_LIBRARY_PATH="${APP_TARGET_DIR}/lib:${LD_LIBRARY_PATH:-/usr/local/lib}"
108+
export LIBRARY_PATH="${APP_TARGET_DIR}/lib:${LIBRARY_PATH:-/usr/local/lib}"
110109
EOF
111110
chmod +x "${BUILD_DIR}/.profile.d/freetds.sh"
112111
echo "configured APP env vars:" | indent
@@ -122,16 +121,11 @@ info "Install of FreeTDS ${FREETDS_VERSION} complete"
122121
# they work for later buildpacks.
123122
export PATH="${BUILD_TARGET_DIR}/bin:$PATH"
124123
export FREETDS_DIR="${BUILD_TARGET_DIR}"
125-
export LD_LIBRARY_PATH="${BUILD_TARGET_DIR}/lib:${LD_LIBRARY_PATH:-}"
126-
export LIBRARY_PATH="${BUILD_TARGET_DIR}/lib:${LIBRARY_PATH:-}"
127-
export SYBASE="$BUILD_TARGET_DIR"
128-
export CPPATH="${BUILD_TARGET_DIR}/include:${CPPATH:-}"
129-
export CPATH="${BUILD_TARGET_DIR}/include:${CPATH:-}"
130-
export PKG_CONFIG_PATH="${BUILD_TARGET_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH:-}"
131-
export INCLUDE_PATH="${BUILD_TARGET_DIR}/include:${BUILD_TARGET_DIR}/include/openssl:${INCLUDE_PATH:-}"
124+
export LD_LIBRARY_PATH="${BUILD_TARGET_DIR}/lib:${LD_LIBRARY_PATH:-/usr/local/lib}"
125+
export LIBRARY_PATH="${BUILD_TARGET_DIR}/lib:${LIBRARY_PATH:-/usr/local/lib}"
132126

133127
# give environment to later buildpacks
134-
export | grep -E -e ' (PATH|LD_LIBRARY_PATH|LIBRARY_PATH|INCLUDE_PATH|PKG_CONFIG_PATH|FREETDS_DIR|SYBASE|CPPATH|CPATH)=' > "${LP_DIR}/export"
128+
export | grep -E -e ' (PATH|LD_LIBRARY_PATH|LIBRARY_PATH|FREETDS_DIR)=' > "${LP_DIR}/export"
135129

136130
echo "configured BUILDPACK env vars:" | indent
137131
indent < "${LP_DIR}/export"

0 commit comments

Comments
 (0)