Skip to content

chore(r): Synchronize vendoring scripts with latest changes #1809

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

Merged
paleolimbot merged 4 commits into from
May 4, 2024
Merged

chore(r): Synchronize vendoring scripts with latest changes #1809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
884e4f9
ignore files used in building
paleolimbot May 3, 2024
85c1a9d
one more file
paleolimbot May 3, 2024
7bb4c42
fix syncing of sqlite3
paleolimbot May 3, 2024
2479b27
also add include path
paleolimbot May 3, 2024
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
1 change: 1 addition & 0 deletions r/adbcpostgresql/src/c/vendor/fmt/include/fmt/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
# under the License.

args.h
base.h
chrono.h
color.h
compile.h
Expand Down
6 changes: 3 additions & 3 deletions r/adbcsqlite/configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ if [ $? -ne 0 ] || [ ! -z "$FORCE_VENDORED_SQLITE3" ]; then
echo "Forcing vendored sqlite3 or #include <sqlite3.h>/-lsqlite3 failed:"
cat sqlite_test.log

echo "Falling back to vendored SQLite at tools/sqlite3.h"
cp tools/sqlite3.h tools/sqlite3.c src
OBJECTS="sqlite3.o"
echo "Falling back to vendored SQLite at src/c/vendor/sqlite3/sqlite3.h"
PKG_CPPFLAGS="-I../src/c/vendor/sqlite3 $PKG_CPPFLAGS"
OBJECTS="c/vendor/sqlite3/sqlite3.o"
else
echo "Success!"
PKG_LIBS="$PKG_LIBS -lsqlite3"
Expand Down
2 changes: 1 addition & 1 deletion r/adbcsqlite/src/Makevars.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ OBJECTS = init.o \
c/driver/sqlite/sqlite.o \
c/driver/sqlite/statement_reader.o \
c/vendor/nanoarrow/nanoarrow.o \
c/vendor/sqlite3/sqlite3.o @objects@
@objects@
4 changes: 2 additions & 2 deletions r/adbcsqlite/src/c/driver/framework/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
base.cc
base.h
base_driver.cc
base_driver.h
base_connection.h
base_database.h
base_statement.h
Expand Down
1 change: 1 addition & 0 deletions r/adbcsqlite/src/c/vendor/fmt/include/fmt/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
# specific language governing permissions and limitations
# under the License.
args.h
base.h
chrono.h
color.h
compile.h
Expand Down
19 changes: 0 additions & 19 deletions r/adbcsqlite/tools/.gitignore
View file
Open in desktop

This file was deleted.