[openwrt/openwrt] treewide: remove BUILD_PARALLEL from CMake packages

LEDE Commits lede-commits at lists.infradead.org
Sat Jun 19 23:46:48 PDT 2021


aparcar pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/2e745e9be653626d37248c4f0a88ce9a5f90d183

commit 2e745e9be653626d37248c4f0a88ce9a5f90d183
Author: Rosen Penev <rosenp at gmail.com>
AuthorDate: Fri Jun 18 20:35:14 2021 -0700

    treewide: remove BUILD_PARALLEL from CMake packages
    
    It's already default. The only exception is mt76 which has Ninja
    disabled.
    
    Found with:
    
    git grep BUILD_PARALLEL | cut -d ':' -f 1 | sort -u > par
    git grep cmake.mk | cut -d ':' -f 1 > cmake
    comm -1 -2 par cmake
    
    Signed-off-by: Rosen Penev <rosenp at gmail.com>
---
 package/libs/libjson-c/Makefile        | 1 -
 package/libs/libpcap/Makefile          | 1 -
 package/libs/mbedtls/Makefile          | 1 -
 package/network/config/netifd/Makefile | 2 --
 package/network/utils/umbim/Makefile   | 2 --
 package/network/utils/uqmi/Makefile    | 2 --
 package/system/opkg/Makefile           | 2 --
 package/system/rpcd/Makefile           | 1 -
 package/system/uci/Makefile            | 1 -
 package/system/urngd/Makefile          | 2 --
 tools/zstd/Makefile                    | 1 -
 11 files changed, 16 deletions(-)

diff --git a/package/libs/libjson-c/Makefile b/package/libs/libjson-c/Makefile
index 0ea3fe80b5..d4a16f36cb 100644
--- a/package/libs/libjson-c/Makefile
+++ b/package/libs/libjson-c/Makefile
@@ -21,7 +21,6 @@ PKG_LICENSE_FILES:=COPYING
 PKG_CPE_ID:=cpe:/a:json-c_project:json-c
 
 PKG_FLAGS := nonshared
-PKG_BUILD_PARALLEL:=1
 HOST_BUILD_PREFIX:=$(STAGING_DIR_HOST)
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/libs/libpcap/Makefile b/package/libs/libpcap/Makefile
index 6168d4c459..8c08259055 100644
--- a/package/libs/libpcap/Makefile
+++ b/package/libs/libpcap/Makefile
@@ -21,7 +21,6 @@ PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
 PKG_ASLR_PIE_REGULAR:=1
-PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
diff --git a/package/libs/mbedtls/Makefile b/package/libs/mbedtls/Makefile
index 7f6bf4e4c0..6add1f401a 100644
--- a/package/libs/mbedtls/Makefile
+++ b/package/libs/mbedtls/Makefile
@@ -16,7 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/ARMmbed/mbedtls/tar.gz/v$(PKG_VERSION)?
 PKG_HASH:=96257bb03b30300b2f35f861ffe204ed957e9fd0329d80646fe57fc49f589b29
 
-PKG_BUILD_PARALLEL:=1
 PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=gpl-2.0.txt
 PKG_CPE_ID:=cpe:/a:arm:mbed_tls
diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile
index aaffb57df7..fb0e470995 100644
--- a/package/network/config/netifd/Makefile
+++ b/package/network/config/netifd/Makefile
@@ -13,8 +13,6 @@ PKG_MAINTAINER:=Felix Fietkau <nbd at nbd.name>
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=
 
-PKG_BUILD_PARALLEL:=1
-
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
diff --git a/package/network/utils/umbim/Makefile b/package/network/utils/umbim/Makefile
index 984f8354de..a0f5e4756b 100644
--- a/package/network/utils/umbim/Makefile
+++ b/package/network/utils/umbim/Makefile
@@ -13,8 +13,6 @@ PKG_MAINTAINER:=John Crispin <john at phrozen.org>
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=
 
-PKG_BUILD_PARALLEL:=1
-
 PKG_FLAGS:=nonshared
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/network/utils/uqmi/Makefile b/package/network/utils/uqmi/Makefile
index da54ba0f46..53ca67230b 100644
--- a/package/network/utils/uqmi/Makefile
+++ b/package/network/utils/uqmi/Makefile
@@ -13,8 +13,6 @@ PKG_MAINTAINER:=Matti Laakso <malaakso at elisanet.fi>
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=
 
-PKG_BUILD_PARALLEL:=1
-
 PKG_FLAGS:=nonshared
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/system/opkg/Makefile b/package/system/opkg/Makefile
index 65bdf6dba9..9f352e83c0 100644
--- a/package/system/opkg/Makefile
+++ b/package/system/opkg/Makefile
@@ -26,8 +26,6 @@ PKG_CONFIG_DEPENDS += \
 	CONFIG_SIGNATURE_CHECK \
 	CONFIG_TARGET_INIT_PATH
 
-PKG_BUILD_PARALLEL:=1
-HOST_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
 HOST_BUILD_DEPENDS:=libubox/host
diff --git a/package/system/rpcd/Makefile b/package/system/rpcd/Makefile
index 7c99267b67..e9040500b5 100644
--- a/package/system/rpcd/Makefile
+++ b/package/system/rpcd/Makefile
@@ -20,7 +20,6 @@ PKG_MIRROR_HASH:=69d9588a5a910676252eabcd2815af318806cae8316777e8b6eb00b26bdc42c
 PKG_LICENSE:=ISC
 PKG_LICENSE_FILES:=
 
-PKG_BUILD_PARALLEL:=1
 PKG_ASLR_PIE_REGULAR:=1
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/system/uci/Makefile b/package/system/uci/Makefile
index 3d9fdf7391..2036f92a7e 100644
--- a/package/system/uci/Makefile
+++ b/package/system/uci/Makefile
@@ -22,7 +22,6 @@ PKG_LICENSE_FILES:=
 
 PKG_MAINTAINER:=Felix Fietkau <nbd at nbd.name>
 
-PKG_BUILD_PARALLEL:=0
 PKG_FLAGS := nonshared
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/system/urngd/Makefile b/package/system/urngd/Makefile
index 54a1f457d2..8350f7ceb9 100644
--- a/package/system/urngd/Makefile
+++ b/package/system/urngd/Makefile
@@ -12,8 +12,6 @@ PKG_MIRROR_HASH:=2d31025b79fe130c579d6c3f4bf4dc12abc43a7319b20a5cdca24ae363ec70f
 PKG_LICENSE:=GPL-2.0 BSD-3-Clause
 PKG_LICENSE_FILES:=
 
-PKG_BUILD_PARALLEL:=1
-
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
diff --git a/tools/zstd/Makefile b/tools/zstd/Makefile
index a0106f15f2..9138ae98f2 100644
--- a/tools/zstd/Makefile
+++ b/tools/zstd/Makefile
@@ -12,7 +12,6 @@ PKG_LICENSE_FILES:=LICENSE
 PKG_CPE_ID:=cpe:/a:facebook:zstandard
 
 CMAKE_SOURCE_SUBDIR:=build/cmake
-HOST_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/cmake.mk



More information about the lede-commits mailing list