| Summary: | mozconfig.eclass does not respect FEATURES=nostrip, FEATURES=splitdebug, FEATURES=test | ||
|---|---|---|---|
| Product: | Gentoo Linux | Reporter: | Ed Catmur <ed> |
| Component: | Current packages | Assignee: | Mozilla Gentoo Team <mozilla> |
| Status: | RESOLVED FIXED | ||
| Severity: | normal | ||
| Priority: | High | ||
| Version: | unspecified | ||
| Hardware: | All | ||
| OS: | Linux | ||
| Whiteboard: | |||
| Package list: | Runtime testing required: | --- | |
Seems to have been fixed some time in the last few months. |
Both mozconfig.eclass and mozconfig-2.eclass strip binaries and libraries even when "nostrip" or "splitdebug" is in FEATURES. Also, they disable tests even when "tests" is in FEATURES. if use debug; then mozconfig_annotate +debug \ --enable-debug \ --enable-tests \ --disable-reorder \ --disable-strip \ --disable-strip-libs \ --enable-debugger-info-modules=ALL_MODULES else mozconfig_annotate -debug \ --disable-debug \ --disable-tests \ --enable-reorder \ --enable-strip \ --enable-strip-libs This is how I've changed it: --- /usr/portage/eclass/mozconfig-2.eclass 2006/02/10 08:59:06 1.1 +++ /usr/portage/eclass/mozconfig-2.eclass 2006/02/10 09:53:04 @@ -46,18 +46,12 @@ mozconfig_config() { if use debug; then mozconfig_annotate +debug \ --enable-debug \ - --enable-tests \ --disable-reorder \ - --disable-strip \ - --disable-strip-libs \ --enable-debugger-info-modules=ALL_MODULES else mozconfig_annotate -debug \ --disable-debug \ - --disable-tests \ - --enable-reorder \ - --enable-strip \ - --enable-strip-libs + --enable-reorder # Currently --enable-elf-dynstr-gc only works for x86 and ppc, # thanks to Jason Wever <weeve@gentoo.org> for the fix. @@ -65,6 +59,19 @@ mozconfig_config() { mozconfig_annotate "${ARCH} optimized build" --enable-elf-dynstr-gc fi fi + + if use debug || has nostrip ${FEATURES} || has splitdebug ${FEATURES}; then + mozconfig_annotate "+debug / FEATURES=nostrip / FEATURES=splitdebug" \ + --disable-strip --disable-strip-libs + else + mozconfig_annotate "-debug" --enable-strip --enable-strip-libs + fi + + if use debug || has test ${FEATURES}; then + mozconfig_annotate "+debug / FEATURES=test" --enable-tests + else + mozconfig_annotate "-debug" --disable-tests + fi if ! use gnome; then mozconfig_annotate -gnome --disable-gnomevfs Would appreciate a fix being made soon; I don't want to get into the habit of patching the rsync.gentoo.org tree.