From 6398de69b44e30c4d5968da7e68f03fc32bd237a Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Sun, 24 Jan 2016 16:36:11 +0000
Subject: [PATCH] defs.mk, make.mk, create-pkg-config.sh: Add requires to
 pkg-config creation

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 make/defs.mk                 |  1 +
 make/make.mk                 |  4 +++-
 scripts/create-pkg-config.sh | 21 ++++++++++++++++++---
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/make/defs.mk b/make/defs.mk
index cd358767..c08ef9d1 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -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)
diff --git a/make/make.mk b/make/make.mk
index d4ab2dc8..83c0247c 100644
--- a/make/make.mk
+++ b/make/make.mk
@@ -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 $@
diff --git a/scripts/create-pkg-config.sh b/scripts/create-pkg-config.sh
index bb684d19..bfd4b955 100644
--- a/scripts/create-pkg-config.sh
+++ b/scripts/create-pkg-config.sh
@@ -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