| author | Wolfgang Rosenauer <wr@rosenauer.org> |
| Mon, 08 Nov 2010 14:30:30 +0100 | |
| changeset 192 | bb4213ee70c8 |
| parent 189 | 1b299e08ac05 |
| child 259 | 31beb466ca79 |
| permissions | -rw-r--r-- |
| 8 | 1 |
From: Wolfgang Rosenauer |
2 |
Subject: pkgconfig tuning |
|
3 |
||
| 1 | 4 |
diff --git a/xulrunner/installer/Makefile.in b/xulrunner/installer/Makefile.in |
5 |
--- a/xulrunner/installer/Makefile.in |
|
6 |
+++ b/xulrunner/installer/Makefile.in |
|
7 |
@@ -62,16 +62,19 @@ PKG_DMG_SOURCE = $(STAGEPATH)xulrunner-p |
|
8 |
endif |
|
9 |
||
10 |
include $(topsrcdir)/config/rules.mk |
|
11 |
||
12 |
INSTALL_SDK = 1 |
|
13 |
||
14 |
include $(topsrcdir)/toolkit/mozapps/installer/packager.mk |
|
15 |
||
16 |
+# the apilibdir always ends with 1.9 as every patch update will provide a link |
|
|
189
1b299e08ac05
Fixed wrong reference in pkgconfig files
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
17 |
+apilibdir = $(dir $(installdir))xulrunner-2.0 |
| 1 | 18 |
+ |
19 |
$(MOZILLA_VERSION).system.conf: $(topsrcdir)/config/milestone.txt Makefile |
|
20 |
printf "[%s]\nGRE_PATH=%s\nxulrunner=true\nabi=%s" \ |
|
21 |
$(MOZILLA_VERSION) $(installdir) $(TARGET_XPCOM_ABI)> $@ |
|
22 |
||
23 |
ifndef SKIP_GRE_REGISTRATION |
|
24 |
# to register xulrunner per-user, override this with $HOME/.gre.d |
|
25 |
regdir = /etc/gre.d |
|
26 |
||
|
164
995e803e8198
rebase patches to snapshot 20100929
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
77
diff
changeset
|
27 |
@@ -116,16 +119,17 @@ pkg_config_files += mozilla-nss.pc |
|
77
f2df98836e17
More 1.9.2->1.9.3 patch rebasing and version changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
54
diff
changeset
|
28 |
endif |
| 1 | 29 |
|
30 |
%.pc: $(srcdir)/%.pc.in $(GLOBAL_DEPS) |
|
31 |
cat $< | sed \ |
|
32 |
-e "s|%prefix%|$(prefix)|" \ |
|
33 |
-e "s|%includedir%|$(includedir)|" \ |
|
34 |
-e "s|%idldir%|$(idldir)|" \ |
|
35 |
-e "s|%sdkdir%|$(sdkdir)|" \ |
|
36 |
+ -e "s|%libdir%|$(apilibdir)|" \ |
|
37 |
-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \ |
|
38 |
-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \ |
|
39 |
-e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \ |
|
40 |
-e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \ |
|
41 |
-e "s|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|" \ |
|
42 |
-e "s|%NSPR_NAME%|$(NSPR_NAME)|" \ |
|
|
164
995e803e8198
rebase patches to snapshot 20100929
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
77
diff
changeset
|
43 |
-e "s|%NSPR_VERSION%|$(NSPR_VERSION)|" \ |
|
995e803e8198
rebase patches to snapshot 20100929
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
77
diff
changeset
|
44 |
-e "s|%MOZ_XUL_LINK%|$(MOZ_XUL_LINK)|" \ |
| 1 | 45 |
diff --git a/xulrunner/installer/libxul-embedding.pc.in b/xulrunner/installer/libxul-embedding.pc.in |
46 |
--- a/xulrunner/installer/libxul-embedding.pc.in |
|
47 |
+++ b/xulrunner/installer/libxul-embedding.pc.in |
|
48 |
@@ -1,10 +1,11 @@ |
|
49 |
prefix=%prefix% |
|
50 |
sdkdir=%sdkdir% |
|
51 |
includedir=%includedir% |
|
52 |
idldir=%idldir% |
|
53 |
||
54 |
Name: libxul-embedding |
|
55 |
Description: Static library for version-independent embedding of the Mozilla runtime |
|
56 |
Version: %MOZILLA_VERSION% |
|
|
77
f2df98836e17
More 1.9.2->1.9.3 patch rebasing and version changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
54
diff
changeset
|
57 |
-Libs: -L${sdkdir}/lib -lxpcomglue -ldl
|
| 1 | 58 |
+Requires: %NSPR_NAME% >= %NSPR_VERSION% |
|
77
f2df98836e17
More 1.9.2->1.9.3 patch rebasing and version changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
54
diff
changeset
|
59 |
+Libs: -L${sdkdir}/sdk/lib -lxpcomglue -ldl
|
| 1 | 60 |
Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS%
|
|
54
110e0337b73e
Added missing libdir to libxul.pc
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
53
diff
changeset
|
61 |
diff --git a/xulrunner/installer/libxul.pc.in b/xulrunner/installer/libxul.pc.in |
|
110e0337b73e
Added missing libdir to libxul.pc
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
53
diff
changeset
|
62 |
--- a/xulrunner/installer/libxul.pc.in |
|
110e0337b73e
Added missing libdir to libxul.pc
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
53
diff
changeset
|
63 |
+++ b/xulrunner/installer/libxul.pc.in |
|
110e0337b73e
Added missing libdir to libxul.pc
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
53
diff
changeset
|
64 |
@@ -1,10 +1,11 @@ |
|
110e0337b73e
Added missing libdir to libxul.pc
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
53
diff
changeset
|
65 |
prefix=%prefix% |
|
110e0337b73e
Added missing libdir to libxul.pc
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
53
diff
changeset
|
66 |
sdkdir=%sdkdir% |
|
110e0337b73e
Added missing libdir to libxul.pc
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
53
diff
changeset
|
67 |
+libdir=%libdir% |
|
110e0337b73e
Added missing libdir to libxul.pc
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
53
diff
changeset
|
68 |
includedir=%includedir% |
|
110e0337b73e
Added missing libdir to libxul.pc
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
53
diff
changeset
|
69 |
idldir=%idldir% |
|
110e0337b73e
Added missing libdir to libxul.pc
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
53
diff
changeset
|
70 |
|
|
110e0337b73e
Added missing libdir to libxul.pc
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
53
diff
changeset
|
71 |
Name: libxul |
|
110e0337b73e
Added missing libdir to libxul.pc
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
53
diff
changeset
|
72 |
Description: The Mozilla Runtime and Embedding Engine |
|
110e0337b73e
Added missing libdir to libxul.pc
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
53
diff
changeset
|
73 |
Version: %MOZILLA_VERSION% |
|
110e0337b73e
Added missing libdir to libxul.pc
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
53
diff
changeset
|
74 |
Requires: %NSPR_NAME% >= %NSPR_VERSION% |
|
164
995e803e8198
rebase patches to snapshot 20100929
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
77
diff
changeset
|
75 |
Libs: -L${sdkdir}/lib %MOZ_XUL_LINK%
|
| 1 | 76 |
diff --git a/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in b/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in |
77 |
--- a/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in |
|
78 |
+++ b/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in |
|
79 |
@@ -1,8 +1,9 @@ |
|
80 |
prefix=%prefix% |
|
81 |
sdkdir=%sdkdir% |
|
82 |
+libdir=%libdir% |
|
83 |
includedir=%includedir% |
|
84 |
||
85 |
Name: mozilla-gtkembedmoz |
|
86 |
Description: Static version-independent Mozilla Embedding Widget for Gtk+ |
|
87 |
Version: %MOZILLA_VERSION% |
|
88 |
Requires: libxul-embedding = %MOZILLA_VERSION% |
|
89 |
diff --git a/xulrunner/installer/mozilla-gtkmozembed.pc.in b/xulrunner/installer/mozilla-gtkmozembed.pc.in |
|
90 |
--- a/xulrunner/installer/mozilla-gtkmozembed.pc.in |
|
91 |
+++ b/xulrunner/installer/mozilla-gtkmozembed.pc.in |
|
92 |
@@ -1,8 +1,9 @@ |
|
93 |
prefix=%prefix% |
|
94 |
sdkdir=%sdkdir% |
|
95 |
+libdir=%libdir% |
|
96 |
includedir=%includedir% |
|
97 |
||
98 |
Name: mozilla-gtkembedmoz |
|
99 |
Description: Mozilla Embedding Widget for Gtk+ |
|
100 |
Version: %MOZILLA_VERSION% |
|
101 |
Requires: libxul = %MOZILLA_VERSION% |
|
102 |
diff --git a/xulrunner/installer/mozilla-js.pc.in b/xulrunner/installer/mozilla-js.pc.in |
|
103 |
--- a/xulrunner/installer/mozilla-js.pc.in |
|
104 |
+++ b/xulrunner/installer/mozilla-js.pc.in |
|
105 |
@@ -1,10 +1,11 @@ |
|
106 |
prefix=%prefix% |
|
107 |
sdkdir=%sdkdir% |
|
108 |
+libdir=%libdir% |
|
109 |
includedir=%includedir% |
|
110 |
||
111 |
Name: JavaScript |
|
112 |
Description: The Mozilla JavaScript Library |
|
113 |
Version: %MOZILLA_VERSION% |
|
114 |
Requires: %NSPR_NAME% >= %NSPR_VERSION% |
|
|
164
995e803e8198
rebase patches to snapshot 20100929
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
77
diff
changeset
|
115 |
-Libs: -L${sdkdir}/lib %MOZ_JS_LINK%
|
|
995e803e8198
rebase patches to snapshot 20100929
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
77
diff
changeset
|
116 |
+Libs: -Wl,-rpath,${libdir} -L${sdkdir}/lib %MOZ_JS_LINK%
|
| 1 | 117 |
Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE
|