Skip to content

Commit 5d458e8

Browse files
committed
Update some repo sources to savannah mirrors for clone reliability
1 parent 4ccf4c4 commit 5d458e8

6 files changed

Lines changed: 16 additions & 16 deletions

File tree

build/README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ After clone step add:
143143
### Template Script Args
144144
`--BUILD_NAME libpsl --GitRepo https://github.com/rockdaboot/libpsl --GNU_LIBS_USED=0 --BUILD_MSVC_RUNTIME_INFO_ADD_TO_C_AND_LDFLAGS=1 --BUILD_ADDL_CFLAGS_STATIC -DPSL_STATIC -DU_STATIC_IMPLEMENTATION -DU_IMPORT`
145145

146-
### Modifications
146+
### Modifications
147147
just doing --enable-static is not enough and -D U_IMPORT is required to override the default dll import as it doesn't check static
148148

149149
## zlib
@@ -197,7 +197,7 @@ before gnulib block:
197197
fi
198198
export PATH="$PATH:./"
199199
```
200-
200+
201201
Right before configure:
202202
`touch ABOUT-NLS`
203203

@@ -224,7 +224,7 @@ In the clone step add
224224
echo "EXTRA_DIST = " > m4/Makefile.am
225225
add_items_to_gitignore;
226226
git_staging_add bootstrap bootstrap.conf
227-
git_staging_commit #need to commit it up so that the bootstrap files are avail for our gnulib patching by default all local changes are stashed
227+
git_staging_commit #need to commit it up so that the bootstrap files are avail for our gnulib patching by default all local changes are stashed
228228
```
229229

230230
Before our patch block add
@@ -335,7 +335,7 @@ replace the configure block with:
335335
# sed -i -E 's#return (\$path ne [^;]+;)#my $ret = \1\n\t$ret =~ s/\\/\//g;\n\treturn $ret;#' perl/lib/File/Spec/Win32.pm
336336
fi
337337
NASM_PATH=$(convert_to_msys_path "${BLD_CONFIG_SRC_FOLDER}/nasm")
338-
export PATH="${NASM_PATH}:$PATH"
338+
export PATH="${NASM_PATH}:$PATH"
339339
ensure_perl_installed_set_exports
340340
setup_build_env;
341341

@@ -391,7 +391,7 @@ after make install add:
391391
392392
### Modifications
393393
At top before main func add:
394-
```bash
394+
```bash
395395
function lua_pkg_config_gen() {
396396
LUA_VERSION=5.4
397397
PKG_CFG=`cat "${SCRIPT_FOLDER}/patches/lua.pc.template"`
@@ -417,7 +417,7 @@ Remove configure block and add:
417417
#change to windows extensions
418418
sed -i -E 's/[.]o\b/.obj/g' Makefile src/Makefile
419419
sed -i -E 's/[.]a\b/.lib/g' Makefile src/Makefile
420-
420+
421421
sed -i -E 's/^AR=(ar.*)/AR?=\1/g' Makefile src/Makefile #allow manually specifing AR
422422
sed -i -E 's/\$\{CXX\} \$\{LDFLAGS\}/${CXX} ${CFLAGS}/g' src/Makefile #this only happens once, and its for linking the main executable, while LD is more on track we need the other translations that compile does so we will use the compiler. We need to use this over CXX_COMPILE as it has the -c command which forces compile only
423423
sed -i -E "s#PREFIX = .+#PREFIX = $BLD_CONFIG_INSTALL_FOLDER#" Makefile
@@ -431,7 +431,7 @@ Remove configure block and add:
431431
```
432432

433433
after make install add:
434-
```bash
434+
```bash
435435
if [[ $BLD_CONFIG_PREFER_STATIC_LINKING -eq 1 ]]; then
436436
mkdir -p "${BLD_CONFIG_INSTALL_FOLDER}/lib/"
437437
cp src/libhighlight.lib "${BLD_CONFIG_INSTALL_FOLDER}/lib/"
@@ -451,7 +451,7 @@ fix our vars at the top for changing it to: `BLD_CONFIG_BUILD_ADDL_CFLAGS_DEBUG=
451451

452452
### Modifications
453453
after switch to master and patch line (but in that block) add:
454-
```bash
454+
```bash
455455
if [[ -f "gl/modules/rename-tests.diff" ]]; then
456456
git rm gl/modules/link-tests.diff gl/modules/rename-tests.diff
457457
fi
@@ -562,4 +562,4 @@ after clone
562562

563563
## gnulib tests
564564
### Template Script Args
565-
``--BUILD_NAME gnulib_test --HaveOurPatch=0 --GitRepo https://github.com/mitchcapper/__empty --GNU_LIBS_ADD_TO_REPO 1 --CONFIG_NO_TESTS=0`
565+
``--BUILD_NAME gnulib_test --HaveOurPatch=0 --GitRepo https://github.com/mitchcapper/__empty --GNU_LIBS_ADD_TO_REPO 1 --CONFIG_NO_TESTS=0`

build/f_findutils_build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ if test 5 -gt 100; then
1818
echo "Just move the fi down as you want to skip steps, or pass the step to skip to (per below) as the first arg"
1919
fi
2020
if [[ -z $SKIP_STEP || $SKIP_STEP == "checkout" ]]; then
21-
git_clone_and_add_ignore https://git.savannah.gnu.org/git/findutils.git .
21+
git_clone_and_add_ignore https://github.com/sailfishos-mirror/findutils . # https://git.savannah.gnu.org/git/findutils.git
2222
fi
2323

2424
if [[ -z $SKIP_STEP || $SKIP_STEP == "our_patch" ]]; then

build/f_gawk_build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ if test 5 -gt 100; then
2121
echo "Just move the fi down as you want to skip steps, or pass the step to skip to (per below) as the first arg"
2222
fi
2323
if [[ -z $SKIP_STEP || $SKIP_STEP == "checkout" ]]; then
24-
git_clone_and_add_ignore https://git.savannah.gnu.org/git/gawk.git .
24+
git_clone_and_add_ignore https://github.com/sailfishos-mirror/gawk . # https://git.savannah.gnu.org/git/gawk.git
2525
cp gnulib/build-aux/bootstrap .
2626
cp gnulib/build-aux/bootstrap.conf .
2727
echo "gnulib_tool_option_extras=\" --without-tests --symlink --m4-base=m4 --lib=libgawk --source-base=lib --cache-modules\"" >> bootstrap.conf
@@ -36,7 +36,7 @@ fi
3636
echo "EXTRA_DIST = " > m4/Makefile.am
3737
add_items_to_gitignore;
3838
git_staging_add bootstrap bootstrap.conf
39-
git_staging_commit #need to commit it up so that the bootstrap files are avail for our gnulib patching by default all local changes are stashed
39+
git_staging_commit #need to commit it up so that the bootstrap files are avail for our gnulib patching by default all local changes are stashed
4040
fi
4141
if [[ -z $SKIP_STEP || $SKIP_STEP == "our_patch" ]]; then
4242
apply_our_repo_patch; # Applies from patches folder repo_BUILD_NAME.patch to the sources
@@ -67,7 +67,7 @@ fi
6767
gnulib_ensure_buildaux_scripts_copied --forced
6868
export BLD_CONFIG_GNU_LIBS_AUTORECONF_DISABLE_FORCE=1
6969
setup_gnulibtool_py_autoconfwrapper
70-
70+
7171
cd $BLD_CONFIG_SRC_FOLDER
7272
if [[ -z $SKIP_STEP || $SKIP_STEP == "configure" ]]; then
7373
configure_apply_fixes_and_run;

build/f_grep_build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ if test 5 -gt 100; then
1919
echo "Just move the fi down as you want to skip steps, or pass the step to skip to (per below) as the first arg"
2020
fi
2121
if [[ -z $SKIP_STEP || $SKIP_STEP == "checkout" ]]; then
22-
git_clone_and_add_ignore https://git.savannah.gnu.org/git/grep.git .
22+
git_clone_and_add_ignore https://github.com/sailfishos-mirror/grep . # https://git.savannah.gnu.org/git/grep.git
2323
fi
2424

2525
if [[ $BLD_CONFIG_GNU_LIBS_USED -eq "1" ]]; then

build/f_gzip_build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ if test 5 -gt 100; then
1515
echo "Just move the fi down as you want to skip steps, or pass the step to skip to (per below) as the first arg"
1616
fi
1717
if [[ -z $SKIP_STEP || $SKIP_STEP == "checkout" ]]; then
18-
git_clone_and_add_ignore https://git.savannah.gnu.org/git/gzip.git .
18+
git_clone_and_add_ignore https://github.com/sailfishos-mirror/gzip . # https://git.savannah.gnu.org/git/gzip.git
1919
fi
2020

2121
if [[ $BLD_CONFIG_GNU_LIBS_USED -eq "1" ]]; then

build/f_tar_build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ if test 5 -gt 100; then
1616
echo "Just move the fi down as you want to skip steps, or pass the step to skip to (per below) as the first arg"
1717
fi
1818
if [[ -z $SKIP_STEP || $SKIP_STEP == "checkout" ]]; then
19-
git_clone_and_add_ignore https://git.savannah.gnu.org/git/tar.git .
19+
git_clone_and_add_ignore https://github.com/sailfishos-mirror/tar . # https://git.savannah.gnu.org/git/tar.git
2020
fi
2121

2222
if [[ -z $SKIP_STEP || $SKIP_STEP == "our_patch" ]]; then

0 commit comments

Comments
 (0)