janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 03:53:32 +01:00
Code Activity

defs.mk, make.mk, create-pkg-config.sh: Add requires to pkg-config creation

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-01-24 16:36:11 +00:00
commit 6398de69b4
3 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
make/defs.mk
View file

@ -1736,6 +1736,7 @@ ifneq ($(filter ytools,$(PREREQ_BUILD)),)
YTOOLS_DIR = $(TOPDIR)
endif
YTOOLS_VERSION = $(call version,$(YTOOLS_DIR))
RPM_REQUIRES_DEVEL += glib-2.0
ifneq ($(PROJECT),ytools)
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)ytools-run = $(YTOOLS_VERSION)
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)ytools-devel = $(YTOOLS_VERSION)

4
make/make.mk
View file

@ -40,7 +40,7 @@ do-install-links:
ifeq ($(EXPORT_PROJECT_LIB),true)
CREATE_PKG_CONFIG_OPTS += -c "-I$(PROJECT_DIRPATH)/include"
CREATE_PKG_CONFIG_OPTS += -l "-l$(PROJECT)"
CREATE_PKG_CONFIG_OPTS += -l "-L$(PROJECT_DIRPATH)/lib -l$(PROJECT)"
endif
$(LOCAL_PKG_CONFIG): $(PROJECT_DESCR_FILE) $(MODDIR)/make/make.mk $(MOD_SCRIPT_DIR)/create-pkg-config.sh
@ -50,6 +50,8 @@ $(LOCAL_PKG_CONFIG): $(PROJECT_DESCR_FILE) $(MODDIR)/make/make.mk $(MOD_SCRIPT_D
-v $(DIST_VERSION) \
-p $(PROJECT_DIRPATH) \
-V $(shell echo $(PROJECT) | tr a-z- A-Z_)_DIR=$(PROJECT_DIRPATH) \
-r $(RPM_REQUIRES_RUN) \
-R $(RPM_REQUIRES_DEVEL) \
$(CREATE_PKG_CONFIG_OPTS) \
> $@.tmp
mv $@.tmp $@

21
scripts/create-pkg-config.sh
View file

@ -24,12 +24,12 @@ usage()
goodbye $1
}
set -e
project_descr_file="$1"
myname=`basename $0`
eval set -- `getopt -- hF:d:n:s:p:v:c:l:V: "$@"`
set -e
eval set -- `getopt -- hF:d:n:s:p:v:c:l:V:r:R: "$@"`
while [ "$1" != -- ]; do
case $1 in
@ -67,6 +67,14 @@ case $1 in
libflags="$2"
shift
;;
-r)
requires_run="$2"
shift
;;
-R)
requires_build="$2"
shift
;;
-V)
variables="$variables$2\n"
shift
@ -78,10 +86,14 @@ shift
done
shift
set +e
[ -r "$project_descr_file" ] && {
. ytools-functions.sh
try_assign_sec $project_descr_file description descr
try_assign_sec $project_descr_file summary summary
try_assign_sec $project_descr_file requires_run requires_run
try_assign_sec $project_descr_file requires_build requires_build
}
[ "$variables" ] && echo -e "$variables"
@ -98,6 +110,9 @@ Version: $version
EOT
[ "$cflags" ] && echo "Cflags: $cflags"
[ "$libflags" ] && echo "Libs: $libflags"
[ "$requires_run" ] && echo "Requires: $requires_run"
[ "$requires_build" ] && echo "Requires.private: $requires_build"
# [ "$requires_devel" ] && ?? # not sure what to do with this
exit 0