Skip to content

Commit c67fa3d

Browse files
Merge pull request #3 from jeffwong-nflx/cleanup
Cleanup old files
2 parents 56adad2 + 1df3026 commit c67fa3d

File tree

4 files changed

+3
-51
lines changed

4 files changed

+3
-51
lines changed

r/DESCRIPTION

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Version: 0.0.0.9000
44
Authors@R: c(
55
person("Romain", "François", email = "romain@rstudio.com", role = c("aut", "cre")),
66
person("Javier", "Luraschi", email = "javier@rstudio.com", role = c("ctb")),
7+
person("Jeffrey", "Wong", email = "jeffreyw@netflix.com", role = c("ctb")),
78
person("Apache Arrow", email = "dev@arrow.apache.org", role = c("aut", "cph"))
89
)
910
Description: R Integration to 'Apache' 'Arrow'.

r/R/read_parquet.R

Lines changed: 0 additions & 10 deletions
This file was deleted.

r/configure

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ PKG_RPM_NAME="arrow"
3232
PKG_CSW_NAME="arrow"
3333
PKG_BREW_NAME="apache-arrow"
3434
PKG_TEST_HEADER="<arrow/api.h>"
35-
PKG_LIBS="-larrow"
35+
PKG_LIBS="-larrow -lparquet"
3636

3737
# Use pkg-config if available
3838
pkg-config --version >/dev/null 2>&1
@@ -49,8 +49,7 @@ if [ "$INCLUDE_DIR" ] || [ "$LIB_DIR" ]; then
4949
elif [ "$PKGCONFIG_CFLAGS" ] || [ "$PKGCONFIG_LIBS" ]; then
5050
echo "Found pkg-config cflags and libs!"
5151
PKG_CFLAGS=${PKGCONFIG_CFLAGS}
52-
#PKG_LIBS=${PKGCONFIG_LIBS}
53-
PKG_LIBS="-larrow -lparquet" # hard coded! what is the right way to do this?
52+
PKG_LIBS=${PKGCONFIG_LIBS}
5453
elif [[ "$OSTYPE" == "darwin"* ]]; then
5554
if [ "$(command -v brew)" ]; then
5655
BREWDIR=$(brew --prefix)

r/src/parquetfilereader.cpp

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)