| author | Wolfgang Rosenauer <wr@rosenauer.org> |
| Tue, 14 May 2013 22:55:26 +0200 | |
| branch | firefox21 |
| changeset 647 | 9d8bdcdd4d2a |
| parent 585 | 5a44d417c9b5 |
| child 686 | ab25aac2aa83 |
| 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 |
|
|
541
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
533
diff
changeset
|
7 |
@@ -39,16 +39,19 @@ ifndef MOZ_PLATFORM_MAEMO |
|
340
aabcc7895695
update to version 8.0b1 (just merged stuff; build might still fail)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
259
diff
changeset
|
8 |
GENERATE_CACHE = 1 |
|
382
67f876aafae8
lift up to Gecko 11beta
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
380
diff
changeset
|
9 |
endif |
| 1 | 10 |
|
| 410 | 11 |
include $(topsrcdir)/toolkit/mozapps/installer/signing.mk |
| 1 | 12 |
include $(topsrcdir)/toolkit/mozapps/installer/packager.mk |
13 |
||
| 259 | 14 |
# Add pkg-config files to the install:: target |
| 1 | 15 |
|
|
340
aabcc7895695
update to version 8.0b1 (just merged stuff; build might still fail)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
259
diff
changeset
|
16 |
+# the apilibdir always ends with 1.9 as every patch update will provide a link |
|
585
5a44d417c9b5
prepare for Beta 18 phase
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
17 |
+apilibdir = $(dir $(installdir))xulrunner-18 |
|
340
aabcc7895695
update to version 8.0b1 (just merged stuff; build might still fail)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
259
diff
changeset
|
18 |
+ |
| 259 | 19 |
pkg_config_files = \ |
20 |
libxul.pc \ |
|
21 |
libxul-embedding.pc \ |
|
22 |
mozilla-js.pc \ |
|
23 |
mozilla-plugin.pc \ |
|
|
340
aabcc7895695
update to version 8.0b1 (just merged stuff; build might still fail)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
259
diff
changeset
|
24 |
$(NULL) |
| 356 | 25 |
|
26 |
ifdef MOZ_NATIVE_NSPR |
|
|
541
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
533
diff
changeset
|
27 |
@@ -76,16 +79,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-js.pc.in b/xulrunner/installer/mozilla-js.pc.in |
77 |
--- a/xulrunner/installer/mozilla-js.pc.in |
|
78 |
+++ b/xulrunner/installer/mozilla-js.pc.in |
|
79 |
@@ -1,10 +1,11 @@ |
|
80 |
prefix=%prefix% |
|
81 |
sdkdir=%sdkdir% |
|
82 |
+libdir=%libdir% |
|
83 |
includedir=%includedir% |
|
84 |
||
85 |
Name: JavaScript |
|
86 |
Description: The Mozilla JavaScript Library |
|
87 |
Version: %MOZILLA_VERSION% |
|
88 |
Requires: %NSPR_NAME% >= %NSPR_VERSION% |
|
|
164
995e803e8198
rebase patches to snapshot 20100929
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
77
diff
changeset
|
89 |
-Libs: -L${sdkdir}/lib %MOZ_JS_LINK%
|
|
995e803e8198
rebase patches to snapshot 20100929
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
77
diff
changeset
|
90 |
+Libs: -Wl,-rpath,${libdir} -L${sdkdir}/lib %MOZ_JS_LINK%
|
| 1 | 91 |
Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE
|