diff --git a/configure b/configure index 002b82257580b68e048abe06f4ba07204834c7dd..544df82156bdcea41df92df38ccf2d2ce7715fb3 100755 --- a/configure +++ b/configure @@ -117,7 +117,7 @@ check_packages_depend() { echo "cd $PWD" >> $SH_ABS_PATH done chmod +x $SH_ABS_PATH - exec ./$PACKAGEBUILD_TMP/$BUILD_SH + bash ./$PACKAGEBUILD_TMP/$BUILD_SH cd $PWD } diff --git a/source/tools/combine/iosdiag/latency/Makefile b/source/tools/combine/iosdiag/latency/Makefile index 7ad4403cafe09ddd5d6c102927c13a1aa4027795..8f9727e12c7586ca9038ad218679c9907bc973be 100644 --- a/source/tools/combine/iosdiag/latency/Makefile +++ b/source/tools/combine/iosdiag/latency/Makefile @@ -2,7 +2,7 @@ newdirs += . csrcs += $(filter-out $(wildcard *.bpf.c), $(wildcard *.c)) bpfsrcs += $(wildcard *.bpf.c) -CFLAGS += -static +CFLAGS += target = latency diff --git a/source/tools/detect/cgroup/cpuacct_load/Makefile b/source/tools/detect/cgroup/cpuacct_load/Makefile index 1f2ff3d4375bad7bed26fbd83abf03e1f60f5b67..a008d63c866a49951ef4433d1d0597189359983e 100644 --- a/source/tools/detect/cgroup/cpuacct_load/Makefile +++ b/source/tools/detect/cgroup/cpuacct_load/Makefile @@ -2,7 +2,7 @@ newdirs += . csrcs += $(filter-out $(wildcard *.bpf.c), $(wildcard *.c)) bpfsrcs += $(wildcard *.bpf.c) -CFLAGS += -static +CFLAGS += target = cpuacct_load diff --git a/source/tools/detect/cgroup/memcg_usage/Makefile b/source/tools/detect/cgroup/memcg_usage/Makefile index 3b8501dbf6d8e9095adb786b12c42e97d5454651..727624674d95de60e39708627b059cd0e09bdcc4 100644 --- a/source/tools/detect/cgroup/memcg_usage/Makefile +++ b/source/tools/detect/cgroup/memcg_usage/Makefile @@ -2,7 +2,7 @@ newdirs += . csrcs += $(filter-out $(wildcard *.bpf.c), $(wildcard *.c)) bpfsrcs += $(wildcard *.bpf.c) -CFLAGS += -static +CFLAGS += target = memcg_usage diff --git a/source/tools/detect/net/PingTrace/Makefile b/source/tools/detect/net/PingTrace/Makefile index 7929209c84e77005ca295bac1908feaa8e83e5cc..bbb36f90a3efd3e73a219e1e62648f603d5e0d15 100644 --- a/source/tools/detect/net/PingTrace/Makefile +++ b/source/tools/detect/net/PingTrace/Makefile @@ -1,5 +1,5 @@ LDFLAGS += -l:liblog4cpp.a -lncurses -lz -pthread -ltinfo -ldl -CFLAGS += -std=c++11 -static +CFLAGS += -std=c++11 INCLUDES += -Isrc/ -Isrc/bpf -I$(SRC)/lib/internal/ebpf/coolbpf/third/libbpf/src newdirs := $(shell find src/ -type d) @@ -8,7 +8,8 @@ bpfsrcs := $(wildcard src/bpf_prog/*.bpf.c) target := pingtrace DEP_PKG_INSTALL_1 := "wget https://sourceforge.net/projects/log4cpp/files/log4cpp-1.1.x%20%28new%29/log4cpp-1.1/log4cpp-1.1.3.tar.gz --no-check-certificate@tar -xzf log4cpp-1.1.3.tar.gz -C ./@cd log4cpp@./configure@make@make install" -DEP_PKG_INSTALL_2 := "git clone https://github.com/Tencent/rapidjson.git@cd rapidjson@git submodule update --init@mkdir build@cd build@cmake ..@make install" -DEP_PKG_INSTALL_3 := "git clone https://github.com/CLIUtils/CLI11.git@cd CLI11@git checkout 34c4310d9907f6a6c2eb5322fa7472474800577c@git submodule update --init@mkdir build@cd build@cmake ..@make install" +DEP_PKG_INSTALL_2 := "git clone https://ghproxy.com/https://github.com/Tencent/rapidjson.git@cd rapidjson@git submodule update --init@mkdir build@cd build@cmake ..@make install" +DEP_PKG_INSTALL_3 := "git clone https://ghproxy.com/https://github.com/CLIUtils/CLI11.git@cd CLI11@git checkout 34c4310d9907f6a6c2eb5322fa7472474800577c@git submodule update --init@mkdir build@cd build@cmake ..@make install" +DEP_PKG_INSTALL_4 := "wget https://fossies.org/linux/misc/ncurses-6.4.tar.gz --no-check-certificate@tar -zxf ncurses-6.4.tar.gz@cd ncurses-6.4@./configure && make -j && make install@ln -sf /usr/lib/libncurses.a /usr/lib/libtinfo.a" include $(SRC)/mk/ccbpf.mk diff --git a/source/tools/detect/pmu/hw_event/Makefile b/source/tools/detect/pmu/hw_event/Makefile index d697ca29b82b20eb4639de0a33306cceeaadfd6d..605a3296f8aa092c2f928393b888a891072553a2 100644 --- a/source/tools/detect/pmu/hw_event/Makefile +++ b/source/tools/detect/pmu/hw_event/Makefile @@ -1,4 +1,4 @@ -EXTRA_LDFLAGS += -static +EXTRA_LDFLAGS += OBJECTS = $(patsubst %.c, %.o, $(wildcard *.c)) mods:= $(OBJECTS) diff --git a/source/tools/detect/sched/offcpu/Makefile b/source/tools/detect/sched/offcpu/Makefile index c9871ad883578c6c5f8f34ec6209b0c0f3c98270..9cb63a447a22a9efd5f1b248bcf26badd06fb1a9 100644 --- a/source/tools/detect/sched/offcpu/Makefile +++ b/source/tools/detect/sched/offcpu/Makefile @@ -5,6 +5,6 @@ bpfsrcs := $(wildcard bpf/*.bpf.c) csrcs := $(wildcard *.c) target := offcputime EXTRA_LDFLAGS += -lrt -lsysak -EXTRA_CFLAGS += -static +EXTRA_CFLAGS += include $(SRC)/mk/bpf.mk