mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-10-31 14:04:26 -04:00
98e43b13a7
Switch to git repo Removed musl patch Refreshed existing patch Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com> Signed-off-by: Felix Fietkau <nbd@nbd.name> [cleanup]
78 lines
3.9 KiB
Diff
78 lines
3.9 KiB
Diff
--- a/extensions/GNUmakefile.in
|
|
+++ b/extensions/GNUmakefile.in
|
|
@@ -50,11 +50,31 @@ pfb_build_mod := $(filter-out @blacklist
|
|
pfa_build_mod := $(filter-out @blacklist_modules@ @blacklist_a_modules@,${pfa_build_mod})
|
|
pf4_build_mod := $(filter-out @blacklist_modules@ @blacklist_4_modules@,${pf4_build_mod})
|
|
pf6_build_mod := $(filter-out @blacklist_modules@ @blacklist_6_modules@,${pf6_build_mod})
|
|
-pfx_objs := $(patsubst %,libxt_%.o,${pfx_build_mod})
|
|
-pfb_objs := $(patsubst %,libebt_%.o,${pfb_build_mod})
|
|
-pfa_objs := $(patsubst %,libarpt_%.o,${pfa_build_mod})
|
|
-pf4_objs := $(patsubst %,libipt_%.o,${pf4_build_mod})
|
|
-pf6_objs := $(patsubst %,libip6t_%.o,${pf6_build_mod})
|
|
+ifdef BUILTIN_MODULES
|
|
+pfx_build_static := $(filter $(BUILTIN_MODULES),${pfx_build_mod})
|
|
+pfb_build_static := $(filter $(BUILTIN_MODULES),${pfb_build_mod})
|
|
+pfa_build_static := $(filter $(BUILTIN_MODULES),${pfa_build_mod})
|
|
+pf4_build_static := $(filter $(BUILTIN_MODULES),${pf4_build_mod})
|
|
+pf6_build_static := $(filter $(BUILTIN_MODULES),${pf6_build_mod})
|
|
+else
|
|
+@ENABLE_STATIC_TRUE@ pfx_build_static := $(pfx_build_mod)
|
|
+@ENABLE_STATIC_TRUE@ pfb_build_static := $(pfb_build_mod)
|
|
+@ENABLE_STATIC_TRUE@ pfa_build_static := $(pfa_build_mod)
|
|
+@ENABLE_STATIC_TRUE@ pf4_build_static := $(pf4_build_mod)
|
|
+@ENABLE_STATIC_TRUE@ pf6_build_static := $(pf6_build_mod)
|
|
+endif
|
|
+
|
|
+pfx_build_mod := $(filter-out $(pfx_build_static),$(pfx_build_mod))
|
|
+pfb_build_mod := $(filter-out $(pfb_build_static),$(pfb_build_mod))
|
|
+pfa_build_mod := $(filter-out $(pfa_build_static),$(pfa_build_mod))
|
|
+pf4_build_mod := $(filter-out $(pf4_build_static),$(pf4_build_mod))
|
|
+pf6_build_mod := $(filter-out $(pf6_build_static),$(pf6_build_mod))
|
|
+
|
|
+pfx_objs := $(patsubst %,libxt_%.o,${pfx_build_static})
|
|
+pfb_objs := $(patsubst %,libebt_%.o,${pfb_build_static})
|
|
+pfa_objs := $(patsubst %,libarpt_%.o,${pfa_build_static})
|
|
+pf4_objs := $(patsubst %,libipt_%.o,${pf4_build_static})
|
|
+pf6_objs := $(patsubst %,libip6t_%.o,${pf6_build_static})
|
|
pfx_solibs := $(patsubst %,libxt_%.so,${pfx_build_mod} ${pfx_symlinks})
|
|
pfb_solibs := $(patsubst %,libebt_%.so,${pfb_build_mod})
|
|
pfa_solibs := $(patsubst %,libarpt_%.so,${pfa_build_mod})
|
|
@@ -67,13 +87,13 @@ pf6_solibs := $(patsubst %,libip6t_%.
|
|
#
|
|
targets := libext.a libext4.a libext6.a libext_ebt.a libext_arpt.a matches.man targets.man
|
|
targets_install :=
|
|
-@ENABLE_STATIC_TRUE@ libext_objs := ${pfx_objs}
|
|
-@ENABLE_STATIC_TRUE@ libext_ebt_objs := ${pfb_objs}
|
|
-@ENABLE_STATIC_TRUE@ libext_arpt_objs := ${pfa_objs}
|
|
-@ENABLE_STATIC_TRUE@ libext4_objs := ${pf4_objs}
|
|
-@ENABLE_STATIC_TRUE@ libext6_objs := ${pf6_objs}
|
|
-@ENABLE_STATIC_FALSE@ targets += ${pfx_solibs} ${pfb_solibs} ${pf4_solibs} ${pf6_solibs} ${pfa_solibs}
|
|
-@ENABLE_STATIC_FALSE@ targets_install += ${pfx_solibs} ${pfb_solibs} ${pf4_solibs} ${pf6_solibs} ${pfa_solibs}
|
|
+libext_objs := ${pfx_objs}
|
|
+libext_ebt_objs := ${pfb_objs}
|
|
+libext_arpt_objs := ${pfa_objs}
|
|
+libext4_objs := ${pf4_objs}
|
|
+libext6_objs := ${pf6_objs}
|
|
+targets += ${pfx_solibs} ${pfb_solibs} ${pf4_solibs} ${pf6_solibs} ${pfa_solibs}
|
|
+targets_install := $(strip ${pfx_solibs} ${pfb_solibs} ${pf4_solibs} ${pf6_solibs} ${pfa_solibs})
|
|
|
|
.SECONDARY:
|
|
|
|
@@ -141,11 +161,11 @@ libext4.a: initext4.o ${libext4_objs}
|
|
libext6.a: initext6.o ${libext6_objs}
|
|
${AM_VERBOSE_AR} ${AR} crs $@ $^;
|
|
|
|
-initext_func := $(addprefix xt_,${pfx_build_mod})
|
|
-initextb_func := $(addprefix ebt_,${pfb_build_mod})
|
|
-initexta_func := $(addprefix arpt_,${pfa_build_mod})
|
|
-initext4_func := $(addprefix ipt_,${pf4_build_mod})
|
|
-initext6_func := $(addprefix ip6t_,${pf6_build_mod})
|
|
+initext_func := $(addprefix xt_,${pfx_build_static})
|
|
+initextb_func := $(addprefix ebt_,${pfb_build_static})
|
|
+initexta_func := $(addprefix arpt_,${pfa_build_static})
|
|
+initext4_func := $(addprefix ipt_,${pf4_build_static})
|
|
+initext6_func := $(addprefix ip6t_,${pf6_build_static})
|
|
|
|
.initext.dd: FORCE
|
|
@echo "${initext_func}" >$@.tmp; \
|