diff options
| author |   Eric Hameleers <alien@slackware.com> | 2023-06-16 20:21:04 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2023-06-16 20:21:04 +0000 |
| commit | aa54e4b5dc93480ab6b9d1be7dc0b61f1ba04806 (patch) | |
| tree | 68573cf97304a04b42f940a53b7b408484174cf6 | |
| parent | baaba924696cd1769505bac89756674e2e11a5d8 (diff) | |
| download | asb-aa54e4b5dc93480ab6b9d1be7dc0b61f1ba04806.tar.gz asb-aa54e4b5dc93480ab6b9d1be7dc0b61f1ba04806.tar.xz | |
chromium: build clang before applying ungoogled patch set
| -rwxr-xr-x | chromium/build/chromium.SlackBuild | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/chromium/build/chromium.SlackBuild b/chromium/build/chromium.SlackBuild index 16664f4d..5f03bdde 100755 --- a/chromium/build/chromium.SlackBuild +++ b/chromium/build/chromium.SlackBuild @@ -859,6 +859,7 @@ echo "Extracting the source archive(s) for $PRGNAM..." tar -xf ${SOURCE[0]} if [ ${USE_UNGOOGLED} -ne 0 ]; then tar -xf ${SOURCE[2]} + UGDIR=$TMP/tmp-$PRGNAM/ungoogled-chromium-${UNGOOGLED} fi cd ${SRCNAM}-${VERSION} @@ -948,16 +949,6 @@ if [ $FFMPEG_HEVC -eq 1 ]; then 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log fi -if [ ${USE_UNGOOGLED} -ne 0 ]; then - # Apply ungoogled-chromium patch kit: - UGDIR=$TMP/tmp-$PRGNAM/ungoogled-chromium-${UNGOOGLED} - echo "-- Un-googling internal binaries:" - python3 ${UGDIR}/utils/prune_binaries.py ./ ${UGDIR}/pruning.list - echo "-- Un-googling sources; apply patches:" - python3 ${UGDIR}/utils/patches.py apply ./ ${UGDIR}/patches - # We will have to un-google internally used domain list later. -fi - # Also needed for Slackware <= 14.2: if [ $(LC_ALL=C gcc -dumpversion |cut -d. -f1) -eq 4 ]; then cat $SRCDIR/patches/chromium56_gcc4.patch | patch -p1 --verbose \ @@ -1366,6 +1357,15 @@ if [ ${FFMPEG_HEVC} -eq 1 ] && [ "${FFMPEG_ARCH}" != "ia32" ]; then fi if [ ${USE_UNGOOGLED} -ne 0 ]; then + # Apply ungoogled-chromium patch kit: + echo "-- Un-googling internal binaries:" + python3 ${UGDIR}/utils/prune_binaries.py ./ ${UGDIR}/pruning.list + echo "-- Un-googling sources; apply patches:" + python3 ${UGDIR}/utils/patches.py apply ./ ${UGDIR}/patches + # We will have to un-google internally used domain list later. +fi + +if [ ${USE_UNGOOGLED} -ne 0 ]; then echo "-- Un-googling internally used domain list:" python3 ${UGDIR}/utils/domain_substitution.py apply \ -r ${UGDIR}/domain_regex.list \ |