76 lines
2.9 KiB
Diff
76 lines
2.9 KiB
Diff
diff --git a/src/Makefile b/src/Makefile
|
|
index 58eb041a33..9f5bc49238 100644
|
|
--- a/src/Makefile
|
|
+++ b/src/Makefile
|
|
@@ -39,9 +39,12 @@ endif
|
|
|
|
HAS_CHECKMODULE = $(shell command -v checkmodule > /dev/null && echo YES)
|
|
HAS_SEMODULE_PACKAGE = $(shell command -v semodule_package > /dev/null && echo YES)
|
|
-CHECK_ARCHLINUX := $(shell sh -c 'grep "Arch Linux" /etc/os-release > /dev/null && echo YES || echo not')
|
|
-CHECK_CENTOS5 := $(shell sh -c 'grep "CentOS release 5." /etc/redhat-release 2>&1 > /dev/null && echo YES || echo not')
|
|
-CHECK_ALPINE := $(shell sh -c 'grep "Alpine Linux" /etc/os-release 2>&1 > /dev/null && echo YES || echo not')
|
|
+#CHECK_ARCHLINUX := $(shell sh -c 'grep "Arch Linux" /etc/os-release > /dev/null && echo YES || echo not')
|
|
+#CHECK_CENTOS5 := $(shell sh -c 'grep "CentOS release 5." /etc/redhat-release 2>&1 > /dev/null && echo YES || echo not')
|
|
+#CHECK_ALPINE := $(shell sh -c 'grep "Alpine Linux" /etc/os-release 2>&1 > /dev/null && echo YES || echo not')
|
|
+CHECK_ARCHLINUX := not
|
|
+CHECK_CENTOS5 := not
|
|
+CHECK_ALPINE := not
|
|
|
|
ARCH_FLAGS =
|
|
|
|
@@ -391,7 +394,7 @@ ifeq (,$(filter ${V},YES yes y Y 1))
|
|
QUIET_ENDCOLOR= @printf '%b' ${ENDCOLOR} 1>&2;
|
|
endif
|
|
|
|
-MING_BASE:=
|
|
+#MING_BASE:=
|
|
ifeq (${TARGET}, winagent)
|
|
# Avoid passing environment variables such CFLAGS to external Makefiles
|
|
ifeq (${CC}, gcc)
|
|
@@ -447,8 +450,8 @@ endif #winagent
|
|
OSSEC_CC =${QUIET_CC}${MING_BASE}${CC}
|
|
OSSEC_CCBIN =${QUIET_CCBIN}${MING_BASE}${CC}
|
|
OSSEC_SHARED =${QUIET_CCBIN}${MING_BASE}${CC} -shared
|
|
-OSSEC_LINK =${QUIET_LINK}${MING_BASE}ar -crus
|
|
-OSSEC_RANLIB =${QUIET_RANLIB}${MING_BASE}ranlib
|
|
+OSSEC_LINK =${QUIET_LINK}${MING_BASE}${AR} -crus
|
|
+OSSEC_RANLIB =${QUIET_RANLIB}${MING_BASE}${RANLIB}
|
|
OSSEC_WINDRES =${QUIET_CCBIN}${MING_BASE}windres
|
|
|
|
|
|
@@ -765,7 +768,7 @@ ifeq (${MAKECMDGOALS},agent)
|
|
$(error Do not use 'agent' directly, use 'TARGET=agent')
|
|
endif
|
|
|
|
-agent: external ${CPPLIBDEPS}
|
|
+agent:
|
|
ifneq (${uname_S},HP-UX)
|
|
${MAKE} ${BUILD_CMAKE_PROJECTS}
|
|
endif
|
|
@@ -883,6 +886,7 @@ ifeq (${uname_S},Darwin)
|
|
EXTERNAL_LIBS += ${LIBPLIST_LIB}
|
|
endif
|
|
|
|
+EXTERNAL_LIBS :=
|
|
|
|
.PHONY: external test_external
|
|
external: test_external $(EXTERNAL_LIBS) $(JEMALLOC_LIB)
|
|
@@ -1334,7 +1338,7 @@ endif
|
|
####################
|
|
WAZUHEXT_LIB = libwazuhext.$(SHARED)
|
|
WAZUH_LIB = libwazuhshared.$(SHARED)
|
|
-BUILD_LIBS = libwazuh.a $(WAZUHEXT_LIB)
|
|
+BUILD_LIBS = libwazuh.a
|
|
|
|
$(BUILD_SERVER) $(BUILD_AGENT) $(WINDOWS_BINS): $(BUILD_LIBS)
|
|
|
|
@@ -1583,7 +1587,7 @@ build_sysinfo: $(WAZUHEXT_LIB)
|
|
#### Syscollector ##
|
|
ifeq (,$(filter ${DISABLE_SYSC}, YES yes y Y 1))
|
|
build_syscollector: build_shared_modules build_sysinfo
|
|
- cd ${SYSCOLLECTOR} && mkdir -p build && cd build && cmake ${CMAKE_OPTS} ${SOLARIS_CMAKE_OPTS} ${SYSCOLLECTOR_TEST} ${SYSCOLLECTOR_RELEASE_TYPE} .. && ${MAKE}
|
|
+ cd ${SYSCOLLECTOR} && mkdir -p build && cd build && cmake ${CMAKE_OPTS} ${SOLARIS_CMAKE_OPTS} ${SYSCOLLECTOR_TEST} ${SYSCOLLECTOR_RELEASE_TYPE} .. && ${MAKE} -Wno-psabi
|
|
endif
|
|
|
|
#### Wazuh modules ##
|