Skip to content

upgrade freetds to 1.2.18 #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

upgrade freetds to 1.2.18 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ the [FreeTDS](http://www.freetds.org/) binaries into your project.
Optionally, set the FreeTDS version in a Heroku config like this:

```bash
heroku config:set FREETDS_VERSION=1.00.109
heroku config:set FREETDS_VERSION=1.2.18
```

Make sure the version you're referencing exists on as a `.tar.gz` file on the [FreeTDS releases](ftp://ftp.freetds.org/pub/freetds/stable/).
Expand Down
9 changes: 5 additions & 4 deletions bin/compile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ load_env_vars() {
}
load_env_vars "FREETDS_VERSION" "FREETDS_ARCHIVE_NAME" "TDS_VERSION" "FREETDS_REBUILD"

FREETDS_VERSION="${FREETDS_VERSION:-1.00.109}"
FREETDS_VERSION="${FREETDS_VERSION:-1.2.18}"
FREETDS_ARCHIVE_NAME="${FREETDS_ARCHIVE_NAME:-freetds-${FREETDS_VERSION}}"
TDS_VERSION="${TDS_VERSION:-7.3}" # or TDSVER
TDS_VERSION="${TDS_VERSION:-7.4}" # or TDSVER

CACHED_TAR="${CACHE_DIR}/freetds-${FREETDS_VERSION}-heroku.tar.bz2"
# Default rebuild to true since I'm having issues linking the library to tiny_tds gem with a cached build.
Expand Down Expand Up @@ -125,7 +125,7 @@ download_and_extract_freetds_archive() {
}

build_and_install_freetds() {
topic "Building FreeTDS against OpenSSL $(openssl version)"
topic "Building FreeTDS against GnuTLS"
( # directory changes in subshells have no effect
cd "${BUILD_DIR}/${FREETDS_ARCHIVE_NAME}"

Expand All @@ -142,7 +142,8 @@ build_and_install_freetds() {
"--prefix=${APP_TARGET_DIR}" \
--disable-odbc \
--disable-debug \
"--with-tdsver=${TDS_VERSION}"
"--with-tdsver=${TDS_VERSION}" \
"--with-gnutls"
EOF
# TODO(BF): Print log when HEROKUR_FREETDS_BUILDPACK_DEBUG is set
/bin/bash .build_options > build_log-configure.stdout.log 2> build_log-configure.stderr.log
Expand Down