CRUX PPC
A lightweight GNU/Linux distribution for PowerPC!
Subversion Repository
Parent Directory
| 
Revision Log
Revision 40 -
(show annotations)
Sun Oct 4 14:31:45 2009 UTC (3 years, 7 months ago) by cjg
File size: 4560 byte(s)
Sun Oct 4 14:31:45 2009 UTC (3 years, 7 months ago) by cjg
File size: 4560 byte(s)
xulrunner: added a patch
| 1 | --- |
| 2 | xulrunner/installer/Makefile.in | 17 ++++++++++++++--- |
| 3 | xulrunner/installer/libxul-embedding-unstable.pc.in | 2 +- |
| 4 | xulrunner/installer/libxul-embedding.pc.in | 2 +- |
| 5 | xulrunner/installer/mozilla-nss.pc.in | 6 +++--- |
| 6 | 4 files changed, 19 insertions(+), 8 deletions(-) |
| 7 | |
| 8 | Index: mozilla/xulrunner/installer/Makefile.in |
| 9 | =================================================================== |
| 10 | --- mozilla.orig/xulrunner/installer/Makefile.in |
| 11 | +++ mozilla/xulrunner/installer/Makefile.in |
| 12 | @@ -90,40 +90,51 @@ |
| 13 | mozilla-plugin.pc \ |
| 14 | mozilla-gtkmozembed.pc \ |
| 15 | mozilla-gtkmozembed-embedding.pc \ |
| 16 | $(NULL) |
| 17 | |
| 18 | ifdef MOZ_NATIVE_NSPR |
| 19 | NSPR_NAME=nspr |
| 20 | NSPR_VERSION=$(shell $(NSPR_CONFIG) --version) |
| 21 | +FULL_NSPR_CFLAGS=$(shell $(NSPR_CONFIG) --cflags) |
| 22 | +FULL_NSPR_LIBS=$(shell $(NSPR_CONFIG) --libs) |
| 23 | else |
| 24 | -pkg_config_files += mozilla-nspr.pc |
| 25 | NSPR_NAME=mozilla-nspr |
| 26 | FULL_NSPR_CFLAGS=-I\$${includedir}/stable |
| 27 | FULL_NSPR_LIBS=$(subst $(prefix),\$${sdkdir},$(shell $(DEPTH)/nsprpub/config/nspr-config --libs)) |
| 28 | NSPR_VERSION=$(shell $(DEPTH)/nsprpub/config/nspr-config --version) |
| 29 | endif |
| 30 | +pkg_config_files += mozilla-nspr.pc |
| 31 | |
| 32 | $(warning FULL_NSPR_CFLAGS=$(FULL_NSPR_CFLAGS)) |
| 33 | |
| 34 | -ifndef MOZ_NATIVE_NSS |
| 35 | -pkg_config_files += mozilla-nss.pc |
| 36 | +ifdef MOZ_NATIVE_NSS |
| 37 | +NSS_VERSION=$(shell $(NSS_CONFIG) --version) |
| 38 | +FULL_NSS_CFLAGS=$(shell $(NSS_CONFIG) --cflags) |
| 39 | +FULL_NSS_LIBS=$(shell $(NSS_CONFIG) --libs) |
| 40 | +else |
| 41 | +NSS_VERSION=$(shell $(DEPTH)/nsprpub/config/nss-config --version) |
| 42 | +FULL_NSS_CFLAGS=-I\$${includedir}/stable |
| 43 | +FULL_NSS_LIBS=$(subst $(prefix),\$${sdkdir},$(shell $(DEPTH)/nsprpub/config/nss-config --libs)) |
| 44 | endif |
| 45 | +pkg_config_files += mozilla-nss.pc |
| 46 | |
| 47 | %.pc: $(srcdir)/%.pc.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk |
| 48 | cat $< | sed \ |
| 49 | -e "s|%prefix%|$(prefix)|" \ |
| 50 | -e "s|%includedir%|$(includedir)|" \ |
| 51 | -e "s|%idldir%|$(idldir)|" \ |
| 52 | -e "s|%sdkdir%|$(sdkdir)|" \ |
| 53 | -e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \ |
| 54 | -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \ |
| 55 | -e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \ |
| 56 | -e "s|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|" \ |
| 57 | + -e "s|%FULL_NSS_LIBS%|$(FULL_NSS_LIBS)|" \ |
| 58 | + -e "s|%FULL_NSS_CFLAGS%|$(FULL_NSS_CFLAGS)|" \ |
| 59 | -e "s|%NSPR_NAME%|$(NSPR_NAME)|" \ |
| 60 | -e "s|%NSPR_VERSION%|$(NSPR_VERSION)|" > $@ |
| 61 | chmod 644 $@ |
| 62 | |
| 63 | install:: $(pkg_config_files) |
| 64 | @echo pkg_config_file: $(pkg_config_files) |
| 65 | $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(libdir)/pkgconfig |
| 66 | |
| 67 | Index: mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in |
| 68 | =================================================================== |
| 69 | --- mozilla.orig/xulrunner/installer/libxul-embedding-unstable.pc.in |
| 70 | +++ mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in |
| 71 | @@ -3,9 +3,9 @@ |
| 72 | includedir=%includedir% |
| 73 | idldir=%idldir% |
| 74 | includetype=unstable |
| 75 | |
| 76 | Name: libxul-embedding-unstable |
| 77 | Description: Static library for version-independent embedding of the Mozilla runtime (unstable API) |
| 78 | Version: %MOZILLA_VERSION% |
| 79 | Libs: -L${sdkdir}/lib -lxpcomglue |
| 80 | -Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar |
| 81 | +Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar %FULL_NSPR_CFLAGS% |
| 82 | Index: mozilla/xulrunner/installer/libxul-embedding.pc.in |
| 83 | =================================================================== |
| 84 | --- mozilla.orig/xulrunner/installer/libxul-embedding.pc.in |
| 85 | +++ mozilla/xulrunner/installer/libxul-embedding.pc.in |
| 86 | @@ -7,9 +7,9 @@ |
| 87 | # Note: the default pkg-config cflags will only list include directories |
| 88 | # that contain stable (frozen or safe for linking) header files. To include |
| 89 | # nonfrozen headers, run pkg-config with --define-variable=includetype=unstable |
| 90 | |
| 91 | Name: libxul-embedding |
| 92 | Description: Static library for version-independent embedding of the Mozilla runtime |
| 93 | Version: %MOZILLA_VERSION% |
| 94 | Libs: -L${sdkdir}/lib -lxpcomglue |
| 95 | -Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar |
| 96 | +Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar %FULL_NSPR_CFLAGS% |
| 97 | Index: mozilla/xulrunner/installer/mozilla-nss.pc.in |
| 98 | =================================================================== |
| 99 | --- mozilla.orig/xulrunner/installer/mozilla-nss.pc.in |
| 100 | +++ mozilla/xulrunner/installer/mozilla-nss.pc.in |
| 101 | @@ -1,10 +1,10 @@ |
| 102 | prefix=%prefix% |
| 103 | sdkdir=%sdkdir% |
| 104 | includedir=%includedir% |
| 105 | |
| 106 | Name: NSS |
| 107 | Description: Mozilla Network Security Services |
| 108 | -Version: %MOZILLA_VERSION% |
| 109 | +Version: %NSS_VERSION% |
| 110 | Requires: %NSPR_NAME% >= %NSPR_VERSION% |
| 111 | -Libs: -L${sdkdir}/lib -lnss3 -lnssutil3 -lsmime3 -lssl3 -lsoftokn3 |
| 112 | -Cflags: -I${includedir}/stable |
| 113 | +Libs: %FULL_NSS_LIBS% |
| 114 | +Cflags: %FULL_NSS_CFLAGS% |