projects / openwrt / staging / hauke.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0a44c57)
treewide: replace PKG_USE_MIPS16:=0 with PKG_BUILD_FLAGS:=no-mips16
authorAndre Heider <a.heider@gmail.com>
Thu, 2 Feb 2023 19:02:25 +0000 (20:02 +0100)
committerChristian Marangi <ansuelsmth@gmail.com>
Tue, 21 Mar 2023 17:28:22 +0000 (18:28 +0100)
Keep backwards compatibility via PKG_USE_MIPS16 for now, as this is
used in all package feeds.

Signed-off-by: Andre Heider <a.heider@gmail.com>
19 files changed:
include/package.mk patch | blob | history
package/devel/binutils/Makefile patch | blob | history
package/devel/perf/Makefile patch | blob | history
package/devel/trace-cmd/Makefile patch | blob | history
package/devel/valgrind/Makefile patch | blob | history
package/kernel/broadcom-wl/Makefile patch | blob | history
package/libs/elfutils/Makefile patch | blob | history
package/libs/gmp/Makefile patch | blob | history
package/libs/libaudit/Makefile patch | blob | history
package/libs/mbedtls/Makefile patch | blob | history
package/libs/nettle/Makefile patch | blob | history
package/libs/openssl/Makefile patch | blob | history
package/libs/wolfssl/Makefile patch | blob | history
package/network/services/dropbear/Makefile patch | blob | history
package/network/utils/bpftools/Makefile patch | blob | history
package/system/fstools/Makefile patch | blob | history
package/system/usign/Makefile patch | blob | history
package/utils/px5g-mbedtls/Makefile patch | blob | history
package/utils/px5g-wolfssl/Makefile patch | blob | history

diff --git a/include/package.mk b/include/package.mk
index 8d14c17dbdcf35e8e2acd65f8ad8cbe6d3c8dffc..a1717a603d500a67fda46df79c88a01f9da88977 100644 (file)
--- a/include/package.mk
+++ b/include/package.mk
@@ -11,7 +11,6 @@ include $(INCLUDE_DIR)/download.mk
 PKG_BUILD_DIR ?= $(BUILD_DIR)/$(if $(BUILD_VARIANT),$(PKG_NAME)-$(BUILD_VARIANT)/)$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION))
 PKG_INSTALL_DIR ?= $(PKG_BUILD_DIR)/ipkg-install
 PKG_BUILD_PARALLEL ?=
-PKG_USE_MIPS16 ?= 1
 PKG_SKIP_DOWNLOAD=$(USE_SOURCE_DIR)$(USE_GIT_TREE)$(USE_GIT_SRC_CHECKOUT)
 
 MAKE_J:=$(if $(MAKE_JOBSERVER),$(MAKE_JOBSERVER) $(if $(filter 3.% 4.0 4.1,$(MAKE_VERSION)),-j))
@@ -23,16 +22,15 @@ PKG_JOBS?=-j1
 else
 PKG_JOBS?=$(if $(PKG_BUILD_PARALLEL),$(MAKE_J),-j1)
 endif
-ifdef CONFIG_USE_MIPS16
-  ifeq ($(strip $(PKG_USE_MIPS16)),1)
-    TARGET_ASFLAGS_DEFAULT = $(filter-out -mips16 -minterlink-mips16,$(TARGET_CFLAGS))
-    TARGET_CFLAGS += -mips16 -minterlink-mips16
-  endif
-endif
 
 PKG_BUILD_FLAGS?=
+# TODO remove this when all packages moved to PKG_BUILD_FLAGS=no-mips16
+PKG_USE_MIPS16?=1
+ifneq ($(strip $(PKG_USE_MIPS16)),1)
+  PKG_BUILD_FLAGS+=no-mips16
+endif
 
-__unknown_flags=$(filter-out no-iremap,$(PKG_BUILD_FLAGS))
+__unknown_flags=$(filter-out no-iremap no-mips16,$(PKG_BUILD_FLAGS))
 ifneq ($(__unknown_flags),)
   $(error unknown PKG_BUILD_FLAGS: $(__unknown_flags))
 endif
@@ -46,6 +44,13 @@ ifeq ($(call pkg_build_flag,iremap,1),1)
   IREMAP_CFLAGS = $(call iremap,$(PKG_BUILD_DIR),$(notdir $(PKG_BUILD_DIR)))
   TARGET_CFLAGS += $(IREMAP_CFLAGS)
 endif
+ifdef CONFIG_USE_MIPS16
+  ifeq ($(call pkg_build_flag,mips16,1),1)
+    TARGET_ASFLAGS_DEFAULT = $(filter-out -mips16 -minterlink-mips16,$(TARGET_CFLAGS))
+    TARGET_CFLAGS += -mips16 -minterlink-mips16
+    TARGET_CXXFLAGS += -mips16 -minterlink-mips16
+  endif
+endif
 
 include $(INCLUDE_DIR)/hardening.mk
 include $(INCLUDE_DIR)/prereq.mk
diff --git a/package/devel/binutils/Makefile b/package/devel/binutils/Makefile
index 5166f267347f73bfdb6a77404837884298483441..8547190e99b14d67b14e241460c40e66d9860510 100644 (file)
--- a/package/devel/binutils/Makefile
+++ b/package/devel/binutils/Makefile
@@ -25,7 +25,7 @@ PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=GPL-3.0+
 PKG_CPE_ID:=cpe:/a:gnu:binutils
 PKG_BUILD_PARALLEL:=1
-PKG_USE_MIPS16:=0
+PKG_BUILD_FLAGS:=no-mips16
 
 include $(INCLUDE_DIR)/nls.mk
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/devel/perf/Makefile b/package/devel/perf/Makefile
index d556e2d9f0200aa674efa4f2115dbb15d572e9a3..c0b2046bd6036526f4fe7f68e1f49b4e447199ea 100644 (file)
--- a/package/devel/perf/Makefile
+++ b/package/devel/perf/Makefile
@@ -12,7 +12,7 @@ PKG_NAME:=perf
 PKG_VERSION:=$(LINUX_VERSION)
 PKG_RELEASE:=4
 
-PKG_USE_MIPS16:=0
+PKG_BUILD_FLAGS:=no-mips16
 PKG_BUILD_PARALLEL:=1
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_FLAGS:=nonshared
diff --git a/package/devel/trace-cmd/Makefile b/package/devel/trace-cmd/Makefile
index eac281820f7ed3caddd78817c24bce9acc9d242d..687907acaa0b6e1a198b3bebb7e12624ca4de61c 100644 (file)
--- a/package/devel/trace-cmd/Makefile
+++ b/package/devel/trace-cmd/Makefile
@@ -12,7 +12,7 @@ PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=COPYING
 
 PKG_INSTALL:=1
-PKG_USE_MIPS16:=0
+PKG_BUILD_FLAGS:=no-mips16
 PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/devel/valgrind/Makefile b/package/devel/valgrind/Makefile
index bbd01ce37d3f6bb7c6e161f656c82d4b560905a1..372a720d017d5dd2b980a86285e5f2f62559cc40 100644 (file)
--- a/package/devel/valgrind/Makefile
+++ b/package/devel/valgrind/Makefile
@@ -22,7 +22,7 @@ PKG_CPE_ID:=cpe:/a:valgrind:valgrind
 PKG_FIXUP = autoreconf
 PKG_INSTALL := 1
 PKG_BUILD_PARALLEL := 1
-PKG_USE_MIPS16:=0
+PKG_BUILD_FLAGS:=no-mips16
 PKG_SSP:=0
 
 STRIP:=:
diff --git a/package/kernel/broadcom-wl/Makefile b/package/kernel/broadcom-wl/Makefile
index 137e547bee7844f8ba7cdeed30964c5bd8f5b25a..fe8045d4a9a500c1cbd784c6bea0ba95179c00c6 100644 (file)
--- a/package/kernel/broadcom-wl/Makefile
+++ b/package/kernel/broadcom-wl/Makefile
@@ -24,7 +24,7 @@ endif
 
 PKG_EXTMOD_SUBDIRS:=driver driver-mini glue
 
-PKG_USE_MIPS16:=0
+PKG_BUILD_FLAGS:=no-mips16
 PKG_FLAGS:=nonshared
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/libs/elfutils/Makefile b/package/libs/elfutils/Makefile
index 2c68a94ba03c3e5ec3004023be526caae0c10539..f7364c36be20798053a6efec58a273002569089c 100644 (file)
--- a/package/libs/elfutils/Makefile
+++ b/package/libs/elfutils/Makefile
@@ -21,7 +21,6 @@ PKG_CPE_ID:=cpe:/a:elfutils_project:elfutils
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
-PKG_USE_MIPS16:=1
 PKG_BUILD_DEPENDS:=!USE_GLIBC:argp-standalone
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/libs/gmp/Makefile b/package/libs/gmp/Makefile
index eb7d808139f9279fab62a390d59a3e7028e449cc..c9f886e7648d888b21b210a8ef52c415f6f39c9e 100644 (file)
--- a/package/libs/gmp/Makefile
+++ b/package/libs/gmp/Makefile
@@ -20,7 +20,7 @@ PKG_INSTALL:=1
 PKG_FIXUP:=autoreconf
 PKG_LICENSE:=GPL-2.0-or-later
 
-PKG_USE_MIPS16:=0
+PKG_BUILD_FLAGS:=no-mips16
 
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/libs/libaudit/Makefile b/package/libs/libaudit/Makefile
index 13263c7deb0f6b554a8c264a9dad1226fac234a6..0d79c253657cf8c1c03558d822e0f4257eb978f0 100644 (file)
--- a/package/libs/libaudit/Makefile
+++ b/package/libs/libaudit/Makefile
@@ -22,7 +22,7 @@ PKG_CPE_ID:=cpe:/a:linux_audit_project:linux_audit
 
 PKG_FIXUP:=autoreconf
 
-PKG_USE_MIPS16:=0
+PKG_BUILD_FLAGS:=no-mips16
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/libs/mbedtls/Makefile b/package/libs/mbedtls/Makefile
index 02d076d18fa98a8e5c87dd32f9eaf11a1d70b555..7c167e2296d2a705290ba07a560d01017845ebb9 100644 (file)
--- a/package/libs/mbedtls/Makefile
+++ b/package/libs/mbedtls/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=mbedtls
 PKG_VERSION:=2.28.2
 PKG_RELEASE:=2
-PKG_USE_MIPS16:=0
+PKG_BUILD_FLAGS:=no-mips16
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/ARMmbed/mbedtls/tar.gz/v$(PKG_VERSION)?
diff --git a/package/libs/nettle/Makefile b/package/libs/nettle/Makefile
index 8825da4be7ffee5cc0b6bfd1788db44d66538375..87eff5a1ecfc51a2f7eb4929e5cf51488a07dd7f 100644 (file)
--- a/package/libs/nettle/Makefile
+++ b/package/libs/nettle/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=nettle
 PKG_VERSION:=3.8.1
 PKG_RELEASE:=$(AUTORELEASE)
-PKG_USE_MIPS16:=0
+PKG_BUILD_FLAGS:=no-mips16
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/nettle
diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile
index 57ff056e9023a259c40549bd1786cf3b425aa83c..7918d40347b929174ef8e5271e890785f3080640 100644 (file)
--- a/package/libs/openssl/Makefile
+++ b/package/libs/openssl/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=openssl
 PKG_VERSION:=3.0.8
 PKG_RELEASE:=4
-PKG_USE_MIPS16:=0
+PKG_BUILD_FLAGS:=no-mips16
 
 PKG_BUILD_PARALLEL:=1
 
diff --git a/package/libs/wolfssl/Makefile b/package/libs/wolfssl/Makefile
index 6ad44a9acf135336df9d992d61a95d51a2310bee..48e85b0bce8b256989fcf656d412ce61eb1ab72f 100644 (file)
--- a/package/libs/wolfssl/Makefile
+++ b/package/libs/wolfssl/Makefile
@@ -17,7 +17,7 @@ PKG_HASH:=b7ee150e49def77c765bc02aac92ddeb0bebefd4cb12aa263d8f95e405221fb8
 
 PKG_FIXUP:=libtool libtool-abiver
 PKG_INSTALL:=1
-PKG_USE_MIPS16:=0
+PKG_BUILD_FLAGS:=no-mips16
 PKG_BUILD_PARALLEL:=1
 PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=LICENSING COPYING
diff --git a/package/network/services/dropbear/Makefile b/package/network/services/dropbear/Makefile
index eaf14c5533258165e322da5e124f1c5a31469bdf..ddd19bfa553eba5b7c54d3901989c24c8082d71b 100644 (file)
--- a/package/network/services/dropbear/Makefile
+++ b/package/network/services/dropbear/Makefile
@@ -23,7 +23,7 @@ PKG_CPE_ID:=cpe:/a:matt_johnston:dropbear_ssh_server
 
 PKG_BUILD_PARALLEL:=1
 PKG_ASLR_PIE_REGULAR:=1
-PKG_USE_MIPS16:=0
+PKG_BUILD_FLAGS:=no-mips16
 PKG_FIXUP:=autoreconf
 PKG_FLAGS:=nonshared
 
diff --git a/package/network/utils/bpftools/Makefile b/package/network/utils/bpftools/Makefile
index a1ae22b93f5c3a23186434231c841c68a35a5b72..047d2a0967e7af927052b2c4416ebed63002a5d4 100644 (file)
--- a/package/network/utils/bpftools/Makefile
+++ b/package/network/utils/bpftools/Makefile
@@ -19,7 +19,7 @@ PKG_ABI_VERSION:=$(call abi_version_str,$(PKG_SOURCE_DATE))
 
 PKG_MAINTAINER:=Tony Ambardar <itugrok@yahoo.com>
 
-PKG_USE_MIPS16:=0
+PKG_BUILD_FLAGS:=no-mips16
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
diff --git a/package/system/fstools/Makefile b/package/system/fstools/Makefile
index 912ed80ba2cc0fac7e2348b8fe9d063c76bd7551..379f5d8c9da3ccf7974cb3ec8dfeb19cacdf4bc0 100644 (file)
--- a/package/system/fstools/Makefile
+++ b/package/system/fstools/Makefile
@@ -20,7 +20,7 @@ CMAKE_INSTALL:=1
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=
 
-PKG_USE_MIPS16:=0
+PKG_BUILD_FLAGS:=no-mips16
 PKG_FLAGS:=nonshared
 
 PKG_BUILD_DEPENDS := util-linux
diff --git a/package/system/usign/Makefile b/package/system/usign/Makefile
index 5267ce15f36630ac73b40a286f4c8f1bc56583fb..0d2d07017cd445c11dac62b3bb1cfff3b6c5b078 100644 (file)
--- a/package/system/usign/Makefile
+++ b/package/system/usign/Makefile
@@ -10,7 +10,7 @@ PKG_SOURCE_VERSION:=f1f65026a94137c91b5466b149ef3ea3f20091e9
 PKG_MIRROR_HASH:=3f6569a5e63fdfd032976ac0f79d736d3935101ac1b97fb370514b013c5e6bb6
 CMAKE_INSTALL:=1
 PKG_CHECK_FORMAT_SECURITY:=1
-PKG_USE_MIPS16:=0
+PKG_BUILD_FLAGS:=no-mips16
 
 PKG_LICENSE:=ISC
 PKG_LICENSE_FILES:=
diff --git a/package/utils/px5g-mbedtls/Makefile b/package/utils/px5g-mbedtls/Makefile
index 42ffd39ce327eb70a9e7e935dd4768d752a48b4b..6de5e55d0666c0a34ab299a3f5338e9fb56553e3 100644 (file)
--- a/package/utils/px5g-mbedtls/Makefile
+++ b/package/utils/px5g-mbedtls/Makefile
@@ -11,7 +11,7 @@ PKG_NAME:=px5g-mbedtls
 PKG_RELEASE:=9
 PKG_LICENSE:=LGPL-2.1
 
-PKG_USE_MIPS16:=0
+PKG_BUILD_FLAGS:=no-mips16
 
 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
 
diff --git a/package/utils/px5g-wolfssl/Makefile b/package/utils/px5g-wolfssl/Makefile
index 687a999ca77d35433f8f9dad76871129327f273b..be2d4af30c549298ae96155c5426527362546b0f 100644 (file)
--- a/package/utils/px5g-wolfssl/Makefile
+++ b/package/utils/px5g-wolfssl/Makefile
@@ -8,7 +8,7 @@ PKG_NAME:=px5g-wolfssl
 PKG_RELEASE:=$(COMMITCOUNT).2
 PKG_LICENSE:=GPL-2.0-or-later
 
-PKG_USE_MIPS16:=0
+PKG_BUILD_FLAGS:=no-mips16
 
 PKG_MAINTAINER:=Paul Spooren <mail@aparcar.org>
 
Hauke Mehrtens staging tree