summaryrefslogtreecommitdiff
blob: 30d53002b08a7c6787ccf99f54229e782cd40571 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
Fixing as-needed issues

http://bugs.gentoo.org/show_bug.cgi?id=317905

Patch written by Kacper Kowalik <xarthisius.kk@gmail.com>

--- jb
+++ jb
@@ -89,10 +89,11 @@
 
 		mkdir -p build/jbsrc || exit 1
 
-		if ! gobject_cflags_libs=`pkg-config --cflags --libs 'gobject-2.0 >= 2.8.0' 2>/dev/null`; then
+		if ! gobject_cflags=`pkg-config --cflags 'gobject-2.0 >= 2.8.0' 2>/dev/null`; then
 			echo "ERROR: the GLib library was not found" >&2
 			exit 1
 		fi
+		gobject_libs=`pkg-config --libs 'gobject-2.0 >= 2.8.0' 2>/dev/null`
 
 		sed -e 's|^#jb_include ["<]\(.*\)[">]|#include "\1.h"|' \
 			jbsrc/jb.c > build/jbsrc/jb.c || exit 1
@@ -103,14 +104,15 @@
 			-DG_LOG_DOMAIN="\"jb\"" \
 			-DJB_SOURCES="\"$jb_c_sources $jb_h_sources\"" \
 			-DJB_PACKAGE_SOURCES="\"$jb_c_package_sources $jb_h_package_sources\"" \
-			$gobject_cflags_libs \
+			$gobject_cflags \
 			$jb_cflags \
 			$jb_cppflags \
 			$jb_ldflags \
 			build/jbsrc/jb.c \
 			$jb_c_sources \
 			$jb_c_package_sources \
-			$jb_libs; then
+			$jb_libs \
+			$gobject_libs; then
 			echo "ERROR: cannot build jb" >&2
 			exit 1
 		fi