Re: [gentoo-alt] bzip2 patch on AIX for library style transition

[Fabian Groffen]

Hi XU,

Can you please report bugs for these patches (also the perl one) in our
bugzilla?  I have no problem with mails here per se, but I'm affraid
that your valuable patches may get lost this way...


On 21-07-2010 02:47:17 +0900, heroxbd@×××××.com wrote:
> Dear guys,
>
> I have attached the patch for bzip2 on AIX for use with the new library
> style decided by haubi in May 2010.
>
> Current bzip2 ebuild on AIX gives error like "libbz2.so.1.0.5 not exist"
> from dolib.so.
>
> references:
>
> 1. http://bugs.gentoo.org/show_bug.cgi?id=213277
> 2. http://dev.gentoo.org/~haubi/aixrtl.txt
> 3. http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/eclass/multilib.eclass?r1=1.77&r2=1.78
>
> --
> XU Benda
> Research Center for Neutrino Science
> Tohoku University
> JAPAN
>
> http://www.awa.tohoku.ac.jp/~benda

> diff -Naurp /home/k/benda/local/usr/portage/app-arch/bzip2/bzip2-1.0.5-r1.ebuild /home/k/benda/local/usr/local/portage/neutrino/app-arch/bzip2/bzip2-1.0.5-r1.ebuild
> --- /home/k/benda/local/usr/portage/app-arch/bzip2/bzip2-1.0.5-r1.ebuild	2009-11-05 01:19:54 +0900
> +++ /home/k/benda/local/usr/local/portage/neutrino/app-arch/bzip2/bzip2-1.0.5-r1.ebuild	2010-07-21 02:26:57 +0900
> @@ -26,7 +26,6 @@ src_unpack() {
>  	epatch "${FILESDIR}"/${PN}-1.0.4-POSIX-shell.patch #193365
>  	epatch "${FILESDIR}"/${PN}-1.0.5-soldflags.patch # for AIX, HP-UX
>  	epatch "${FILESDIR}"/${PN}-1.0.5-checkenv.patch # for AIX, Darwin?
> -	epatch "${FILESDIR}"/${PN}-1.0.5-aix.patch # for AIX, needs checkenv, soldflags.
>  	epatch "${FILESDIR}"/${PN}-1.0.4-prefix.patch
>  	eprefixify bz{diff,grep,more}
>  	sed -i -e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' Makefile || die "sed manpath"
> @@ -74,7 +73,7 @@ src_compile() {
>  		*-aix*)
>  			# AIX has shared object libbz2.so.1 inside libbz2.a.
>  			# We build libbz2.a here to avoid static-only libbz2.a below.
> -			emake "${makeopts[@]}" SOLDFLAGS=-shared -f Makefile-libbz2_so all-aix || die "Make failed libbz2"
> +			emake "${makeopts[@]}" SOLDFLAGS=-shared -f Makefile-libbz2_so all || die "Make failed libbz2"
>  			checkopts="TESTENV=LIBPATH=."
>  		;;
>  		*)
> diff -Naurp /home/k/benda/local/usr/portage/app-arch/bzip2/files/bzip2-1.0.5-aix.patch /home/k/benda/local/usr/local/portage/neutrino/app-arch/bzip2/files/bzip2-1.0.5-aix.patch
> --- /home/k/benda/local/usr/portage/app-arch/bzip2/files/bzip2-1.0.5-aix.patch	2009-07-23 02:03:55 +0900
> +++ /home/k/benda/local/usr/local/portage/neutrino/app-arch/bzip2/files/bzip2-1.0.5-aix.patch	1970-01-01 09:00:00 +0900
> @@ -1,20 +0,0 @@
> ---- Makefile-libbz2_so.orig	2009-06-23 12:35:06.000000000 +0200
> -+++ Makefile-libbz2_so	2009-06-23 12:36:39.000000000 +0200
> -@@ -43,8 +43,17 @@
> - 	rm -f libbz2.${SOEXT}.1.0
> - 	ln -s libbz2.${SOEXT}.1.0.4 libbz2.${SOEXT}.1.0
> -
> -+# AIX has dynamic libraries packed into archive library.
> -+.PHONY: all-aix
> -+all-aix: libbz2.a
> -+libbz2.a: $(OBJS)
> -+	$(CC) $(LDFLAGS) -shared -Wl,-G -o $(SONAME) $(OBJS)
> -+	$(AR) q libbz2.a $(SONAME)
> -+	$(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.a
> -+
> - clean:
> - 	rm -f $(OBJS) bzip2.o libbz2.${SOEXT}.1.0.4 libbz2.${SOEXT}.1.0 bzip2-shared
> -+	rm -f $(SONAME) libbz2.a
> -
> - blocksort.o: blocksort.c
> - 	$(CC) $(CFLAGS) -c blocksort.c


-- 
Fabian Groffen
Gentoo on a different level