tags 427079 + patch thanks On Fri, Jun 01, 2007 at 09:26:04PM +0200, Mike Hommey wrote: > I put 2 %includedir%'s in one line... > > As a workaround, I'd suggest you to use pkg-config instead. > > I won't fix this bug before taking care of stable security updates.
patch replacement attached. Yeah hackish, but efficient. I think fixing sed expression does not bring much benefit ... :). - Alexander
#! /bin/sh /usr/share/dpatch/dpatch-run ## 80_xulrunner-config.dpatch by <[EMAIL PROTECTED]> ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Give more appropriate cflags and libs @DPATCH@ --- xulrunner/build/unix/mozilla-config.in +++ xulrunner/build/unix/mozilla-config.in @@ -22,7 +22,6 @@ xpcom nspr js - jsj gfx EOF exit $1 @@ -60,9 +59,6 @@ exit 0 ;; --cflags) - if test "%includedir%" != /usr/include ; then - includes="-I%includedir%" - fi echo_cflags=yes ;; --defines) @@ -74,7 +70,7 @@ --idlflags) echo_idlflags=yes ;; - xpcom|js|nspr|gfx|jsj) + xpcom|js|nspr|gfx) echo_components="$echo_components $1" echo_libraries="$echo_libraries $1" ;; @@ -105,7 +101,17 @@ if test "$echo_cflags" = "yes"; then nspr_cflags="%FULL_NSPR_CFLAGS%" for n in $echo_components; do - component_includes="$component_includes -I%includedir%/$n" + case "$n" in + js) + component_includes="$component_includes -I/usr/include/mozjs" + ;; + nspr) + ;; + *) + component_includes="$component_includes -I%includedir% \ + -I%includedir%/$n" + ;; + esac done echo $component_includes $includes $nspr_cflags fi @@ -133,10 +138,7 @@ js) libs="$libs $_js_libs" ;; - jsj) - libs="$libs -ljsj $_js_libs $_xpcom_libs" - ;; esac done - echo -L%libdir% $libs + echo $libs fi