janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-25 23:13:54 +01:00
Code Activity

defs.mk, projects-dir.mk, projs-dir.mk: Fix build on CentOS

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2018-12-12 15:24:13 +00:00
commit 0c496d051e
2 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

36
make/defs.mk
View file

@ -251,25 +251,25 @@ ifeq ($(TARGET),mingw)
CROSS_TOOL_DIR ?= /opt/cross-tools CROSS_TOOL_DIR ?= /opt/cross-tools
CROSS_TOOL_BIN_PREFIX ?= $(CROSS_TOOL_DIR)/bin/i686-pc-mingw32- CROSS_TOOL_BIN_PREFIX ?= $(CROSS_TOOL_DIR)/bin/i686-pc-mingw32-
endif endif
GCC ?= $(CROSS_TOOL_BIN_PREFIX)gcc GCC ?= $(CROSS_TOOL_BIN_PREFIX)gcc
GPP ?= $(CROSS_TOOL_BIN_PREFIX)g++ GPP ?= $(CROSS_TOOL_BIN_PREFIX)g++
CLANG ?= $(CROSS_TOOL_BIN_PREFIX)clang CLANG ?= $(CROSS_TOOL_BIN_PREFIX)clang
CLANGPP ?= $(CROSS_TOOL_BIN_PREFIX)clang++ CLANGPP ?= $(CROSS_TOOL_BIN_PREFIX)clang++
STRIP ?= $(CROSS_TOOL_BIN_PREFIX)strip STRIP ?= $(CROSS_TOOL_BIN_PREFIX)strip
RANLIB ?= $(CROSS_TOOL_BIN_PREFIX)ranlib RANLIB ?= $(CROSS_TOOL_BIN_PREFIX)ranlib
AR ?= $(CROSS_TOOL_BIN_PREFIX)ar AR ?= $(CROSS_TOOL_BIN_PREFIX)ar
WINDRES ?= $(CROSS_TOOL_BIN_PREFIX)windres WINDRES ?= $(CROSS_TOOL_BIN_PREFIX)windres
BUILD_LDFLAGS += -lws2_32 BUILD_LDFLAGS += -lws2_32
USE_GFILTER ?= false USE_GFILTER ?= false
MS_LD ?= wine $(HOME)/local/mingw/packages/msvcpp/bin/LIB.EXE MS_LD ?= wine $(HOME)/local/mingw/packages/msvcpp/bin/LIB.EXE
else else
GCC ?= gcc GCC ?= gcc
GPP ?= g++ GPP ?= g++
CLANG ?= clang CLANG ?= clang
CLANGPP ?= clang++ CLANGPP ?= clang++
STRIP ?= strip STRIP ?= strip
RANLIB ?= ranlib RANLIB ?= ranlib
AR ?= ar AR ?= ar
endif endif
# makefile helpers # makefile helpers

12
make/projects-dir.mk
View file

@ -44,13 +44,13 @@ GET_OS_SH = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/get-o
SSH_WRAPPER_SH := $(CWD)/ssh-wrapper.sh SSH_WRAPPER_SH := $(CWD)/ssh-wrapper.sh
EXCLUDES_FILE ?= exclude.txt EXCLUDES_FILE ?= exclude.txt
EXCLUDES_FILES = exclude-$(shell $(GET_OS_SH) name).txt exclude-$(shell $(GET_OS_SH)).txt $(EXCLUDES_FILE) EXCLUDES_FILES = $(wildcard exclude-$(shell $(GET_OS_SH) name 2>/dev/null).txt exclude-$(shell $(GET_OS_SH) 2>/dev/null).txt $(EXCLUDES_FILE))
TEXT_FILES_CACHE ?= text-files.txt ifneq ($(EXCLUDES_FILES),)
EXCLUDE_FROM_BUILD += $(shell sed 's/\#.*//g' $(EXCLUDES_FILES))
ifneq ($(wildcard $(EXCLUDES_FILES)),)
EXCLUDE_FROM_BUILD += $(shell sed 's/\#.*//g' $(wildcard $(EXCLUDES_FILES)))
endif endif
TEXT_FILES_CACHE ?= text-files.txt
ifndef JANWARE_USER ifndef JANWARE_USER
ifneq ($(wildcard CVS/Root),) ifneq ($(wildcard CVS/Root),)
JANWARE_USER = $(shell sed '/^:ext/ !d; s/:ext:\([^@]\+\)@.*/\1/' CVS/Root) JANWARE_USER = $(shell sed '/^:ext/ !d; s/:ext:\([^@]\+\)@.*/\1/' CVS/Root)
@ -78,7 +78,7 @@ endif
export GIT_SSH := $(CVS_RSH) export GIT_SSH := $(CVS_RSH)
ifeq ($(filter pkg-%,$(MAKECMDGOALS)),) ifeq ($(filter pkg-%,$(MAKECMDGOALS)),)
export JW_BUILD_SSH_EXTRA_OPTS += -o ControlMaster=auto -o ControlPath=/tmp/%r@jw-build:%p -o ControlPersist=3m -l $(JANWARE_USER) export JW_BUILD_SSH_EXTRA_OPTS += -o ControlMaster=auto -o ControlPath=/tmp/%r@jw-build:%h:%p -o ControlPersist=3m -l $(JANWARE_USER)
endif endif
ifneq ($(CLONE_FROM_USER),) ifneq ($(CLONE_FROM_USER),)