diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2010-07-22 16:06:59 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2010-07-22 16:06:59 +0000 |
| commit | c3905b3d615d72051cac5d8e1399e706ccfca394 (patch) | |
| tree | b6633d999f0e74f350e22ed3b250e713011536b6 | |
| parent | Add emerge-webrsync patch to use a redundant mirror (diff) | |
| download | prefix-c3905b3d615d72051cac5d8e1399e706ccfca394.tar.gz prefix-c3905b3d615d72051cac5d8e1399e706ccfca394.tar.bz2 prefix-c3905b3d615d72051cac5d8e1399e706ccfca394.zip | |
drop AIX patch to transition to new library style, thanks XU Benda on gentoo-alt ML
(Portage version: 2.2.01.15395-prefix/svn/Darwin powerpc)
| -rw-r--r-- | app-arch/bzip2/Manifest | 3 | ||||
| -rw-r--r-- | app-arch/bzip2/bzip2-1.0.5-r1.ebuild | 3 | ||||
| -rw-r--r-- | app-arch/bzip2/files/bzip2-1.0.5-aix.patch | 20 |
3 files changed, 2 insertions, 24 deletions
diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest index 33a492594e..df0976a0d1 100644 --- a/app-arch/bzip2/Manifest +++ b/app-arch/bzip2/Manifest @@ -6,10 +6,9 @@ AUX bzip2-1.0.4-man-links.patch 413 RMD160 ce3b8ae5b5c87024c959b95ace2868930a4eb AUX bzip2-1.0.4-prefix.patch 1708 RMD160 a1f9ae9ce73bf6e07f49952514f173a77706c23d SHA1 77cca68acaf650a8858b4e15d36c9369f820b9e5 SHA256 a5a90036dc6df99338cfa1d47ed58bf83b46fcbde8e8a01a26a99a82c83839b5 AUX bzip2-1.0.4-saneso.patch 439 RMD160 3ac613223c1cd57023cae7b60d236452be87161f SHA1 20dd82b41420b42f612b8a8c419df1463b353e69 SHA256 a3c343536f0292017d11f453f19f2afc4118de20b9200fcca83d1c641821b8e9 AUX bzip2-1.0.5-Makefile-libbz2_dylib 1762 RMD160 840cc10b7288f58e600294dcc4838f6b5677fd5d SHA1 e7537bdd9e5ec4a2c76ace37196a735c7b0d96b0 SHA256 2faed340d874e8fda2d6d00158501f7beb6fb47968c0514fe78ade4f8bca17aa -AUX bzip2-1.0.5-aix.patch 659 RMD160 8fc909e095b00953a3b8dd36591c605920c02086 SHA1 2e52531b13f9e0aeb3284af210123300b8a37999 SHA256 1cd756bf404c81875c4b89433816e4a195dbf4be21a56ffb9df4d4c5aace1b6c AUX bzip2-1.0.5-checkenv.patch 823 RMD160 1d5580a49a167b8c266631ce5f27d43835f47b29 SHA1 2b636bf6c5ad2e1562b0d95ca54e2d51d8c6ddf0 SHA256 13d4f7c38523416d124ba8c6519f31d4f9bd633dca7325e3b78f8bfbc29ecc1e AUX bzip2-1.0.5-soldflags.patch 1055 RMD160 15ba6d1d1d00393eca7b26d1de83f9dec9b2d5d1 SHA1 c67807ae713ae6e574f3ca60f59e06cd0f52c732 SHA256 76060539c08dea7e7276b1651f5a034caf672ce517c574076b17131d41ce0845 DIST bzip2-1.0.5.tar.gz 841402 RMD160 2b31a22138e3914d82a656fee28e2bf029cbc3d4 SHA1 8b02713ea0c8eb501cc8bdac4432d7f29700f767 SHA256 f7bf5368309d76e5daf3a89d4d1bea688dac7780742e7a0ae1af19be9316fe22 -EBUILD bzip2-1.0.5-r1.ebuild 4285 RMD160 ecd4d0510e29768580a0f9464b4f20e1542470ad SHA1 e9e7aaedc0be54d6bfad46b480a305b8a69e9e52 SHA256 46bfdcab3bb9c85ac1a30b3285ea736addff43402d76f4a4d764468148a0bc65 +EBUILD bzip2-1.0.5-r1.ebuild 4199 RMD160 9727969d84e998d934994bf4893b221c97621ab3 SHA1 f071acaef869d48b075eab1cf4b6087b8dc47799 SHA256 953a922868bdf39ef2ed36f4566ae8f62338456195fce81d2b460eb870e45afd MISC ChangeLog 12151 RMD160 70f6481ae6e2a03b8cb45ca1f2cfeda66b64f09a SHA1 577b4762d04ce4a7962fde17a221bf7dd8d0917b SHA256 cd4d4813d651c6d1a8176c502693ab83deb745aabce319101128a4be8410e167 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 diff --git a/app-arch/bzip2/bzip2-1.0.5-r1.ebuild b/app-arch/bzip2/bzip2-1.0.5-r1.ebuild index a457dde7a2..e2a4b6d0af 100644 --- a/app-arch/bzip2/bzip2-1.0.5-r1.ebuild +++ b/app-arch/bzip2/bzip2-1.0.5-r1.ebuild @@ -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 --git a/app-arch/bzip2/files/bzip2-1.0.5-aix.patch b/app-arch/bzip2/files/bzip2-1.0.5-aix.patch deleted file mode 100644 index a69c6474bb..0000000000 --- a/app-arch/bzip2/files/bzip2-1.0.5-aix.patch +++ /dev/null @@ -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 |