Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 275873 Details for
Bug 360893
net-libs/libproxy uses libmozjs.so provided by dev-lang/spidermonkey instead of xulrunner one causing undefined symbols
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
mozilla-pkgconfg.patch
mozilla-pkgconfig.patch (text/plain), 3.97 KB, created by
Pacho Ramos
on 2011-06-05 10:47:03 UTC
(
hide
)
Description:
mozilla-pkgconfg.patch
Filename:
MIME Type:
Creator:
Pacho Ramos
Created:
2011-06-05 10:47:03 UTC
Size:
3.97 KB
patch
obsolete
>From: Wolfgang Rosenauer >Subject: pkgconfig tuning > >diff --git a/xulrunner/installer/Makefile.in b/xulrunner/installer/Makefile.in >--- a/xulrunner/installer/Makefile.in >+++ b/xulrunner/installer/Makefile.in >@@ -62,16 +62,19 @@ PKG_DMG_SOURCE = $(STAGEPATH)xulrunner-p > endif > > include $(topsrcdir)/config/rules.mk > > INSTALL_SDK = 1 > > include $(topsrcdir)/toolkit/mozapps/installer/packager.mk > >+# the apilibdir always ends with 1.9 as every patch update will provide a link >+apilibdir = $(dir $(installdir))xulrunner-2.0 >+ > $(MOZILLA_VERSION).system.conf: $(topsrcdir)/config/milestone.txt Makefile > printf "[%s]\nGRE_PATH=%s\nxulrunner=true\nabi=%s" \ > $(MOZILLA_VERSION) $(installdir) $(TARGET_XPCOM_ABI)> $@ > > ifndef SKIP_GRE_REGISTRATION > # to register xulrunner per-user, override this with $HOME/.gre.d > regdir = /etc/gre.d > >@@ -116,16 +119,17 @@ pkg_config_files += mozilla-nss.pc > endif > > %.pc: $(srcdir)/%.pc.in $(GLOBAL_DEPS) > cat $< | sed \ > -e "s|%prefix%|$(prefix)|" \ > -e "s|%includedir%|$(includedir)|" \ > -e "s|%idldir%|$(idldir)|" \ > -e "s|%sdkdir%|$(sdkdir)|" \ >+ -e "s|%libdir%|$(apilibdir)|" \ > -e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \ > -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \ > -e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \ > -e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \ > -e "s|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|" \ > -e "s|%NSPR_NAME%|$(NSPR_NAME)|" \ > -e "s|%NSPR_VERSION%|$(NSPR_VERSION)|" \ > -e "s|%MOZ_XUL_LINK%|$(MOZ_XUL_LINK)|" \ >diff --git a/xulrunner/installer/libxul-embedding.pc.in b/xulrunner/installer/libxul-embedding.pc.in >--- a/xulrunner/installer/libxul-embedding.pc.in >+++ b/xulrunner/installer/libxul-embedding.pc.in >@@ -1,10 +1,11 @@ > prefix=%prefix% > sdkdir=%sdkdir% > includedir=%includedir% > idldir=%idldir% > > Name: libxul-embedding > Description: Static library for version-independent embedding of the Mozilla runtime > Version: %MOZILLA_VERSION% >-Libs: -L${sdkdir}/lib -lxpcomglue -ldl >+Requires: %NSPR_NAME% >= %NSPR_VERSION% >+Libs: -L${sdkdir}/sdk/lib -lxpcomglue -ldl > Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS% >diff --git a/xulrunner/installer/libxul.pc.in b/xulrunner/installer/libxul.pc.in >--- a/xulrunner/installer/libxul.pc.in >+++ b/xulrunner/installer/libxul.pc.in >@@ -1,10 +1,11 @@ > prefix=%prefix% > sdkdir=%sdkdir% >+libdir=%libdir% > includedir=%includedir% > idldir=%idldir% > > Name: libxul > Description: The Mozilla Runtime and Embedding Engine > Version: %MOZILLA_VERSION% > Requires: %NSPR_NAME% >= %NSPR_VERSION% > Libs: -L${sdkdir}/lib %MOZ_XUL_LINK% >diff --git a/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in b/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in >--- a/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in >+++ b/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in >@@ -1,8 +1,9 @@ > prefix=%prefix% > sdkdir=%sdkdir% >+libdir=%libdir% > includedir=%includedir% > > Name: mozilla-gtkembedmoz > Description: Static version-independent Mozilla Embedding Widget for Gtk+ > Version: %MOZILLA_VERSION% > Requires: libxul-embedding = %MOZILLA_VERSION% >diff --git a/xulrunner/installer/mozilla-gtkmozembed.pc.in b/xulrunner/installer/mozilla-gtkmozembed.pc.in >--- a/xulrunner/installer/mozilla-gtkmozembed.pc.in >+++ b/xulrunner/installer/mozilla-gtkmozembed.pc.in >@@ -1,8 +1,9 @@ > prefix=%prefix% > sdkdir=%sdkdir% >+libdir=%libdir% > includedir=%includedir% > > Name: mozilla-gtkembedmoz > Description: Mozilla Embedding Widget for Gtk+ > Version: %MOZILLA_VERSION% > Requires: libxul = %MOZILLA_VERSION% >diff --git a/xulrunner/installer/mozilla-js.pc.in b/xulrunner/installer/mozilla-js.pc.in >--- a/xulrunner/installer/mozilla-js.pc.in >+++ b/xulrunner/installer/mozilla-js.pc.in >@@ -1,10 +1,11 @@ > prefix=%prefix% > sdkdir=%sdkdir% >+libdir=%libdir% > includedir=%includedir% > > Name: JavaScript > Description: The Mozilla JavaScript Library > Version: %MOZILLA_VERSION% > Requires: %NSPR_NAME% >= %NSPR_VERSION% >-Libs: -L${sdkdir}/lib %MOZ_JS_LINK% >+Libs: -Wl,-rpath,${libdir} -L${sdkdir}/lib %MOZ_JS_LINK% > Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 360893
:
267515
| 275873