mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-15 12:03:31 +01:00
defs.mk: Cut build number from version for dep checks
Rename cat_version macro to version, and remove build number to avoid unnecessary rebuild of depending, but binary compatible rpms.
This commit is contained in:
Jan Lindemann
parent
f49d632a3a
commit
3b7dc686da
1 changed files with 24 additions and 20 deletions
44
make/defs.mk
44
make/defs.mk
|
|
@ -424,6 +424,10 @@ define cat_version
|
|||
$(shell cat $1/VERSION | sed 's/-dev//')
|
||||
endef
|
||||
|
||||
define version
|
||||
$(shell cat $1/VERSION | sed 's/-.*//')
|
||||
endef
|
||||
|
||||
# ----- local.mk
|
||||
|
||||
ifneq ($(wildcard $(MODDIR)/make/local.mk),)
|
||||
|
|
@ -577,7 +581,7 @@ LIBFLAGS += $(LOCAL_LDFLAGS) -L$(BUILD_LIBDIR)
|
|||
|
||||
ifeq ($(USE_CCASFS),true)
|
||||
CCASFS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/ccasfs /opt/$(FLAVOUR_PATH_PREFIX)dspider/ccasfs))
|
||||
CCASFS_VERSION = $(call cat_version,$(CCASFS_DIR))
|
||||
CCASFS_VERSION = $(call version,$(CCASFS_DIR))
|
||||
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-ccasfs-run = $(CCASFS_VERSION)
|
||||
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-ccasfs-devel = $(CCASFS_VERSION)
|
||||
USE_YTOOLS = true
|
||||
|
|
@ -587,7 +591,7 @@ endif
|
|||
|
||||
ifeq ($(USE_CCONSOLE),true)
|
||||
CCONSOLE_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/cconsole /opt/$(FLAVOUR_PATH_PREFIX)dspider/cconsole))
|
||||
CCONSOLE_VERSION = $(call cat_version,$(CCONSOLE_DIR))
|
||||
CCONSOLE_VERSION = $(call version,$(CCONSOLE_DIR))
|
||||
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-cconsole-run = $(CCONSOLE_VERSION)
|
||||
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-cconsole-devel = $(CCONSOLE_VERSION)
|
||||
USE_YTOOLS = true
|
||||
|
|
@ -599,7 +603,7 @@ ifeq ($(USE_DSPCD),true)
|
|||
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/$(FLAVOUR_PATH_PREFIX)dspider))
|
||||
# include $(DSPCD_DIR)/make/public.mk
|
||||
DSPIDER_DSPCD_VERSION = $(call cat_version,$(DSPCD_DIR))
|
||||
DSPIDER_DSPCD_VERSION = $(call version,$(DSPCD_DIR))
|
||||
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-dspcd-run = $(DSPIDER_DSPCD_VERSION)
|
||||
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-dspcd-devel = $(DSPIDER_DSPCD_VERSION)
|
||||
USE_YTOOLS = true
|
||||
|
|
@ -613,7 +617,7 @@ endif
|
|||
ifeq ($(USE_DSPROUT),true)
|
||||
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/$(FLAVOUR_PATH_PREFIX)dspider))
|
||||
DSPROUT_VERSION = $(call cat_version,$(DSPROUT_DIR))
|
||||
DSPROUT_VERSION = $(call version,$(DSPROUT_DIR))
|
||||
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dsprout-run = $(DSPROUT_VERSION)
|
||||
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dsprout-devel = $(DSPROUT_VERSION)
|
||||
USE_YTOOLS = true
|
||||
|
|
@ -628,7 +632,7 @@ ifeq ($(USE_DSPIDER_SHARED),true)
|
|||
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/$(FLAVOUR_PATH_PREFIX)dspider))
|
||||
#include $(DSPIDER_SHARED_DIR)/make/public.mk
|
||||
DSPIDER_SHARED_VERSION = $(call cat_version,$(DSPIDER_SHARED_DIR))
|
||||
DSPIDER_SHARED_VERSION = $(call version,$(DSPIDER_SHARED_DIR))
|
||||
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-shared-run = $(DSPIDER_SHARED_VERSION)
|
||||
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-shared-devel = $(DSPIDER_SHARED_VERSION)
|
||||
USE_YTOOLS = true
|
||||
|
|
@ -638,7 +642,7 @@ endif
|
|||
|
||||
ifeq ($(USE_FEEDFS_GUI),true)
|
||||
FEEDFS_GUI_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs-gui /opt/$(FLAVOUR_PATH_PREFIX)feedfs-gui))
|
||||
FEEDFS_GUI_VERSION = $(call cat_version,$(FEEDFS_GUI_DIR))
|
||||
FEEDFS_GUI_VERSION = $(call version,$(FEEDFS_GUI_DIR))
|
||||
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-gui-run = $(FEEDFS_GUI_VERSION)
|
||||
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-gui-devel = $(FEEDFS_GUI_VERSION)
|
||||
USE_FEEDFS_UTILS = true
|
||||
|
|
@ -650,7 +654,7 @@ endif
|
|||
|
||||
ifeq ($(USE_FEEDFS_UTILS),true)
|
||||
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 version,$(FEEDFS_UTILS_DIR))
|
||||
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-utils-run = $(FEEDFS_UTILS_VERSION)
|
||||
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-utils-devel = $(FEEDFS_UTILS_VERSION)
|
||||
USE_FEEDFS = true
|
||||
|
|
@ -661,7 +665,7 @@ endif
|
|||
|
||||
ifeq ($(USE_FEEDFS),true)
|
||||
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 version,$(FEEDFS_DIR))
|
||||
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-run = $(FEEDFS_VERSION)
|
||||
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-devel = $(FEEDFS_VERSION)
|
||||
USE_YTOOLS = true
|
||||
|
|
@ -672,7 +676,7 @@ endif
|
|||
|
||||
ifeq ($(USE_USERVER),true)
|
||||
USERVER_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/userver /opt/$(FLAVOUR_PATH_PREFIX)userver))
|
||||
USERVER_VERSION = $(call cat_version,$(USERVER_DIR))
|
||||
USERVER_VERSION = $(call version,$(USERVER_DIR))
|
||||
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)userver-run = $(USERVER_VERSION)
|
||||
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)userver-devel = $(USERVER_VERSION)
|
||||
USE_XCHANGE = true
|
||||
|
|
@ -683,7 +687,7 @@ endif
|
|||
|
||||
ifeq ($(USE_XCHANGE),true)
|
||||
XCHANGE_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/xchange /opt/$(FLAVOUR_PATH_PREFIX)xchange))
|
||||
XCHANGE_VERSION = $(call cat_version,$(XCHANGE_DIR))
|
||||
XCHANGE_VERSION = $(call version,$(XCHANGE_DIR))
|
||||
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)xchange-run = $(XCHANGE_VERSION)
|
||||
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)xchange-devel = $(XCHANGE_VERSION)
|
||||
USE_YTOOLS = true
|
||||
|
|
@ -693,7 +697,7 @@ endif
|
|||
|
||||
ifeq ($(USE_BTOOLS),true)
|
||||
BTOOLS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/btools /opt/$(FLAVOUR_PATH_PREFIX)btools))
|
||||
BTOOLS_VERSION = $(call cat_version,$(BTOOLS_DIR))
|
||||
BTOOLS_VERSION = $(call version,$(BTOOLS_DIR))
|
||||
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-btools-run = $(BTOOLS_VERSION)
|
||||
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-btools-devel = $(BTOOLS_VERSION)
|
||||
USE_YTOOLS = true
|
||||
|
|
@ -703,7 +707,7 @@ endif
|
|||
|
||||
ifeq ($(USE_JACKJART),true)
|
||||
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 version,$(JACKJART_DIR))
|
||||
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jackjart-run = $(JACKJART_VERSION)
|
||||
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jackjart-devel = $(JACKJART_VERSION)
|
||||
USE_YTOOLS = true
|
||||
|
|
@ -713,7 +717,7 @@ endif
|
|||
|
||||
ifeq ($(USE_JACKRTAI),true)
|
||||
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 version,$(JACKRTAI_DIR))
|
||||
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jackrtai-run = $(JACKRTAI_VERSION)
|
||||
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jackrtai-devel = $(JACKRTAI_VERSION)
|
||||
USE_YTOOLS = true
|
||||
|
|
@ -723,7 +727,7 @@ endif
|
|||
|
||||
ifeq ($(USE_JACKDUMMY),true)
|
||||
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 version,$(JACKDUMMY_DIR))
|
||||
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jackdummy-run = $(JACKDUMMY_VERSION)
|
||||
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jackdummy-devel = $(JACKDUMMY_VERSION)
|
||||
USE_YTOOLS = true
|
||||
|
|
@ -733,7 +737,7 @@ endif
|
|||
|
||||
ifeq ($(USE_ALSART),true)
|
||||
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 version,$(ALSART_DIR))
|
||||
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)alsart-run = $(ALSART_VERSION)
|
||||
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)alsart-devel = $(ALSART_VERSION)
|
||||
USE_YTOOLS = true
|
||||
|
|
@ -743,7 +747,7 @@ endif
|
|||
|
||||
ifeq ($(USE_DSPFS),true)
|
||||
DSPFS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspfs /opt/$(FLAVOUR_PATH_PREFIX)dspfs))
|
||||
DSPFS_VERSION = $(call cat_version,$(DSPFS_DIR))
|
||||
DSPFS_VERSION = $(call version,$(DSPFS_DIR))
|
||||
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspfs-run = $(DSPFS_VERSION)
|
||||
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspfs-devel = $(DSPFS_VERSION)
|
||||
USE_YTOOLS = true
|
||||
|
|
@ -757,10 +761,10 @@ YTOOLS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/ytools /opt/
|
|||
else
|
||||
YTOOLS_DIR = $(TOPDIR)
|
||||
endif
|
||||
YTOOLS_VERSION = $(call cat_version,$(YTOOLS_DIR))
|
||||
YTOOLS_VERSION = $(call version,$(YTOOLS_DIR))
|
||||
ifneq ($(PROJECT),ytools)
|
||||
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)ytools-run >= $(YTOOLS_VERSION)
|
||||
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)ytools-devel >= $(YTOOLS_VERSION)
|
||||
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)ytools-run = $(YTOOLS_VERSION)
|
||||
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)ytools-devel = $(YTOOLS_VERSION)
|
||||
endif
|
||||
INCLUDE += -I$(YTOOLS_DIR)/include
|
||||
LIBFLAGS += -L$(YTOOLS_DIR)/lib -lytools
|
||||
|
|
@ -768,7 +772,7 @@ endif
|
|||
|
||||
ifeq ($(USE_SCOPE_CASMIX),true)
|
||||
SCOPE_CASMIX_DIR = /opt/scope-casmix
|
||||
SCOPE_CASMIX_VERSION = $(call cat_version,/usr/share/doc/packages/scope-casmix-devel)
|
||||
SCOPE_CASMIX_VERSION = $(call version,/usr/share/doc/packages/scope-casmix-devel)
|
||||
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)scope-casmix >= $(SCOPE_CASMIX_VERSION)
|
||||
RPM_REQUIRES_DEVEL += scope-casmix-devel >= $(SCOPE_CASMIX_VERSION)
|
||||
INCLUDE += -I$(SCOPE_CASMIX_DIR)/include
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue