Skip to content

Commit

Permalink
chore: Move internal duckdb.tar dependency (#1013)
Browse files Browse the repository at this point in the history
* chore: Avoid building `symbols.rds` for speed

* Move duckdb.tar dependency

* Revert "chore: Avoid building `symbols.rds` for speed"

This reverts commit 8f09533.
  • Loading branch information
krlmlr committed Jan 22, 2025
1 parent 718108f commit 003381d
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 3 deletions.
3 changes: 2 additions & 1 deletion src/Makevars
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
#
# The symbols.rds file helps troubleshoot issues with forbidden symbols
# such as abort.
all: duckdb.tar symbols.rds $(SHLIB)
# Set UserNM=true to speed up compilation during development.
all: symbols.rds $(SHLIB)

include include/sources.mk

Expand Down
3 changes: 2 additions & 1 deletion src/Makevars.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
#
# The symbols.rds file helps troubleshoot issues with forbidden symbols
# such as abort.
all: duckdb.tar symbols.rds $(SHLIB)
# Set UserNM=true to speed up compilation during development.
all: symbols.rds $(SHLIB)

include include/sources.mk

Expand Down
3 changes: 2 additions & 1 deletion src/Makevars.win
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
#
# The symbols.rds file helps troubleshoot issues with forbidden symbols
# such as abort.
all: duckdb.tar symbols.rds $(SHLIB)
# Set UserNM=true to speed up compilation during development.
all: symbols.rds $(SHLIB)

include include/sources.mk

Expand Down
1 change: 1 addition & 0 deletions src/include/from-tar.mk
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# to an existing file.
# We print details on the object files already extracted in the configure script
# for diagnostic purposes.
all: duckdb.tar
duckdb.tar: $(DUCKDB_R_PREBUILT_ARCHIVE)
ls -lR
# Ensure the file is recreated in the next run
Expand Down
1 change: 1 addition & 0 deletions src/include/to-tar-win.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# This file is used from Makevars if $DUCKDB_R_PREBUILT_ARCHIVE is empty
# or does not point to an existing file.
# In the latter case, we create the file after the object files have been built.
all: duckdb.tar
duckdb.tar: $(SOURCES)
if [ -n "$(DUCKDB_R_PREBUILT_ARCHIVE)" ]; then tar -cv --force-local -f "$(DUCKDB_R_PREBUILT_ARCHIVE)" $(SOURCES); fi
rm -f Makevars.duckdb
1 change: 1 addition & 0 deletions src/include/to-tar.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# This file is used from Makevars if $DUCKDB_R_PREBUILT_ARCHIVE is empty
# or does not point to an existing file.
# In the latter case, we create the file after the object files have been built.
all: duckdb.tar
duckdb.tar: $(SOURCES)
if [ -n "$(DUCKDB_R_PREBUILT_ARCHIVE)" ]; then tar -cv -f "$(DUCKDB_R_PREBUILT_ARCHIVE)" $(SOURCES); fi
rm -f Makevars.duckdb

0 comments on commit 003381d

Please sign in to comment.