Skip to content
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.

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

Automake: various updates #3828

Merged
merged 12 commits into from
Oct 19, 2023
Merged

Conversation

masatake
Copy link
Member

No description provided.

@codecov
Copy link

codecov bot commented Oct 14, 2023

Codecov Report

All modified lines are covered by tests ✅

Comparison is base (f56257b) 85.02% compared to head (920c64d) 85.03%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #3828      +/-   ##
==========================================
+ Coverage   85.02%   85.03%   +0.01%     
==========================================
  Files         228      228              
  Lines       53874    53906      +32     
==========================================
+ Hits        45807    45840      +33     
+ Misses       8067     8066       -1     
Files Coverage Δ
parsers/automake.c 98.74% <100.00%> (+1.10%) ⬆️

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@leleliu008
Copy link
Member

fgetpos and fsetpos functions are introduced in Android API 24, but we compiled with Android API 21, that's why we received a error. I think applying following patch will do the trick.

diff --git a/.github/workflows/cross-compile-android-ndk-on-mac.yml b/.github/workflows/cross-compile-android-ndk-on-mac.yml
index 11cc6651..337d04ff 100644
--- a/.github/workflows/cross-compile-android-ndk-on-mac.yml
+++ b/.github/workflows/cross-compile-android-ndk-on-mac.yml
@@ -37,7 +37,7 @@ jobs:
           TOOLCHAIN_BIN_DIR=$TOOLCHAIN_BASE_DIR/bin
           SYSROOT=$TOOLCHAIN_BASE_DIR/sysroot
 
-          export CC=$TOOLCHAIN_BIN_DIR/armv7a-linux-androideabi21-clang
+          export CC=$TOOLCHAIN_BIN_DIR/armv7a-linux-androideabi24-clang
           export AR=$TOOLCHAIN_BIN_DIR/llvm-ar
           export RANLIB=$TOOLCHAIN_BIN_DIR/llvm-ranlib
 
diff --git a/.github/workflows/cross-compile-android-ndk-on-ubuntu.yml b/.github/workflows/cross-compile-android-ndk-on-ubuntu.yml
index 37e33fab..640b5238 100644
--- a/.github/workflows/cross-compile-android-ndk-on-ubuntu.yml
+++ b/.github/workflows/cross-compile-android-ndk-on-ubuntu.yml
@@ -38,7 +38,7 @@ jobs:
           TOOLCHAIN_BIN_DIR=$TOOLCHAIN_BASE_DIR/bin
           SYSROOT=$TOOLCHAIN_BASE_DIR/sysroot
 
-          export CC=$TOOLCHAIN_BIN_DIR/armv7a-linux-androideabi21-clang
+          export CC=$TOOLCHAIN_BIN_DIR/armv7a-linux-androideabi24-clang
           export AR=$TOOLCHAIN_BIN_DIR/llvm-ar
           export RANLIB=$TOOLCHAIN_BIN_DIR/llvm-ranlib

@masatake
Copy link
Member Author

@leleliu008 Thank you. I'll wait for you meriging #3829.

@leleliu008
Copy link
Member

@masatake Merged. You could rebase it now.

@masatake
Copy link
Member Author

@leleliu008 thank you!

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
Signed-off-by: Masatake YAMATO <yamato@redhat.com>
Signed-off-by: Masatake YAMATO <yamato@redhat.com>
Signed-off-by: Masatake YAMATO <yamato@redhat.com>
Signed-off-by: Masatake YAMATO <yamato@redhat.com>
Signed-off-by: Masatake YAMATO <yamato@redhat.com>
Signed-off-by: Masatake YAMATO <yamato@redhat.com>
Signed-off-by: Masatake YAMATO <yamato@redhat.com>
Signed-off-by: Masatake YAMATO <yamato@redhat.com>
…ng prefix

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
Signed-off-by: Masatake YAMATO <yamato@redhat.com>
Signed-off-by: Masatake YAMATO <yamato@redhat.com>
@masatake masatake merged commit bd39539 into universal-ctags:master Oct 19, 2023
42 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants