Apache OpenOffice (AOO) Bugzilla – Issue 86670
system-mozilla: libxul and new pkgconfig files
Last modified: 2008-05-06 13:36:22 UTC
Like http://fedoraproject.org/wiki/Releases/FeatureXULRunnerAPIChanges with firefox 3.0 apparently there is a new standardized set of pkgconfig name for the various pieces of the mozilla stack
Created attachment 51878 [details] proposed to do it like so
cmc: looks good from just looking over it quickly
.
checked into cmcfixes43
cmc->rene: maybe you could verify this change in cmcfixes43 ?
This fails for me since plain xulrunner-1.9b4 has sdkdir instead of libdir. + MOZ_LIB=`$PKG_CONFIG --variable=libdir libxul` cmc, may you add a check for sdkdir if libdir returns an empty string, please? Thanks!
cmc->geki: what do you have in that sdk dir, is it a hierarchy with a include dir and then a lib dir, e.g. something like /usr/lib/xulrunner-sdk/sdk/lib/libxul.so ?
How about now with the added fallback to sdkdir + "sdk/lib", does that work for your setup too ?
geki->cmc: This is what I have. A simple s/libdir/sdkdir/ change. # grep sdkdir /usr/lib64/pkgconfig/libxul.pc sdkdir=/usr/lib64/xulrunner-1.9 Libs: -L${sdkdir} -lxpcomglue_s -lxul -lxpcom -Wl,-R${sdkdir} /usr/lib64/xulrunner-1.9/libxul.so{,.2}
That totally differs from the fedora sdkdir variable which has a sdk/lib dir inside the sdkdir variable and a libdir that points to the actual lib dir, what distro is this ?
Man what a bloody mess, the fedora xulrunner has this patch diff -up mozilla/xulrunner/installer/libxul.pc.in.pk mozilla/xulrunner/installer/libxul.pc.in --- mozilla/xulrunner/installer/libxul.pc.in.pk 2007-08-03 16:46:28.000000000 +0200 +++ mozilla/xulrunner/installer/libxul.pc.in 2008-01-29 17:18:01.000000000 +0100 @@ -1,7 +1,8 @@ prefix=%prefix% sdkdir=%sdkdir% +libdir=%libdir% includedir=%includedir% -idldir=%idldir% +idldir=%idldir%/stable includetype=stable # Note: the default pkg-config includes will only list include directories @@ -12,5 +13,5 @@ Name: libxul Description: The Mozilla Runtime and Embedding Engine Version: %MOZILLA_VERSION% Requires: %NSPR_NAME% >= %NSPR_VERSION% -Libs: -L${sdkdir}/lib -lxpcomglue_s -lxul -lxpcom +Libs: -L${sdkdir}/sdk/lib -lxpcomglue_s -lxul -lxpcom which implies that your distro may also has a patch to turn -Libs: -L${sdkdir}/lib -lxpcomglue_s -lxul -lxpcom into -Libs: -L${sdkdir} -lxpcomglue_s -lxul -lxpcom
Lovely Gentoo distro here. They split it like: /usr/lib64/xulrunner-1.9/ | /usr/include/xulrunner-1.9/ O right, vanilla is here: http://lxr.mozilla.org/seamonkey/source/xulrunner/installer/libxul.pc.in
tweaked for gentoo locations
cmc->geki: does that version work for your setup ?
geki->cmc: that is fine. thank you very much!
k, verified then
This broke Ubuntu which uses the official upstream libxul.pc file with sdkdir. Actually in ooo-build someone renamed the Ubuntu patch and then broke it by changing to from the proper 'sdkdir' name...
ccheney: so you can try to extract the current version which has some sdkdir things fixed? The current version in ooo-build (and I was the one who exchanged your patch with the "official" one here) is the version extracted before caolan did the sdkdir fixes for gentoo...
Rene, I did and committed the fixed version that should work both on Fedora and everything else to ooo-build.
see in m11