sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #4911 from buttaface/quick-rebuild

Browse Source 
Introduce TERMUX_PKG_QUICK_REBUILD
This commit is contained in:
Leonid Pliushch 2020-02-17 13:43:40 +02:00 committed by GitHub
commit fec6bdc7b9
4 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/libllvm/build.sh
View File

@ -58,9 +58,11 @@ TERMUX_PKG_HAS_DEBUG=false
# common.min.50.ompt.optional should be common.deb.50.ompt.optional when doing debug build # common.min.50.ompt.optional should be common.deb.50.ompt.optional when doing debug build
termux_step_post_extract_package() { termux_step_post_extract_package() {
if [ "$TERMUX_PKG_QUICK_REBUILD" != "true" ]; then
mv clang-${TERMUX_PKG_VERSION}.src tools/clang mv clang-${TERMUX_PKG_VERSION}.src tools/clang
mv lld-${TERMUX_PKG_VERSION}.src tools/lld mv lld-${TERMUX_PKG_VERSION}.src tools/lld
mv openmp-${TERMUX_PKG_VERSION}.src projects/openmp mv openmp-${TERMUX_PKG_VERSION}.src projects/openmp
fi
} }
termux_step_host_build() { termux_step_host_build() {
@ -72,9 +74,11 @@ termux_step_host_build() {
} }
termux_step_pre_configure() { termux_step_pre_configure() {
if [ "$TERMUX_PKG_QUICK_REBUILD" != "true" ]; then
mkdir projects/openmp/runtime/src/android mkdir projects/openmp/runtime/src/android
cp $TERMUX_PKG_BUILDER_DIR/nl_types.h projects/openmp/runtime/src/android cp $TERMUX_PKG_BUILDER_DIR/nl_types.h projects/openmp/runtime/src/android
cp $TERMUX_PKG_BUILDER_DIR/nltypes_stubs.cpp projects/openmp/runtime/src/android cp $TERMUX_PKG_BUILDER_DIR/nltypes_stubs.cpp projects/openmp/runtime/src/android
fi
cd $TERMUX_PKG_BUILDDIR cd $TERMUX_PKG_BUILDDIR
export LLVM_DEFAULT_TARGET_TRIPLE=$TERMUX_HOST_PLATFORM export LLVM_DEFAULT_TARGET_TRIPLE=$TERMUX_HOST_PLATFORM

2
scripts/build/termux_step_patch_package.sh
View File

@ -6,6 +6,7 @@ termux_step_patch_package() {
if [ "$TERMUX_DEBUG" = "true" ]; then if [ "$TERMUX_DEBUG" = "true" ]; then
DEBUG_PATCHES=$(find $TERMUX_PKG_BUILDER_DIR -mindepth 1 -maxdepth 1 -name \*.patch.debug) DEBUG_PATCHES=$(find $TERMUX_PKG_BUILDER_DIR -mindepth 1 -maxdepth 1 -name \*.patch.debug)
fi fi
if [ "$TERMUX_PKG_QUICK_REBUILD" != "true" ]; then
# Suffix patch with ".patch32" or ".patch64" to only apply for these bitnesses: # Suffix patch with ".patch32" or ".patch64" to only apply for these bitnesses:
shopt -s nullglob shopt -s nullglob
for patch in $TERMUX_PKG_BUILDER_DIR/*.patch{$TERMUX_ARCH_BITS,} $DEBUG_PATCHES; do for patch in $TERMUX_PKG_BUILDER_DIR/*.patch{$TERMUX_ARCH_BITS,} $DEBUG_PATCHES; do
@ -14,4 +15,5 @@ termux_step_patch_package() {
patch --silent -p1 patch --silent -p1
done done
shopt -u nullglob shopt -u nullglob
fi
} }

1
scripts/build/termux_step_setup_variables.sh
View File

@ -133,6 +133,7 @@ termux_step_setup_variables() {
TERMUX_CMAKE_BUILD=Ninja # Which cmake generator to use TERMUX_CMAKE_BUILD=Ninja # Which cmake generator to use
TERMUX_PKG_HAS_DEBUG=true # set to false if debug build doesn't exist or doesn't work, for example for python based packages TERMUX_PKG_HAS_DEBUG=true # set to false if debug build doesn't exist or doesn't work, for example for python based packages
TERMUX_PKG_METAPACKAGE=false TERMUX_PKG_METAPACKAGE=false
TERMUX_PKG_QUICK_REBUILD=false # set this temporarily when iterating on a large package and you don't want the source and build directories wiped every time you make a mistake
unset CFLAGS CPPFLAGS LDFLAGS CXXFLAGS unset CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
} }

12
scripts/build/termux_step_start_build.sh
View File

@ -128,15 +128,21 @@ termux_step_start_build() {
-e "s|@TERMUX_ARCH@|$TERMUX_ARCH|g" > $TERMUX_PREFIX/bin/llvm-config -e "s|@TERMUX_ARCH@|$TERMUX_ARCH|g" > $TERMUX_PREFIX/bin/llvm-config
chmod 755 $TERMUX_PREFIX/bin/llvm-config chmod 755 $TERMUX_PREFIX/bin/llvm-config
fi fi
if [ "$TERMUX_PKG_QUICK_REBUILD" != "true" ]; then
# Following directories may contain files with read-only permissions which # Following directories may contain files with read-only permissions which
# makes them undeletable. We need to fix that. # makes them undeletable. We need to fix that.
[ -d "$TERMUX_PKG_BUILDDIR" ] && chmod +w -R "$TERMUX_PKG_BUILDDIR" [ -d "$TERMUX_PKG_BUILDDIR" ] && chmod +w -R "$TERMUX_PKG_BUILDDIR"
[ -d "$TERMUX_PKG_SRCDIR" ] && chmod +w -R "$TERMUX_PKG_SRCDIR" [ -d "$TERMUX_PKG_SRCDIR" ] && chmod +w -R "$TERMUX_PKG_SRCDIR"
# Cleanup old state: # Cleanup old build state:
rm -Rf "$TERMUX_PKG_BUILDDIR" \ rm -Rf "$TERMUX_PKG_BUILDDIR" \
"$TERMUX_PKG_PACKAGEDIR" \ "$TERMUX_PKG_SRCDIR"
"$TERMUX_PKG_SRCDIR" \ else
TERMUX_PKG_SKIP_SRC_EXTRACT=true
fi
# Cleanup old packaging state:
rm -Rf "$TERMUX_PKG_PACKAGEDIR" \
"$TERMUX_PKG_TMPDIR" \ "$TERMUX_PKG_TMPDIR" \
"$TERMUX_PKG_MASSAGEDIR" "$TERMUX_PKG_MASSAGEDIR"