Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 257918 | Differences between
and this patch

Collapse All | Expand All

(-)xmlwrapp-0.5.0.orig/configure.pl (-4 / +5 lines)
Lines 125-130 Link Here
125
  --contrib            Configure for being bundled inside another project
125
  --contrib            Configure for being bundled inside another project
126
  --disable-shared     Don't build a shared library
126
  --disable-shared     Don't build a shared library
127
  --disable-examples   Don't build the example programs
127
  --disable-examples   Don't build the example programs
128
  --disable-xslt       Don't build with xslt
128
  --enable-tests       Enable the building of test programs
129
  --enable-tests       Enable the building of test programs
129
130
130
  --xml2-config file   Run file to get info about libxml2 [xml2-config]
131
  --xml2-config file   Run file to get info about libxml2 [xml2-config]
Lines 405-416 Link Here
405
	print STDERR "\n**** hey, I can't cd into my src/$src_sub_dir directory: $!\n";
406
	print STDERR "\n**** hey, I can't cd into my src/$src_sub_dir directory: $!\n";
406
	exit 1;
407
	exit 1;
407
    }
408
    }
408
409
    my $extra_flags = "--shared-lib $libname --major $xmlwrapp_mjr" unless $clo{'disable-shared'};
409
    my $extra_flags = "--shared-lib $libname --major $xmlwrapp_mjr" unless $clo{'disable-shared'};
410
    $extra_flags = "$extra_flags --linkwith xslt" unless $clo{'disable-xslt'};
410
    foreach my $dir (@external_incs) { $extra_flags .= " --include $dir"; }
411
    foreach my $dir (@external_incs) { $extra_flags .= " --include $dir"; }
411
412
412
    print "Creating src/$src_sub_dir/Makefile ...\n";
413
    print "Creating src/$src_sub_dir/Makefile ...\n";
413
    system("$^X $mkmf $mkmf_flags --static-lib $libname $extra_flags *.cxx");
414
    system("$^X $mkmf $mkmf_flags --static-lib $libname --linkwith xml2 $extra_flags *.cxx");
414
    chdir($cwd);
415
    chdir($cwd);
415
416
416
    ##
417
    ##
Lines 420-430 Link Here
420
	exit 1;
421
	exit 1;
421
    }
422
    }
422
423
423
    my $extra_flags = "--shared-lib $xslt_libname --major $xsltwrapp_mjr" unless $clo{'disable-shared'};
424
    my $extra_flags = "--shared-lib $xslt_libname --major $xsltwrapp_mjr --linkwith $cwd${dirsep}src${dirsep}$xslt_sub_dir,$libname" unless $clo{'disable-shared'};
424
    foreach my $dir (@external_incs) { $extra_flags .= " --include $dir"; }
425
    foreach my $dir (@external_incs) { $extra_flags .= " --include $dir"; }
425
426
426
    print "Creating src/$xslt_sub_dir/Makefile ...\n";
427
    print "Creating src/$xslt_sub_dir/Makefile ...\n";
427
    system("$^X $mkmf $mkmf_flags --static-lib $xslt_libname $extra_flags *.cxx");
428
    system("$^X $mkmf $mkmf_flags --static-lib $xslt_libname --linkwith xslt --linkwith exslt $extra_flags *.cxx");
428
    chdir($cwd);
429
    chdir($cwd);
429
}
430
}
430
################################################################################
431
################################################################################
(-)xmlwrapp-0.5.0.orig/tools/mkmf (-2 / +2 lines)
Lines 234-244 Link Here
234
    }
234
    }
235
235
236
    $lib = $static_lib_prefix . $lib . $static_lib_extension;
236
    $lib = $static_lib_prefix . $lib . $static_lib_extension;
237
    addflags($ENV{'LDFLAGS'}, "'$path$lib'");
237
    addflags($ENV{'POST_LDFLAGS'}, "'$path$lib'");
238
}
238
}
239
239
240
foreach (@{$clo{'linkwith'}}) {
240
foreach (@{$clo{'linkwith'}}) {
241
    addflags($ENV{'LDFLAGS'}, `$^X $clo{'cxxflags'} --linkwith "$_"`);
241
    addflags($ENV{'POST_LDFLAGS'}, `$^X $clo{'cxxflags'} --linkwith "$_"`);
242
}
242
}
243
243
244
foreach (@{$clo{'include'}}) {
244
foreach (@{$clo{'include'}}) {

Return to bug 257918