Commit Graph

384 Commits

Author SHA1 Message Date
Henrik Grimler
26da480d36 build-package: mv code for creating llvm-config
After https://github.com/termux/termux-packages/commit/e34ae5da030d,
llvm-config was created before termux_step_get_dependencies, meaning
that it gets overwritten if libllvm is installed.

Fix this by creating llvm-config in a new function
termux_step_override_config_scripts, that is run right after
termux_step_get_dependencies.
2021-09-17 12:02:53 +02:00
Henrik Grimler
70ee9001e4 termux_setup_protobuf: fix checksum after protobuf update 2021-09-16 22:01:20 +02:00
Yaksh Bariya
5c242cdbea gn: Bump to latest commit 2021-09-16 18:53:22 +01:00
Ivan Max
925273464b
build-package.sh: avoid dashes in version field for pacman package format (#7525) 2021-09-14 12:36:23 +03:00
Oskar
8a780c7c7e
golang: upgrade to 1.17.1 (#7416) 2021-09-13 17:50:02 +01:00
Leonid Pliushch
07852c874b
build-package.sh: allow to select package formats between debian and pacman 2021-09-10 19:55:28 +03:00
Henrik Grimler
1c272f516b build-package: use xz compression for control archives (again)
All packages that have conffiles, and a gz compressed control.tar.gz,
currently fails to install on arm if the deb is built locally or
downloaded and then installed with `apt install
./foo_1.0_arm.deb`. The error looks like:

    $ apt install ./tmp/foo.deb
    Reading package lists... Error!
    E: Tar checksum failed, archive corrupted
    E: Could not read meta data from
/data/data/com.termux/files/home/tmp/foo.deb
    E: The package lists or status file could not be parsed or opened.

If the package does not have conffiles, or if xz compression is used,
everything works. Let's change back to xz compression for all new and
updated packages for now to workaround this issue.

Even if `apt install ./foo.deb` fails the deb can still be installed
with `dpkg -i ./foo.deb` (seems dpkg does not do the same checksum
check?).
2021-09-05 21:35:12 +02:00
YAKSH BARIYA
2d38944910
new package: gn (#7290) 2021-09-03 20:46:03 +03:00
Henrik Grimler
e6239bb81c build-package: delete old $PREFIX ealier in build
Currently there is a problem building packages that use *-config
scripts (for example gnupg), we are creating a
/bin/sh->/data/data/com.termux/files/usr/bin/sh symlink so that the
shebang for the scripts can be interpreted, but after
ecd214881a ("build-package: add new arg -c for "continue build"") the
symlink was deleted in termux_step_get_dependencies.
2021-09-03 17:56:57 +02:00
Butta
da42afeb7a termux_step_patch_package: apply patches in alphabetical order
Before 32c67fa, patches were applied in alphabetical order, which some packages
like swift relied on, so go back to that.
2021-09-02 21:13:58 +05:30
Yaksh Bariya
c70f3b4efa cmake: Bump to 3.21.2 2021-09-01 21:56:25 +05:30
Henrik Grimler
32c67fa030 termux_step_patch_package: add support for on device patches
Name a patch *.patch.ondevice for it to only be applied when building
on device.

This can be useful if for example a tool for building documentation is
missing on device, or if a tool needed during build (but not runtime)
uses something that triggers selinux, fdsan or some other android
security thing.
2021-09-01 11:12:24 +02:00
Henrik Grimler
b782c7da0e toolchain: add -fPIC to CPPFLAGS for i686
When adding this, we go from compiling with

  /home/builder/.termux-build/_cache/android-r21d-api-24-v4/bin/clang++ [...] -mrelocation-model pic -pic-level 2 -pic-is-pie [...]

to

  /home/builder/.termux-build/_cache/android-r21d-api-24-v5/bin/clang++ [...] -mrelocation-model pic -pic-level 2 [...]

Before, we got a warning when compiling libandroid-spawn:

  /home/builder/.termux-build/_cache/android-r21d-api-24-v4/bin/../lib/gcc/i686-linux-android/4.9.x/../../../../i686-linux-android/bin/ld: warning: shared library text segment is not shareable

and trying to use a program linked against libandroid-spawn gave an
error, see
https://github.com/termux/termux-packages/issues/7215#issuecomment-906154438
the Without this, libraries might end up with text relocations. For
some reason it does not seem to be an issue on the other arches.

%ci:no-build
2021-08-27 10:02:20 +02:00
Henrik Grimler
b5821cbf80 termux_step_setup_build_folders: create more cache folders
Should have been added in 05728b58e5.
2021-08-25 22:38:00 +02:00
Henrik Grimler
05728b58e5 termux_get_repo_files: do not create folders
This has already been done in termux_step_setup_build_folders. Doing
it here causes problems, after
ecd214881a
as BUILDDIR now might be SRCDIR, which should
not be created as it breaks zip extraction.
2021-08-25 21:41:56 +02:00
Henrik Grimler
6445645d7e build-package: mv code for setting up src and build to to its own function
%ci:no-build
2021-08-24 21:40:46 +02:00
Henrik Grimler
12e395d3a9 step_configure_cmake: mv cmake and ninja setup functions to step_configure
Only keep actual configure steps in termux_step_configure_cmake. This
way we can skip termux_step_configure_cmake on a continued build.
2021-08-24 21:40:46 +02:00
Henrik Grimler
3407018962 build-package: error if hostbuilt tools are missing 2021-08-24 21:40:46 +02:00
Henrik Grimler
ecd214881a build-package: add new arg -c for "continue build"
As replacement for TERMUX_PKG_QUICK_REBUILD. Running
./build-package.sh -c <package> starts a build for <package>, but does
not extract and patch the source from scratch. Instead it sets up the
build variables and starts from termux_step_make.

When working on a big package that can take hours to build it is
convenient to be able to build until there is an error, then apply
some new patch (manually) to the source, and then continue from where
the build failed.
2021-08-24 21:40:46 +02:00
Henrik Grimler
4f8d054066 Revert "termux_step_create_datatar.sh: add data/ to tar instead of ./"
Unfortunately this does not play nicely with aptly, see
https://github.com/termux/termux-packages/pull/7335#issuecomment-904202191.

This reverts commit b7e6ef99702aea61cd8baedd0c7ef315c35ab30c.
2021-08-24 13:30:52 +02:00
Henrik Grimler
c5e4480515 Revert "termux_create_subpackages: add data/ to tar instead of ./"
Unfortunately this does not play nicely with aptly, see
https://github.com/termux/termux-packages/pull/7335#issuecomment-904202191.

This reverts commit b8e2bdf853.
2021-08-24 13:30:20 +02:00
Henrik Grimler
b8e2bdf853 termux_create_subpackages: add data/ to tar instead of ./
Follow-up on b7e6ef99702aea61cd8baedd0c7ef315c35ab30c, forgot about
the subpackages in that one.
2021-08-24 07:05:13 +02:00
Henrik Grimler
23530a540c build-package: create timestamp file after get_dependencies
Fixes issue introduced in e34ae5da03.
2021-08-21 22:37:51 +02:00
Henrik Grimler
23e760143b termux_step_start_build: get llvm version in standard way
And fix indentation, and remove echo of llvm version.
2021-08-21 21:04:43 +02:00
Henrik Grimler
0c8a398d0e termux_step_start_build: remove some extra spaces 2021-08-21 20:59:24 +02:00
Henrik Grimler
e34ae5da03 build-package: mv code for getting deps out of step_start_build
Into new function termux_step_get_dependencies.
2021-08-21 20:59:24 +02:00
Henrik Grimler
2c70621a98 build-package: rename TERMUX_DEBUG to TERMUX_DEBUG_BUILD
To make it more self-explanatory.
2021-08-21 20:55:57 +02:00
Henrik Grimler
ea1772da55 termux_step_setup_variables: sort variables alphabetically 2021-08-21 20:54:44 +02:00
Oskar
ed869e42dc
golang: revert to 1.16 (#7373)
Issue: https://github.com/termux/termux-packages/issues/7356
2021-08-21 16:58:27 +03:00
Oskar
a353946fc5
golang: update to 1.17 (#7345) 2021-08-17 23:31:46 +01:00
Henrik Grimler
ec352dd663 termux_download: don't warn if SKIP_CHECKSUM is passed 2021-08-17 15:22:46 +02:00
Henrik Grimler
bd6bc93daf termux_step_start_build: strip prefixed ./ if found
All, or at least most, of our debs contain "./" as a folder. This
causes problems when extracting on some systems, as ./ then is the
system root directory /, and tar cannot change the permissions of this
folder.  Trying to build on arch for example gives:

    tar: .: Cannot change mode to rwxr-xr-x: Operation not permitted
    tar: Exiting with failure status due to previous errors

The issue appeared on arch somewhat recently, maybe with tar 1.33. To
avoid having to rebuild all packages we now handle both data.tar.xz
types, with prefixed ./, and without.

Also remove some indentation levels while we are at it.
2021-08-17 15:22:18 +02:00
Henrik Grimler
854bd813f4 termux_step_create_datatar.sh: add data/ to tar instead of ./
This avoids "./" being part of the tar. "./" translates to the
systemroot / when we extract, and this is problematic since tar cannot
change permissions and ownerships of this folder. tar 1.34 gives an
error:

    tar: .: Cannot change mode to rwxr-xr-x: Operation not permitted
    tar: Exiting with failure status due to previous errors

when we try to extract the data.tar.xz.
2021-08-17 15:22:18 +02:00
MedzikUser
1edd9011d5
golang: update to 1.16.7 (#7308) 2021-08-15 00:59:49 +03:00
Henrik Grimler
4cdb5cdf5d licenses: Simplified BSD->BSD Simplified 2021-08-02 11:38:35 +02:00
Henrik Grimler
73bc3b19ca licenses: install license file for Simplified BSD
Simplified BSD's license also contain copyright information, so we
cannot use a generic license file.
2021-08-02 10:35:03 +02:00
Leonid Pliushch
51866303ed
build-package.sh: run termux-elf-cleaner for ./opt 2021-07-29 22:38:21 +03:00
Yaksh Bariya
ea9994dad7
cmake: Bump to 3.21.1 2021-07-29 17:20:15 +05:30
Leonid Pliushch
9c6960abd9
build-package.sh: retry download if packages list checksum is bad 2021-07-23 17:42:03 +03:00
Leonid Pliushch
f219100650
build-package.sh: retry if metadata signature is bad
Do not fail immediately if signature is bad. This often happens when metadata
has been downloaded during repository update. Usually signature becomes fixed
in a few seconds, so we can rather wait than abort build immediately.
2021-07-23 00:29:32 +03:00
Leonid Pliushch
3da76dfd64
golang: update to 1.16.6 2021-07-16 22:39:09 +03:00
Leonid Pliushch
165b741de8
cmake: update to 3.21.0 2021-07-16 22:01:03 +03:00
Butta
167739f5b8 nushell: try again to fix i686 build by exporting RUSTFLAGS earlier and adding a flag 2021-07-15 23:34:56 +05:30
Leonid Pliushch
4b8c077711
Revert "Merge pull request #7104 from thunder-coding/cache-godeps"
This reverts commit f6892c38d8, reversing
changes made to 4d9075fea3.
2021-07-10 17:00:18 +03:00
Yaksh Bariya
b8037128f3
termux_go_get: Do not override $GOPATH 2021-07-05 12:22:15 +05:30
Yaksh Bariya
92f1afaa54
Fix go cache reliability in some edge cases 2021-07-05 09:33:28 +05:30
Yaksh Bariya
40aef7e5ea
Move golang cache logic out of build.sh 2021-07-05 09:22:16 +05:30
Yaksh Bariya
73c1d3d83e Bump cmake to 3.20.5 2021-06-24 12:00:29 +03:00
Butta
1ce096c0ab cmake: update from 3.20.2 to 3.20.4 2021-06-17 09:37:45 +05:30
Suhan G Paradkar
0c103765f4
golang: update to 1.16.5 (#7020) 2021-06-16 16:49:39 +03:00