From e702258e9afd693da153ef56fecfabe5a5e41c78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Mon, 10 May 2021 22:47:53 -0300 Subject: [PATCH] shutils/pkgtarget: speed up build dir cleanup. We need `chmod -R` to be able to cleanup after Go packages, but it's unnecessary in most other cases. By only running it when the first `rm -rf` fails, we optimize for the most common case and get a tiny speedup for this build step. --- common/xbps-src/shutils/pkgtarget.sh | 2 +- srcpkgs/poppler/patches/fix-cflags.patch | 21 --------------------- 2 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 srcpkgs/poppler/patches/fix-cflags.patch diff --git a/common/xbps-src/shutils/pkgtarget.sh b/common/xbps-src/shutils/pkgtarget.sh index 314dc5aeabe2..5944b791a4aa 100644 --- a/common/xbps-src/shutils/pkgtarget.sh +++ b/common/xbps-src/shutils/pkgtarget.sh @@ -79,7 +79,7 @@ remove_pkg_autodeps() { remove_pkg_wrksrc() { if [ -d "$wrksrc" ]; then msg_normal "$pkgver: cleaning build directory...\n" - chmod -R +wX "$wrksrc" # Needed to delete Go Modules + rm -rf "$wrksrc" || chmod -R +wX "$wrksrc" # Needed to delete Go Modules rm -rf "$wrksrc" fi } diff --git a/srcpkgs/poppler/patches/fix-cflags.patch b/srcpkgs/poppler/patches/fix-cflags.patch deleted file mode 100644 index 9e62b11010ba..000000000000 --- a/srcpkgs/poppler/patches/fix-cflags.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: cmake/modules/PopplerMacros.cmake -=================================================================== ---- cmake/modules/PopplerMacros.cmake.orig -+++ cmake/modules/PopplerMacros.cmake -@@ -123,14 +123,14 @@ if(CMAKE_COMPILER_IS_GNUCXX) - set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") - - set(_save_cxxflags "${CMAKE_CXX_FLAGS}") -- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE") -+ set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}") - set(_save_cflags "${CMAKE_C_FLAGS}") -- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE") -+ set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE ${_save_cflags}") - set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") - set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}") - set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}")