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.

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

Jump to bottom

Update to ndk-r23 #7339

Merged
merged 29 commits into from
Oct 22, 2021
Merged

Update to ndk-r23 #7339

merged 29 commits into from
Oct 22, 2021

Commits on Oct 22, 2021

  1. Update to use android-ndk r23

    @Grimler91
    Grimler91 committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    b582444 View commit details
    Browse the repository at this point in the history

  2. ndk-patches: remove TCAFLUSH case from bits/termios_inlines.h 

    To fix error:

In file included from /termux-build/_cache/android-r23-api-24-v0/bin/../sysroot/usr/include/termios.h:154:
In file included from /termux-build/_cache/android-r23-api-24-v0/bin/../sysroot/usr/include/android/legacy_termios_inlines.h:43:
/termux-build/_cache/android-r23-api-24-v0/bin/../sysroot/usr/include/bits/termios_inlines.h:120:10: error: duplicate case value '0'
    case TCSAFLUSH: cmd = TCSETSF; break;
         ^
/termux-build/_cache/android-r23-api-24-v0/bin/../sysroot/usr/include/asm-generic/termbits.h:194:19: note: expanded from macro 'TCSAFLUSH'
                  ^
/termux-build/_cache/android-r23-api-24-v0/bin/../sysroot/usr/include/bits/termios_inlines.h:118:10: note: previous case defined here
    case TCSANOW: cmd = TCSETS; break;
         ^
/termux-build/_cache/android-r23-api-24-v0/bin/../sysroot/usr/include/asm-generic/termbits.h:191:17: note: expanded from macro 'TCSANOW'
                ^
    @Grimler91
    Grimler91 committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    cae6eaf View commit details
    Browse the repository at this point in the history

  3. termux_step_setup_toolchain: print info about applied ndk-patch

    @Grimler91
    Grimler91 committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    9e1e7d9 View commit details
    Browse the repository at this point in the history

  4. ndk-{multilib,sysroot}: update for ndk r23

    @Grimler91
    Grimler91 committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    d9fe2c0 View commit details
    Browse the repository at this point in the history

  5. rust: update from 1.53.0 to 1.54.0

    @finagolfin @Grimler91
    finagolfin authored and Grimler91 committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    c2a309e View commit details
    Browse the repository at this point in the history

  6. busybox: regenerate config

    @Grimler91
    Grimler91 committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    38eebcb View commit details
    Browse the repository at this point in the history

  7. busybox: fix build with ndk r23 

    Compiler and tool names need to be updated in Makefile.

Also fix some patch offsets while we are at it
    @Grimler91
    Grimler91 committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    340bc1d View commit details
    Browse the repository at this point in the history

  8. dns2tcp: fix duplicate symbol debug 

    Error:

ld: error: duplicate symbol: debug
>>> defined at rr.c
>>>            rr.o:(debug)
>>> defined at main.c
>>>            main.o:(.bss+0x0)

happen when trying to build with android-ndk r22 or r23.
More info: https://go-review.googlesource.com/c/go/+/280312
    @Grimler91
    Grimler91 committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    e811e1d View commit details
    Browse the repository at this point in the history

  9. rust: update to 1.55.0

    @Grimler91
    Grimler91 committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    0466545 View commit details
    Browse the repository at this point in the history

  10. freeimage: remove swab patch 

    Not needed with ndk-r23
    @Grimler91
    Grimler91 committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    0671628 View commit details
    Browse the repository at this point in the history

  11. termux_setup_standalone_toolchain: remove one indentation level

    @Grimler91
    Grimler91 committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    dba55c6 View commit details
    Browse the repository at this point in the history

  12. termux_step_setup_toolchain: do not add prefix to pkg-config 

    And create the pkg-config wrapper inside termux_setup_toolchain.
    @Grimler91
    Grimler91 committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    f11a4ef View commit details
    Browse the repository at this point in the history

  13. libcap-ng: disable python2 as well

    @Grimler91
    Grimler91 committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    f8a22b9 View commit details
    Browse the repository at this point in the history

  14. libowfat: fix build with ndk-r23

    @Grimler91
    Grimler91 committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    a54238e View commit details
    Browse the repository at this point in the history

  15. heyu: fix errors about duplicate symbols with ndk >=r22 

    Errors looks like:

    aarch64-linux-android-clang  -fstack-protector-strong -Oz -Drindex=strrchr  -L/data/data/com.termux/files/usr/lib -Wl,-rpath=/data/data/com.termux/files/usr/lib -fopenmp -static-openmp -Wl,--enable-new-dtags -Wl,--as-needed -Wl,-z,relro,-z,now -o heyu date.o erase.o info.o message.o relay.o monitor.o reset.o setclock.o stop.o tty.o x10.o xread.o xwrite.o status.o cm11a.o eeprom.o process.o sun.o cmd.o config.o x10state.o poll.o modules.o cm17a.o xsync.o timing.o cm10a.o tty_aux.o relay_aux.o x10aux.o rfxcom.o digimax.o oregon.o  -lm
    ld: error: duplicate symbol: newsb
    >>> defined at tty.c
    >>>            tty.o:(newsb)
    >>> defined at tty_aux.c
    >>>            tty_aux.o:(.bss+0x30)

    ld: error: duplicate symbol: oldsb
    >>> defined at tty.c
    >>>            tty.o:(oldsb)
    >>> defined at tty_aux.c
    >>>            tty_aux.o:(.bss+0x0)

    ld: error: duplicate symbol: spoolfile
    >>> defined at relay.c
    >>>            relay.o:(spoolfile)
    >>> defined at relay_aux.c
    >>>            relay_aux.o:(.bss+0x1C4)
    clang-12: error: linker command failed with exit code 1 (use -v to see invocation)
    make[1]: *** [Makefile:467: heyu] Error 1
    @Grimler91
    Grimler91 committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    d6dd9c6 View commit details
    Browse the repository at this point in the history

  16. libtirpc: fix build with ndk-r23

    @Grimler91
    Grimler91 committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    af09dec View commit details
    Browse the repository at this point in the history

  17. libwren: fix build with ndk-r23

    @Grimler91
    Grimler91 committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    e740107 View commit details
    Browse the repository at this point in the history

  18. openal-soft: fix build error when qt5 is found on host 

    If ALSOFT_NO_CONFIG_UTIL it looks for qt5widgets.
    @Grimler91
    Grimler91 committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    fb198e0 View commit details
    Browse the repository at this point in the history

  19. Fix lubicu package

    @thunder-coding @Grimler91
    thunder-coding authored and Grimler91 committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    203f95e View commit details
    Browse the repository at this point in the history

  20. libnl: fix build with ndk-r23

    @Grimler91
    Grimler91 committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    d3f5e3c View commit details
    Browse the repository at this point in the history

  21. perl: specify AR to fix build with ndk-r23

    @Grimler91
    Grimler91 committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    226a219 View commit details
    Browse the repository at this point in the history

  22. quickjs: fix build with ndk-r23

    @Grimler91
    Grimler91 committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    af894cf View commit details
    Browse the repository at this point in the history

  23. lua-language-server: fix hostbuild step 

    Package still fails to build though:

FAILED: build/obj/source_bee/subprocess_posix.obj
aarch64-linux-android-clang -MMD -MT build/obj/source_bee/subprocess_posix.obj -MF build/obj/source_bee/subprocess_posix.obj.d -std=c++17 -O2 -Wall -Werror -fvisibility=hidden -I3rd/bee.lua/bee/nonstd -I3rd/bee.lua -DBEE_INLINE -DNDEBUG  -fstack-protector-strong -Oz -I/data/data/com.termux/files/usr/include -o build/obj/source_bee/subprocess_posix.obj -c 3rd/bee.lua/bee/subprocess/subprocess_posix.cpp
3rd/bee.lua/bee/subprocess/subprocess_posix.cpp:152:17: error: 'posix_spawnattr_init' is unavailable: introduced in Android 28
        int r = posix_spawnattr_init(&spawnattr_);
                ^
/data/data/com.termux/files/usr/include/spawn.h:56:5: note: 'posix_spawnattr_init' has been explicitly marked unavailable here
int posix_spawnattr_init(posix_spawnattr_t* __attr) __INTRODUCED_IN(28);
    ^
    @Grimler91
    Grimler91 committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    058c3b4 View commit details
    Browse the repository at this point in the history

  24. libandroid-spawn: NDK 23 actually checks the INTRODUCED_IN() macros, … 

    …so indicate that this library has been backported to API 24
    @finagolfin @Grimler91
    finagolfin authored and Grimler91 committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    40af3c4 View commit details
    Browse the repository at this point in the history

  25. aapt: fix build with ndk-r23 

    As we have seen [1], i686 seem to explicitly need -fPIC.  Pass
CPPFLAGS in more places when building aapt, to avoid an error like:

ld: error: relocation R_386_PC32 cannot be used against symbol config_free; recompile with -fPIC
>>> defined in /tmp/config_utils-70060d.o
>>> referenced by config_utils.c
>>>               /tmp/config_utils-70060d.o:(config_free)

[1] #7215 (comment)
    @Grimler91
    Grimler91 committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    279897e View commit details
    Browse the repository at this point in the history

  26. binutils: fix build with ndk-r23

    @Grimler91
    Grimler91 committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    525161c View commit details
    Browse the repository at this point in the history

  27. Bump all packages depending on libc++ 

    As part of ndk-r23 upgrade.
    @Grimler91
    Grimler91 committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    f16993e View commit details
    Browse the repository at this point in the history

  28. libvpx: fix build with ndk-r23 

    Seems we need to explicitly pass -fPIC for all arches.
    @Grimler91
    Grimler91 committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    ad86a34 View commit details
    Browse the repository at this point in the history

  29. ndk: update to r23b 

    Includes fix for -fno-integrated-as flag, which is needed by libx265
build.
    @Grimler91
    Grimler91 committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    20d8e40 View commit details
    Browse the repository at this point in the history