Skip to content

Commit

Permalink
Merge pull request #3 from jeffwong-nflx/cleanup
Browse files Browse the repository at this point in the history
Cleanup old files
  • Loading branch information
jeffwong-nflx authored Jan 4, 2019
2 parents 56adad2 + 1df3026 commit c67fa3d
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 51 deletions.
1 change: 1 addition & 0 deletions r/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Version: 0.0.0.9000
Authors@R: c(
person("Romain", "François", email = "romain@rstudio.com", role = c("aut", "cre")),
person("Javier", "Luraschi", email = "javier@rstudio.com", role = c("ctb")),
person("Jeffrey", "Wong", email = "jeffreyw@netflix.com", role = c("ctb")),
person("Apache Arrow", email = "dev@arrow.apache.org", role = c("aut", "cph"))
)
Description: R Integration to 'Apache' 'Arrow'.
Expand Down
10 changes: 0 additions & 10 deletions r/R/read_parquet.R

This file was deleted.

5 changes: 2 additions & 3 deletions r/configure
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ PKG_RPM_NAME="arrow"
PKG_CSW_NAME="arrow"
PKG_BREW_NAME="apache-arrow"
PKG_TEST_HEADER="<arrow/api.h>"
PKG_LIBS="-larrow"
PKG_LIBS="-larrow -lparquet"

# Use pkg-config if available
pkg-config --version >/dev/null 2>&1
Expand All @@ -49,8 +49,7 @@ if [ "$INCLUDE_DIR" ] || [ "$LIB_DIR" ]; then
elif [ "$PKGCONFIG_CFLAGS" ] || [ "$PKGCONFIG_LIBS" ]; then
echo "Found pkg-config cflags and libs!"
PKG_CFLAGS=${PKGCONFIG_CFLAGS}
#PKG_LIBS=${PKGCONFIG_LIBS}
PKG_LIBS="-larrow -lparquet" # hard coded! what is the right way to do this?
PKG_LIBS=${PKGCONFIG_LIBS}
elif [[ "$OSTYPE" == "darwin"* ]]; then
if [ "$(command -v brew)" ]; then
BREWDIR=$(brew --prefix)
Expand Down
38 changes: 0 additions & 38 deletions r/src/parquetfilereader.cpp

This file was deleted.

0 comments on commit c67fa3d

Please sign in to comment.