Commit Graph

508 Commits

Author SHA1 Message Date
Yaksh Bariya f0ea9b922b
monorepo: apply changes suggested by buttaface 2022-04-18 13:57:19 +05:30
Yaksh Bariya 52c383b4d1
chore: switch to monorepo 2022-04-18 13:57:13 +05:30
Yaksh Bariya 6088bdfbdb cmake: update to 3.23.1
Co-Authored-By: Tee KOBAYASHI <xtkoba@gmail.com>
2022-04-17 21:45:42 +05:30
Tee KOBAYASHI 07d9bba56a
build-package: Apply `$PREFIX/bin/sh` hack appropriately 2022-04-13 09:03:16 +02:00
Wetitpig 0410a2a1bd LLVM Tools (#7952) 2022-04-13 12:10:32 +05:30
Tee KOBAYASHI 034efbb507 golang: Update to 1.18.1 2022-04-13 11:41:12 +05:30
Tee KOBAYASHI d6248b4eb6 termux_step_massage: Check for unresolved symbols
defined in `libandroid-*`
2022-04-10 14:53:07 +09:00
Tee KOBAYASHI ae7f540379
termux_step_massage: Avoid using `CC`
which may be unset.
2022-04-06 14:14:03 +02:00
Henrik Grimler dc033aefef
termux_step_massage: only check for missing symbols if there are libraries 2022-04-05 21:21:29 +02:00
Henrik Grimler ffa1ed6051
termux_step_massage: check built libs for undefined symbols
Building packages that use libtool for linking libraries has issues
with ndk-r23 (https://github.com/android/ndk/issues/1614).  This check
makes sure that the built libraries do not give an error like

    CANNOT LINK EXECUTABLE "tesseract": cannot locate symbol "__extenddftf2" referenced by "/data/data/com.termux/files/usr/lib/libtesseract.so"...

once used on device.  In https://github.com/android/ndk/issues/1614 it
seemed like arm gave false positives and needed special consideration,
but when I tested it again today the same false positives do not occur
in built libraries, so no "if arm then .." workaround has been added
for now.
2022-04-05 20:57:25 +02:00
Aditya Alok 3b92fd5648
Revert "[TEMP] download deps from grimler.se instead of packages.termux.org"
- It should be fixed now.
https://github.com/termux/termux-packages/issues/9860#issuecomment-1087144145

This reverts commit dbd7249e4b.
2022-04-04 11:37:23 +05:30
Aditya Alok dbd7249e4b
[TEMP] download deps from grimler.se instead of packages.termux.org
- packages.termux.org gives wrong checksum for arm and aarch64 repository metadata
2022-04-04 11:03:30 +05:30
Tee KOBAYASHI 3c617f6222 golang: Fix hardcoded `/etc/resolv.conf` and friends 2022-04-01 17:22:37 +09:00
Yaksh Bariya 9f28b53c09 cmake: update to 3.23.0 2022-04-01 06:54:18 +00:00
Tee KOBAYASHI 2a1524d67c ndk-patches: Don't declare `sem_{open,close,unlink}`
but instead declare `libandroid_sem_{open,close,unlink}` defined in
`libandroid-posix-semaphore`.
2022-03-26 00:02:59 +09:00
Tee KOBAYASHI a860a7dc20 golang: Update to 1.18 2022-03-23 10:13:33 +09:00
Aditya Alok 64535d4ac3
fix(haskell packages): do not delete `lib/ghc-*` directory for ghc and ghc-libs package itself
Signed-off-by: Aditya Alok <dev.aditya.alok@gmail.com>
2022-03-22 21:39:04 +01:00
Henrik Grimler 3a7bb54376
termux_setup_nodejs: fix check for cached nodejs 2022-03-20 22:11:57 +01:00
Aditya Alok d11d6846e7
refactor(haskell-build): remove default-setup.hs
Signed-off-by: Aditya Alok <dev.aditya.alok@gmail.com>
2022-03-16 15:32:40 +01:00
Aditya Alok 52d7cc88d2
fix(setup ghc cross compiler): call `__termux_haskell_register_packages` after cross ghc setup
Signed-off-by: Aditya Alok <dev.aditya.alok@gmail.com>
2022-03-16 15:32:38 +01:00
Aditya Alok 0866d7b388
fix(setup ghc): create tmpdir in `/tmp`
Signed-off-by: Aditya Alok <dev.aditya.alok@gmail.com>
2022-03-16 15:32:35 +01:00
Aditya Alok 744c20a12d
refactor(setup ghc cross compiler): remove arch specific dirs
Signed-off-by: Aditya Alok <dev.aditya.alok@gmail.com>
2022-03-16 15:32:30 +01:00
Aditya Alok 7b0cf76bad
fix(setup ghc): typo in command `termux_download`
Signed-off-by: Aditya Alok <dev.aditya.alok@gmail.com>
2022-03-16 15:32:26 +01:00
Aditya Alok 6137422df7
fix(setup ghc cross compiler): run `__termux_haskell_register_packages` only when ghc has been setup
Signed-off-by: Aditya Alok <dev.aditya.alok@gmail.com>
2022-03-16 15:32:22 +01:00
Aditya Alok a5f9e8199a
style: lint with shellcheck
Signed-off-by: Aditya Alok <dev.aditya.alok@gmail.com>
2022-03-16 15:32:20 +01:00
Aditya Alok 5dfa5ccbd0
fix(setup ghc cross compiler): did no registered haskell packages
Signed-off-by: Aditya Alok <dev.aditya.alok@gmail.com>
2022-03-16 15:32:17 +01:00
Aditya Alok f21125b33a
feat(haskell build): export configure variables in setup toolchain step
Signed-off-by: Aditya Alok <dev.aditya.alok@gmail.com>
2022-03-16 15:32:15 +01:00
Aditya Alok 0590811415
fix(configure haskell build): remove `runghc` arg
Signed-off-by: Aditya Alok <dev.aditya.alok@gmail.com>
2022-03-16 15:32:10 +01:00
Aditya Alok a9b411f577
feat(setup ghc cross): handle package registration
feat(termux_setup_ghc_cross_compiler): handle haskell packages registration

chore(termux_setup_ghc_cross_compiler): update checksum

Signed-off-by: Aditya Alok <dev.aditya.alok@gmail.com>
2022-03-16 15:32:07 +01:00
Aditya Alok 3c9ed52daf
feat(haskell build): adhere to new setup script
feat(termux_setup_jailbreak_cabal): use pre-compiled binary

chore(termux_setup_cabal): update checksum

Signed-off-by: Aditya Alok <dev.aditya.alok@gmail.com>
2022-03-16 15:32:04 +01:00
Aditya Alok d47825a88c
feat(haskell build system): remove unwanted files/dirs before packaging
Signed-off-by: Aditya Alok <dev.aditya.alok@gmail.com>

fix(termux_step_massage): add `-r` option to `rm` command to delete dir

Signed-off-by: Aditya Alok <dev.aditya.alok@gmail.com>

wip
2022-03-16 15:32:01 +01:00
Aditya Alok 49c3e79513
feat(setup ghc cross compiler): make it work independently from other build steps
Signed-off-by: Aditya Alok <dev.aditya.alok@gmail.com>
2022-03-16 15:31:59 +01:00
Aditya Alok 0a47e01c4d
feat: setup ghc cross compiler during configure step
Signed-off-by: Aditya Alok <dev.aditya.alok@gmail.com>
2022-03-16 15:31:56 +01:00
Aditya Alok 6219a64f32
feat(build scripts): add configure script for haskell packages
Signed-off-by: Aditya Alok <dev.aditya.alok@gmail.com>
2022-03-16 15:31:51 +01:00
Aditya Alok e492c145af
feat(setup ghc): use patched Cabal package
Signed-off-by: Aditya Alok <dev.aditya.alok@gmail.com>
2022-03-16 15:31:48 +01:00
Aditya Alok 39bf6e9835
feat(build scripts): add steps for haskell packages
Signed-off-by: Aditya Alok <dev.aditya.alok@gmail.com>

refactor(termux_step_get_dependencies): move haskell build steps from here
2022-03-16 15:31:45 +01:00
Aditya Alok e63a8b36a8
feat(haskell build): add default setup.hs
It is used when package does not ship with its own Setup.hs

Signed-off-by: Aditya Alok <dev.aditya.alok@gmail.com>
2022-03-16 15:31:43 +01:00
Aditya Alok e913a1913e
feat(build scripts): add script to setup jailbreak-cabal
It is use to remove version constraints from cabal packages

Signed-off-by: Aditya Alok <dev.aditya.alok@gmail.com>
2022-03-16 15:31:40 +01:00
Aditya Alok feec2fe8ec
feat(build scripts): add script to setup ghc cross compiler
Signed-off-by: Aditya Alok <dev.aditya.alok@gmail.com>
2022-03-16 15:31:36 +01:00
Aditya Alok dbed364f00
feat(build scripts): add script to setup cabal
Signed-off-by: Aditya Alok <dev.aditya.alok@gmail.com>
2022-03-16 15:31:33 +01:00
Henrik Grimler 7502d684d8
build-package: create $PREFIX/bin/sh->/bin/sh symlink later
We need to run it after termux_step_get_dependencies, or else the
symlink might be overridden if dash is a dependency, since it contains
a sh->dash symlink.

termux_step_override_config_scripts is run right after
termux_step_get_dependencies, and feels seems like a logical place to
create the symlink (since symlink is used to make config scripts
executable).
2022-03-13 13:58:37 +01:00
Tee KOBAYASHI 0ed19b96ad termux_setup_meson: Modify URL for gtkdoc patch
now that it is merged upstream.
2022-03-11 15:33:53 +09:00
Henrik Grimler d85f11720e
cmake: update to 3.22.3 2022-03-10 22:04:42 +01:00
Henrik Grimler bf56580acd
termux_setup_meson: use 0.61.2
The PR where we take the gtkdoc patch from has had a force push, so
url to diff needs to be updated.  Upgrade to 0.61.2 while we are at
it.
2022-03-09 09:49:28 +01:00
Henrik Grimler 0e9c95fd90
toolchain/ndk-sysroot: let mesa provide KHR/khrplatform.h
The headers are nearly identical, use the one from mesa to ensure
compatibility with mesa.
2022-03-09 09:28:40 +01:00
Henrik Grimler 59f1c7b183
Revert "feat(ghc): enable cross-compiling haskell packages on CI"
This will need some more work.  Currently
termux_create_haskell_debscripts is run for all packages, even
non-haskell ones, which causes errors in postinst and prerm scripts in
an ugly way.

This reverts commit dc2474b2c2.
2022-03-09 07:40:36 +01:00
Aditya Alok db89dd924d fix(setup ghc cross): define variable before use
Signed-off-by: Aditya Alok <dev.aditya.alok@gmail.com>
2022-03-09 10:01:57 +09:00
Aditya Alok 3a1acb712b feat(build scripts): allow packages to define extra static split patterns
- add variable `TERMUX_PKG_STATICSPLIT_EXTRA_PATTERNS`

Signed-off-by: Aditya Alok <dev.aditya.alok@gmail.com>
2022-03-09 10:01:57 +09:00
Aditya Alok dc2474b2c2 feat(ghc): enable cross-compiling haskell packages on CI
- `termux_setup_ghc_cross_compiler` should not be called by build.sh, as it installs cross-compiler
in $TERMUX_PREFIX (otherwise ghc adds wrong `rpaths` to built libs and executables)

Signed-off-by: Aditya Alok <dev.aditya.alok@gmail.com>
2022-03-09 10:01:57 +09:00
Henrik Grimler b79db7ce73
Revert "[TEMP] download deps from grimler.se instead of packages.termux.org"
This reverts commit 5b432ffbbc.
2022-03-07 14:40:40 +01:00