janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-27 15:33:55 +01:00
Code Activity

defs.mk: Add FLAVOUR_PATH_PREFIX to rpm-installed project paths

Browse source
This commit is contained in:
Jan Lindemann 2007-08-31 11:12:46 +00:00 • committed by Jan Lindemann
commit 92113d289c
1 changed files with 27 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

48
make/defs.mk
View file

@ -388,6 +388,10 @@ define cvs_files
done done
endef endef
define add_flavour_prefix
sed "s/\([^ ][^ ]*\) *\([<>=]*\) *\([^ ]*\)/$(FLAVOUR_PREFIX)\1 \2 \3/g"
endef
#$(shell cat $1/VERSION | sed 's/-dev//; s/-[^-]*$$//') #$(shell cat $1/VERSION | sed 's/-dev//; s/-[^-]*$$//')
define cat_version define cat_version
$(shell cat $1/VERSION | sed 's/-dev//') $(shell cat $1/VERSION | sed 's/-dev//')
@ -540,7 +544,7 @@ LIBFLAGS += $(LOCAL_LDFLAGS) -L$(BUILD_LIBDIR)
# -- use of supplementary libraries # -- use of supplementary libraries
ifeq ($(USE_USERVER),true) ifeq ($(USE_USERVER),true)
USERVER_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/userver /opt/userver)) USERVER_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/userver /opt/$(FLAVOUR_PATH_PREFIX)userver))
USERVER_VERSION = $(call cat_version,$(USERVER_DIR)) USERVER_VERSION = $(call cat_version,$(USERVER_DIR))
RPM_REQUIRES_RUN += userver-run >= $(USERVER_VERSION) RPM_REQUIRES_RUN += userver-run >= $(USERVER_VERSION)
RPM_REQUIRES_DEVEL += userver-devel >= $(USERVER_VERSION) RPM_REQUIRES_DEVEL += userver-devel >= $(USERVER_VERSION)
@ -551,7 +555,7 @@ LIBFLAGS += -L$(USERVER_DIR)/lib -luserver
endif endif
ifeq ($(USE_XCHANGE),true) ifeq ($(USE_XCHANGE),true)
XCHANGE_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/xchange /opt/xchange)) XCHANGE_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/xchange /opt/$(FLAVOUR_PATH_PREFIX)xchange))
XCHANGE_VERSION = $(call cat_version,$(XCHANGE_DIR)) XCHANGE_VERSION = $(call cat_version,$(XCHANGE_DIR))
RPM_REQUIRES_RUN += xchange-run >= $(XCHANGE_VERSION) RPM_REQUIRES_RUN += xchange-run >= $(XCHANGE_VERSION)
RPM_REQUIRES_DEVEL += xchange-devel >= $(XCHANGE_VERSION) RPM_REQUIRES_DEVEL += xchange-devel >= $(XCHANGE_VERSION)
@ -561,7 +565,7 @@ LIBFLAGS += -L$(XCHANGE_DIR)/lib -lxchange
endif endif
ifeq ($(USE_FEEDFS_UTILS),true) ifeq ($(USE_FEEDFS_UTILS),true)
FEEDFS_UTILS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-utils /opt/feedfs-utils)) FEEDFS_UTILS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-utils /opt/$(FLAVOUR_PATH_PREFIX)feedfs-utils))
FEEDFS_UTILS_VERSION = $(call cat_version,$(FEEDFS_UTILS_DIR)) FEEDFS_UTILS_VERSION = $(call cat_version,$(FEEDFS_UTILS_DIR))
RPM_REQUIRES_RUN += feedfs-utils-run >= $(FEEDFS_UTILS_VERSION) RPM_REQUIRES_RUN += feedfs-utils-run >= $(FEEDFS_UTILS_VERSION)
RPM_REQUIRES_DEVEL += feedfs-utils-devel >= $(FEEDFS_UTILS_VERSION) RPM_REQUIRES_DEVEL += feedfs-utils-devel >= $(FEEDFS_UTILS_VERSION)
@ -572,7 +576,7 @@ LIBFLAGS += -L$(FEEDFS_UTILS_DIR)/lib -lfeedfs-utils
endif endif
ifeq ($(USE_FEEDFS),true) ifeq ($(USE_FEEDFS),true)
FEEDFS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/feedfs /opt/feedfs)) FEEDFS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/feedfs /opt/$(FLAVOUR_PATH_PREFIX)feedfs))
FEEDFS_VERSION = $(call cat_version,$(FEEDFS_DIR)) FEEDFS_VERSION = $(call cat_version,$(FEEDFS_DIR))
RPM_REQUIRES_RUN += feedfs-run >= $(FEEDFS_VERSION) RPM_REQUIRES_RUN += feedfs-run >= $(FEEDFS_VERSION)
RPM_REQUIRES_DEVEL += feedfs-devel >= $(FEEDFS_VERSION) RPM_REQUIRES_DEVEL += feedfs-devel >= $(FEEDFS_VERSION)
@ -583,8 +587,8 @@ LIBFLAGS += -L$(FEEDFS_DIR)/lib -lfeedfs
endif endif
ifeq ($(USE_DSPCD),true) ifeq ($(USE_DSPCD),true)
DSPCD_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/dspcd /opt/dspider/dspcd)) DSPCD_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/dspcd /opt/$(FLAVOUR_PATH_PREFIX)dspider/dspcd))
DSPCD_EXE_PREFIX = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/dspcd /opt/dspider)) DSPCD_EXE_PREFIX = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/dspcd /opt/$(FLAVOUR_PATH_PREFIX)dspider))
include $(DSPCD_DIR)/make/public.mk include $(DSPCD_DIR)/make/public.mk
DSPIDER_DSPCD_VERSION = $(call cat_version,$(DSPCD_DIR)) DSPIDER_DSPCD_VERSION = $(call cat_version,$(DSPCD_DIR))
RPM_REQUIRES_RUN += dspider-dspcd-run >= $(DSPIDER_DSPCD_VERSION) RPM_REQUIRES_RUN += dspider-dspcd-run >= $(DSPIDER_DSPCD_VERSION)
@ -598,8 +602,8 @@ LIBFLAGS += -L$(DSPCD_EXE_PREFIX)/lib -ldspcd
endif endif
ifeq ($(USE_DSPROUT),true) ifeq ($(USE_DSPROUT),true)
DSPROUT_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/dsprout /opt/dspider/dsprout)) DSPROUT_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/dsprout /opt/dspider/$(FLAVOUR_PATH_PREFIX)dsprout))
DSPROUT_EXE_PREFIX = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/dsprout /opt/dspider)) DSPROUT_EXE_PREFIX = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/dsprout /opt/$(FLAVOUR_PATH_PREFIX)dspider))
DSPROUT_VERSION = $(call cat_version,$(DSPROUT_DIR)) DSPROUT_VERSION = $(call cat_version,$(DSPROUT_DIR))
RPM_REQUIRES_RUN += dsprout-run >= $(DSPROUT_VERSION) RPM_REQUIRES_RUN += dsprout-run >= $(DSPROUT_VERSION)
RPM_REQUIRES_DEVEL += dsprout-devel >= $(DSPROUT_VERSION) RPM_REQUIRES_DEVEL += dsprout-devel >= $(DSPROUT_VERSION)
@ -612,8 +616,8 @@ LIBFLAGS += -L$(DSPROUT_EXE_PREFIX)/lib -ldsprout
endif endif
ifeq ($(USE_DSPIDER_SHARED),true) ifeq ($(USE_DSPIDER_SHARED),true)
DSPIDER_SHARED_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/shared /opt/dspider/shared)) DSPIDER_SHARED_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/shared /opt/$(FLAVOUR_PATH_PREFIX)dspider/shared))
DSPIDER_SHARED_EXE_PREFIX = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/shared /opt/dspider)) DSPIDER_SHARED_EXE_PREFIX = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/shared /opt/$(FLAVOUR_PATH_PREFIX)dspider))
include $(DSPIDER_SHARED_DIR)/make/public.mk include $(DSPIDER_SHARED_DIR)/make/public.mk
DSPIDER_SHARED_VERSION = $(call cat_version,$(DSPIDER_SHARED_DIR)) DSPIDER_SHARED_VERSION = $(call cat_version,$(DSPIDER_SHARED_DIR))
RPM_REQUIRES_RUN += dspider-shared-run >= $(DSPIDER_SHARED_VERSION) RPM_REQUIRES_RUN += dspider-shared-run >= $(DSPIDER_SHARED_VERSION)
@ -624,7 +628,7 @@ LIBFLAGS += -L$(DSPIDER_SHARED_EXE_PREFIX)/lib -ldspider-shared
endif endif
ifeq ($(USE_BTOOLS),true) ifeq ($(USE_BTOOLS),true)
BTOOLS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/btools /opt/btools)) BTOOLS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/btools /opt/$(FLAVOUR_PATH_PREFIX)btools))
BTOOLS_VERSION = $(call cat_version,$(BTOOLS_DIR)) BTOOLS_VERSION = $(call cat_version,$(BTOOLS_DIR))
RPM_REQUIRES_RUN += dspider-btools-run >= $(BTOOLS_VERSION) RPM_REQUIRES_RUN += dspider-btools-run >= $(BTOOLS_VERSION)
RPM_REQUIRES_DEVEL += dspider-btools-devel >= $(BTOOLS_VERSION) RPM_REQUIRES_DEVEL += dspider-btools-devel >= $(BTOOLS_VERSION)
@ -634,7 +638,7 @@ LIBFLAGS += -L$(BTOOLS_DIR)/lib -ldspider-btools
endif endif
ifeq ($(USE_CCONSOLE),true) ifeq ($(USE_CCONSOLE),true)
CCONSOLE_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/cconsole /opt/dspider/cconsole)) CCONSOLE_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/cconsole /opt/dspider/$(FLAVOUR_PATH_PREFIX)cconsole))
#CCONSOLE_VERSION = $(call cat_version,$(CCONSOLE_DIR)) #CCONSOLE_VERSION = $(call cat_version,$(CCONSOLE_DIR))
#RPM_REQUIRES_RUN += cconsole-run >= $(CCONSOLE_VERSION) #RPM_REQUIRES_RUN += cconsole-run >= $(CCONSOLE_VERSION)
#RPM_REQUIRES_DEVEL += cconsole-devel >= $(CCONSOLE_VERSION) #RPM_REQUIRES_DEVEL += cconsole-devel >= $(CCONSOLE_VERSION)
@ -644,7 +648,7 @@ INCLUDE += -I$(CCONSOLE_DIR)/include
endif endif
ifeq ($(USE_JACKJART),true) ifeq ($(USE_JACKJART),true)
JACKJART_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/io/jackjart /opt/dspider/jackjart)) JACKJART_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/io/jackjart /opt/$(FLAVOUR_PATH_PREFIX)dspider/jackjart))
JACKJART_VERSION = $(call cat_version,$(JACKJART_DIR)) JACKJART_VERSION = $(call cat_version,$(JACKJART_DIR))
RPM_REQUIRES_RUN += jackjart-run >= $(JACKJART_VERSION) RPM_REQUIRES_RUN += jackjart-run >= $(JACKJART_VERSION)
RPM_REQUIRES_DEVEL += jackjart-devel >= $(JACKJART_VERSION) RPM_REQUIRES_DEVEL += jackjart-devel >= $(JACKJART_VERSION)
@ -654,7 +658,7 @@ LIBFLAGS += -L$(JACKJART_DIR)/lib -ldspider-jackjart
endif endif
ifeq ($(USE_JACKRTAI),true) ifeq ($(USE_JACKRTAI),true)
JACKRTAI_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/io/jackrtai /opt/dspider/jackrtai)) JACKRTAI_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/io/jackrtai /opt/$(FLAVOUR_PATH_PREFIX)dspider/jackrtai))
JACKRTAI_VERSION = $(call cat_version,$(JACKRTAI_DIR)) JACKRTAI_VERSION = $(call cat_version,$(JACKRTAI_DIR))
RPM_REQUIRES_RUN += jackrtai-run >= $(JACKRTAI_VERSION) RPM_REQUIRES_RUN += jackrtai-run >= $(JACKRTAI_VERSION)
RPM_REQUIRES_DEVEL += jackrtai-devel >= $(JACKRTAI_VERSION) RPM_REQUIRES_DEVEL += jackrtai-devel >= $(JACKRTAI_VERSION)
@ -664,7 +668,7 @@ LIBFLAGS += -L$(JACKRTAI_DIR)/lib -ldspider-jackrtai
endif endif
ifeq ($(USE_JACKDUMMY),true) ifeq ($(USE_JACKDUMMY),true)
JACKDUMMY_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/io/jackdummy /opt/dspider/jackdummy)) JACKDUMMY_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/io/jackdummy /opt/$(FLAVOUR_PATH_PREFIX)dspider/jackdummy))
JACKDUMMY_VERSION = $(call cat_version,$(JACKDUMMY_DIR)) JACKDUMMY_VERSION = $(call cat_version,$(JACKDUMMY_DIR))
RPM_REQUIRES_RUN += jackdummy-run >= $(JACKDUMMY_VERSION) RPM_REQUIRES_RUN += jackdummy-run >= $(JACKDUMMY_VERSION)
RPM_REQUIRES_DEVEL += jackdummy-devel >= $(JACKDUMMY_VERSION) RPM_REQUIRES_DEVEL += jackdummy-devel >= $(JACKDUMMY_VERSION)
@ -674,7 +678,7 @@ LIBFLAGS += -L$(JACKDUMMY_DIR)/lib -ldspider-jackdummy
endif endif
ifeq ($(USE_ALSART),true) ifeq ($(USE_ALSART),true)
ALSART_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/io/alsart /opt/dspider/alsart)) ALSART_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/io/alsart /opt/$(FLAVOUR_PATH_PREFIX)dspider/alsart))
ALSART_VERSION = $(call cat_version,$(ALSART_DIR)) ALSART_VERSION = $(call cat_version,$(ALSART_DIR))
RPM_REQUIRES_RUN += alsart-run >= $(ALSART_VERSION) RPM_REQUIRES_RUN += alsart-run >= $(ALSART_VERSION)
RPM_REQUIRES_DEVEL += alsart-devel >= $(ALSART_VERSION) RPM_REQUIRES_DEVEL += alsart-devel >= $(ALSART_VERSION)
@ -684,7 +688,7 @@ LIBFLAGS += -L$(ALSART_DIR)/lib -lalsart
endif endif
ifeq ($(USE_DSPFS),true) ifeq ($(USE_DSPFS),true)
DSPFS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspfs /opt/dspfs)) DSPFS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspfs /opt/$(FLAVOUR_PATH_PREFIX)dspfs))
DSPFS_VERSION = $(call cat_version,$(DSPFS_DIR)) DSPFS_VERSION = $(call cat_version,$(DSPFS_DIR))
RPM_REQUIRES_RUN += dspfs-run >= $(DSPFS_VERSION) RPM_REQUIRES_RUN += dspfs-run >= $(DSPFS_VERSION)
RPM_REQUIRES_DEVEL += dspfs-devel >= $(DSPFS_VERSION) RPM_REQUIRES_DEVEL += dspfs-devel >= $(DSPFS_VERSION)
@ -694,7 +698,11 @@ LIBFLAGS += -L$(DSPFS_DIR)/lib -ldspfs
endif endif
ifeq ($(USE_YTOOLS),true) ifeq ($(USE_YTOOLS),true)
YTOOLS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/ytools /opt/ytools)) ifneq ($(PROJECT),ytools)
YTOOLS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/ytools /opt/$(FLAVOUR_PATH_PREFIX)ytools))
else
YTOOLS_DIR = $(TOPDIR)
endif
YTOOLS_VERSION = $(call cat_version,$(YTOOLS_DIR)) YTOOLS_VERSION = $(call cat_version,$(YTOOLS_DIR))
ifneq ($(PROJECT),ytools) ifneq ($(PROJECT),ytools)
RPM_REQUIRES_RUN += ytools-run >= $(YTOOLS_VERSION) RPM_REQUIRES_RUN += ytools-run >= $(YTOOLS_VERSION)
@ -743,8 +751,6 @@ endif
CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(INCLUDE) CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(INCLUDE)
CPPFLAGS += $(LOCAL_CPPFLAGS) $(PROJECT_CPPFLAGS) $(INCLUDE) CPPFLAGS += $(LOCAL_CPPFLAGS) $(PROJECT_CPPFLAGS) $(INCLUDE)
LDFLAGS += $(LOCAL_LDFLAGS) $(PROJECTLIB_LDFLAGS) $(PROJECT_LDFLAGS) $(LPPFLAGS) $(LIBFLAGS) LDFLAGS += $(LOCAL_LDFLAGS) $(PROJECTLIB_LDFLAGS) $(PROJECT_LDFLAGS) $(LPPFLAGS) $(LIBFLAGS)
RPM_REQUIRES = $(shell echo "$(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL)" | \ RPM_REQUIRES = $(shell echo "$(RPM_REQUIRES_RUN) $(RPM_REQUIRES_DEVEL)" | $(add_flavour_prefix))
sed "s/\([^ ][^ ]*\) *\([<>=]*\) *\([^ ]*\)/$(FLAVOUR_PREFIX)\1 \2 \3/g" | \
sed "s/$(FLAVOUR_PREFIX)$(FLAVOUR_PREFIX)/$(FLAVOUR_PREFIX)/g")
NEW_LD_LIB_PATH = $(shell echo $(LDFLAGS) | sed 's/[ ]-[^L] *[^ ]*/ /g; s/-L[ ]*\([^ ]*\)[ ]*/\1:/g') NEW_LD_LIB_PATH = $(shell echo $(LDFLAGS) | sed 's/[ ]-[^L] *[^ ]*/ /g; s/-L[ ]*\([^ ]*\)[ ]*/\1:/g')