Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 256535 - style change for e2fsprogs-1.41.3-r1.ebuild
Summary: style change for e2fsprogs-1.41.3-r1.ebuild
Status: RESOLVED INVALID
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: New packages (show other bugs)
Hardware: All Linux
: High enhancement (vote)
Assignee: Gentoo's Team for Core System packages
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2009-01-27 17:01 UTC by Jeremy Olexa (darkside) (RETIRED)
Modified: 2009-01-27 23:17 UTC (History)
2 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Jeremy Olexa (darkside) (RETIRED) archtester gentoo-dev Security 2009-01-27 17:01:11 UTC
Hello,
We need a different style in the e2fsprogs ebuilds for Gentoo Prefix.

Could you please make this change in the ebuild? This is queued up in my cvs workspace if you preferred that I commit it as is. TIA.

%% cvs diff
Index: e2fsprogs-1.41.3-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.41.3-r1.ebuild,v
retrieving revision 1.1
diff -u -r1.1 e2fsprogs-1.41.3-r1.ebuild
--- e2fsprogs-1.41.3-r1.ebuild  4 Jan 2009 17:08:36 -0000       1.1
+++ e2fsprogs-1.41.3-r1.ebuild  27 Jan 2009 16:57:29 -0000
@@ -56,22 +56,21 @@
 
        # We want to use the "bsd" libraries while building on Darwin, but while
        # building on other Gentoo/*BSD we prefer elf-naming scheme.
-       local libtype
+       local myconf
        case ${CHOST} in
-               *-darwin*) libtype=bsd;;
-               *)         libtype=elf;;
+               *-darwin*) myconf="${myconf} --enable-bsd-shlibs";;
+               *)         myconf="${myconf} --enable-elf-shlibs";;
        esac
 
        econf \
                --bindir=/bin \
                --sbindir=/sbin \
-               --enable-${libtype}-shlibs \
                --with-ldopts="${LDFLAGS}" \
                $(use_enable !elibc_uclibc tls) \
                --without-included-gettext \
                $(use_enable nls) \
                $(use_enable userland_GNU fsck) \
-               || die
+               ${myconf} || die
        if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
                eerror "INTL sanity check failed, aborting build."
                eerror "Please post your ${S}/config.log file as an"
Comment 1 Tony Vroon (RETIRED) gentoo-dev 2009-01-27 19:07:36 UTC
(In reply to comment #0)
> This is queued up in my cvs
> workspace if you preferred that I commit it as is. TIA.

Approved Jeremy, please proceed with a revision bump.
Comment 2 SpanKY gentoo-dev 2009-01-27 22:09:19 UTC
umm, why ?  it results in the exact same call to econf unless i missed something.
Comment 3 Jeremy Olexa (darkside) (RETIRED) archtester gentoo-dev Security 2009-01-27 22:15:54 UTC
(In reply to comment #2)
> umm, why ?  it results in the exact same call to econf unless i missed
> something.
> 

That is correct. However for ~m68k-mint, we need to not specify any --enable-$libtype-libs - the current ebuild does not allow that. This _style_ change that I proposed will allow us to do the following:

*-darwin*) myconf="${myconf} --enable-bsd-shlibs";;
*mint*)    ;;
*)         myconf="${myconf} --enable-elf-shlibs";;

See the blocking bug 256234 for a rational if desired.
Comment 4 Alan Hourihane 2009-01-27 22:25:25 UTC
I think vapier was querying why a version bump was necessary as it doesn't change the build itself.
Comment 5 Jeremy Olexa (darkside) (RETIRED) archtester gentoo-dev Security 2009-01-27 22:49:18 UTC
(In reply to comment #4)
> I think vapier was querying why a version bump was necessary as it doesn't
> change the build itself.
> 

Its not a version bump, I have never said it was =/ This _style_ change (emphasis added for the 3rd time now) is merely so we have one line diff in Gentoo Prefix compared to a ~6-8 line diff. This matters when auto-syncing and reviewing changes..

So, I'll commit it tonight unless there is an uproar between now and then. ;)
Comment 6 SpanKY gentoo-dev 2009-01-27 23:00:25 UTC
then you should merge all the changes rather than simply mucking with the style.  i dont see the point of maintaining a change externally here.  otherwise i'll be inclined in the future to forget and change it back (after all, the ebuild was the way you want it now but i changed it to condense code a bit).

and yes, there should be no rev bump here
Comment 7 Alan Hourihane 2009-01-27 23:09:00 UTC
Cool !
Comment 8 Jeremy Olexa (darkside) (RETIRED) archtester gentoo-dev Security 2009-01-27 23:17:33 UTC
(In reply to comment #6)
> then you should merge all the changes rather than simply mucking with the
> style.  i dont see the point of maintaining a change externally here. 
> otherwise i'll be inclined in the future to forget and change it back (after
> all, the ebuild was the way you want it now but i changed it to condense code a
> bit).

Ok..if you say so. I'm going to be applying all of bug 256234 to gentoo-x86. That is, cracklib, e2fsprogs, e2fsprogs-libs as well as one patch in FILESDIR. I'll be home in ~4 hours, I'll check back then. This can be handled in bug 256234 directly. Making this bug pretty irrelevant -> INVALID. I'll CC base-system on the other bug.