From 43f23f4886c0bfec7dd7f773638b98988aaf98e6 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 14 Jan 2022 20:12:20 +0100 Subject: [PATCH] app-arch/bzip2: Add from gentoo It's from gentoo commit 38b155fa1bf907617067c98eb4ba3a5d0790eb1a. --- .../portage-stable/app-arch/bzip2/Manifest | 1 + .../app-arch/bzip2/bzip2-1.0.8-r1.ebuild | 122 +++++++++++++ .../app-arch/bzip2/bzip2-9999.ebuild | 66 +++++++ .../bzip2/files/bzip2-1.0.3-no-test.patch | 9 + .../files/bzip2-1.0.4-makefile-CFLAGS.patch | 25 +++ .../bzip2/files/bzip2-1.0.4-man-links.patch | 12 ++ .../bzip2/files/bzip2-1.0.6-progress.patch | 163 ++++++++++++++++++ .../bzip2/files/bzip2-1.0.8-mingw.patch | 16 ++ .../files/bzip2-1.0.8-out-of-tree-build.patch | 76 ++++++++ .../bzip2/files/bzip2-1.0.8-saneso.patch | 13 ++ .../app-arch/bzip2/metadata.xml | 11 ++ 11 files changed, 514 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/app-arch/bzip2/Manifest create mode 100644 sdk_container/src/third_party/portage-stable/app-arch/bzip2/bzip2-1.0.8-r1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/app-arch/bzip2/bzip2-9999.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/app-arch/bzip2/files/bzip2-1.0.3-no-test.patch create mode 100644 sdk_container/src/third_party/portage-stable/app-arch/bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch create mode 100644 sdk_container/src/third_party/portage-stable/app-arch/bzip2/files/bzip2-1.0.4-man-links.patch create mode 100644 sdk_container/src/third_party/portage-stable/app-arch/bzip2/files/bzip2-1.0.6-progress.patch create mode 100644 sdk_container/src/third_party/portage-stable/app-arch/bzip2/files/bzip2-1.0.8-mingw.patch create mode 100644 sdk_container/src/third_party/portage-stable/app-arch/bzip2/files/bzip2-1.0.8-out-of-tree-build.patch create mode 100644 sdk_container/src/third_party/portage-stable/app-arch/bzip2/files/bzip2-1.0.8-saneso.patch create mode 100644 sdk_container/src/third_party/portage-stable/app-arch/bzip2/metadata.xml diff --git a/sdk_container/src/third_party/portage-stable/app-arch/bzip2/Manifest b/sdk_container/src/third_party/portage-stable/app-arch/bzip2/Manifest new file mode 100644 index 0000000000..a4b18f5d5b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-arch/bzip2/Manifest @@ -0,0 +1 @@ +DIST bzip2-1.0.8.tar.gz 810029 BLAKE2B 22ab3acd84f4db8c3d6f59340c252faedfd4447cea00dafbd652e65b6cf8a20adf6835c22e58563004cfafdb15348c924996230b4b23cae42da5e25eeac4bdad SHA512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3 diff --git a/sdk_container/src/third_party/portage-stable/app-arch/bzip2/bzip2-1.0.8-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/bzip2/bzip2-1.0.8-r1.ebuild new file mode 100644 index 0000000000..49d36f93d6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-arch/bzip2/bzip2-1.0.8-r1.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly +# (since we're building shared libs) ... + +EAPI=7 + +inherit toolchain-funcs multilib-minimal usr-ldscript + +DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux" +HOMEPAGE="https://sourceware.org/bzip2/" +SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz" + +LICENSE="BZIP2" +SLOT="0/1" # subslot = SONAME +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="static static-libs" + +PATCHES=( + "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch + "${FILESDIR}"/${PN}-1.0.8-saneso.patch + "${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986 + "${FILESDIR}"/${PN}-1.0.6-progress.patch + "${FILESDIR}"/${PN}-1.0.3-no-test.patch + "${FILESDIR}"/${PN}-1.0.8-mingw.patch #393573 + "${FILESDIR}"/${PN}-1.0.8-out-of-tree-build.patch +) + +DOCS=( CHANGES README{,.COMPILATION.PROBLEMS,.XML.STUFF} manual.pdf ) +HTML_DOCS=( manual.html ) + +src_prepare() { + default + + # - Use right man path + # - Generate symlinks instead of hardlinks + # - pass custom variables to control libdir + sed -i \ + -e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \ + -e 's:ln -s -f $(PREFIX)/bin/:ln -s -f :' \ + -e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \ + Makefile || die +} + +bemake() { + emake \ + VPATH="${S}" \ + CC="$(tc-getCC)" \ + AR="$(tc-getAR)" \ + RANLIB="$(tc-getRANLIB)" \ + "$@" +} + +multilib_src_compile() { + bemake -f "${S}"/Makefile-libbz2_so all + # Make sure we link against the shared lib #504648 + ln -s libbz2.so.${PV} libbz2.so || die + bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static '')" +} + +multilib_src_install() { + into /usr + + # Install the shared lib manually. We install: + # .x.x.x - standard shared lib behavior + # .x.x - SONAME some distros use #338321 + # .x - SONAME Gentoo uses + dolib.so libbz2.so.${PV} + local v + for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do + dosym libbz2.so.${PV} /usr/$(get_libdir)/${v} + done + + # Install libbz2.so.1.0 due to accidental soname change in 1.0.7. + # Reference: 98da0ad82192d21ad74ae52366ea8466e2acea24. + # OK to remove one year after 2020-04-11. + if [[ ! -L "${ED}/usr/$(get_libdir)/libbz2.so.1.0" ]]; then + dosym libbz2.so.${PV} "/usr/$(get_libdir)/libbz2.so.1.0" + fi + + use static-libs && dolib.a libbz2.a + + if multilib_is_native_abi ; then + gen_usr_ldscript -a bz2 + + dobin bzip2recover + into / + dobin bzip2 + fi +} + +multilib_src_install_all() { + # `make install` doesn't cope with out-of-tree builds, nor with + # installing just non-binaries, so handle things ourselves. + insinto /usr/include + doins bzlib.h + into /usr + dobin bz{diff,grep,more} + doman *.1 + + dosym bzdiff /usr/bin/bzcmp + dosym bzdiff.1 /usr/share/man/man1/bzcmp.1 + + dosym bzmore /usr/bin/bzless + dosym bzmore.1 /usr/share/man/man1/bzless.1 + + local x + for x in bunzip2 bzcat bzip2recover ; do + dosym bzip2.1 /usr/share/man/man1/${x}.1 + done + for x in bz{e,f}grep ; do + dosym bzgrep /usr/bin/${x} + dosym bzgrep.1 /usr/share/man/man1/${x}.1 + done + + einstalldocs + + # move "important" bzip2 binaries to /bin and use the shared libbz2.so + dosym bzip2 /bin/bzcat + dosym bzip2 /bin/bunzip2 +} diff --git a/sdk_container/src/third_party/portage-stable/app-arch/bzip2/bzip2-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/bzip2/bzip2-9999.ebuild new file mode 100644 index 0000000000..a5f4b823c2 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-arch/bzip2/bzip2-9999.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson-multilib usr-ldscript + +DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux" +HOMEPAGE="https://gitlab.com/federicomenaquintero/bzip2" +if [[ "${PV}" == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/federicomenaquintero/bzip2.git" +else + SRC_URI="" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi +LICENSE="BZIP2" +SLOT="0/1" # subslot = SONAME + +IUSE="static-libs" + +multilib_src_configure() { + local emesonargs=( + -Ddefault_library=$(usex static-libs both shared) + # Requires whole tex stack + -Ddocs="disabled" + ) + + meson_src_configure +} + +multilib_src_install() { + meson_src_install + + # Install libbz2.so.1.0 due to accidental soname change in 1.0.7. + # Reference: 98da0ad82192d21ad74ae52366ea8466e2acea24. + # OK to remove one year after 2020-04-11. + if [[ ! -L "${ED}/usr/$(get_libdir)/libbz2.so.1.0" ]]; then + dosym libbz2.so.1 "/usr/$(get_libdir)/libbz2.so.1.0" + fi + + if multilib_is_native_abi ; then + gen_usr_ldscript -a bz2 + + dodir /bin + mv "${ED}"/usr/bin/bzip2 "${ED}"/bin || die + fi +} + +multilib_src_install_all() { + # move "important" bzip2 binaries to /bin and use the shared libbz2.so + dosym bzip2 /bin/bzcat + dosym bzip2 /bin/bunzip2 + + dosym bzdiff /usr/bin/bzcmp + dosym bzmore /usr/bin/bzless + local x + for x in bz{e,f}grep ; do + dosym bzgrep /usr/bin/${x} + done + + dosym bzip2.1 /usr/share/man/man1/bzip2recover.1 + + local DOCS=( AUTHORS NEWS{,-pre-1.0.7} README.md ) + einstalldocs +} diff --git a/sdk_container/src/third_party/portage-stable/app-arch/bzip2/files/bzip2-1.0.3-no-test.patch b/sdk_container/src/third_party/portage-stable/app-arch/bzip2/files/bzip2-1.0.3-no-test.patch new file mode 100644 index 0000000000..9e554f7951 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-arch/bzip2/files/bzip2-1.0.3-no-test.patch @@ -0,0 +1,9 @@ +--- a/Makefile ++++ b/Makefile +@@ -23,5 +23,5 @@ + bzlib.o + +-all: libbz2.a bzip2 bzip2recover test ++all: libbz2.a bzip2 bzip2recover + + bzip2: libbz2.a bzip2.o diff --git a/sdk_container/src/third_party/portage-stable/app-arch/bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch b/sdk_container/src/third_party/portage-stable/app-arch/bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch new file mode 100644 index 0000000000..04bd0d9abd --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-arch/bzip2/files/bzip2-1.0.4-makefile-CFLAGS.patch @@ -0,0 +1,25 @@ +--- a/Makefile ++++ b/Makefile +@@ -18,10 +18,9 @@ + CC=gcc + AR=ar + RANLIB=ranlib +-LDFLAGS= + + BIGFILES=-D_FILE_OFFSET_BITS=64 +-CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) ++CFLAGS+=-Wall -Winline $(BIGFILES) $(CPPFLAGS) + + # Where you want it installed when you do 'make install' + PREFIX=/usr/local +--- a/Makefile-libbz2_so ++++ b/Makefile-libbz2_so +@@ -24,7 +24,7 @@ + SHELL=/bin/sh + CC=gcc + BIGFILES=-D_FILE_OFFSET_BITS=64 +-CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) ++CFLAGS+=-fpic -fPIC -Wall -Winline $(BIGFILES) $(CPPFLAGS) + + OBJS= blocksort.o \ + huffman.o \ diff --git a/sdk_container/src/third_party/portage-stable/app-arch/bzip2/files/bzip2-1.0.4-man-links.patch b/sdk_container/src/third_party/portage-stable/app-arch/bzip2/files/bzip2-1.0.4-man-links.patch new file mode 100644 index 0000000000..deaa981adc --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-arch/bzip2/files/bzip2-1.0.4-man-links.patch @@ -0,0 +1,12 @@ +http://bugs.gentoo.org/172986 + +--- a/Makefile ++++ b/Makefile +@@ -85,4 +85,7 @@ + cp -f bzip2.1 $(PREFIX)/share/man/man1 + chmod a+r $(PREFIX)/share/man/man1/bzip2.1 ++ ln -s -f bzip2.1 $(PREFIX)/share/man/man1/bunzip2.1 ++ ln -s -f bzip2.1 $(PREFIX)/share/man/man1/bzcat.1 ++ ln -s -f bzip2.1 $(PREFIX)/share/man/man1/bzip2recover.1 + cp -f bzlib.h $(PREFIX)/include + chmod a+r $(PREFIX)/include/bzlib.h diff --git a/sdk_container/src/third_party/portage-stable/app-arch/bzip2/files/bzip2-1.0.6-progress.patch b/sdk_container/src/third_party/portage-stable/app-arch/bzip2/files/bzip2-1.0.6-progress.patch new file mode 100644 index 0000000000..8369597714 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-arch/bzip2/files/bzip2-1.0.6-progress.patch @@ -0,0 +1,163 @@ +Ripped from Mandrake + +http://bugs.gentoo.org/82192 + +--- a/bzip2.1 ++++ b/bzip2.1 +@@ -235,6 +235,10 @@ + Suppress non-essential warning messages. Messages pertaining to + I/O errors and other critical events will not be suppressed. + .TP ++.B \-p \-\-show\-progress ++Show percentage of input\-file done and while compressing show the percentage ++of the original file the new file is. ++.TP + .B \-v --verbose + Verbose mode -- show the compression ratio for each file processed. + Further \-v's increase the verbosity level, spewing out lots of +--- a/bzip2.c ++++ b/bzip2.c +@@ -145,6 +145,7 @@ + #include + #include + #include ++#include + #include + #include "bzlib.h" + +@@ -301,6 +302,7 @@ + Char progNameReally[FILE_NAME_LEN]; + FILE *outputHandleJustInCase; + Int32 workFactor; ++Char showProgress; + + static void panic ( Char* ) NORETURN; + static void ioError ( void ) NORETURN; +@@ -425,6 +427,12 @@ + UInt32 nbytes_in_lo32, nbytes_in_hi32; + UInt32 nbytes_out_lo32, nbytes_out_hi32; + Int32 bzerr, bzerr_dummy, ret; ++ double fileSize = 0; /* initialized to make the compiler stop crying */ ++ /* double because big files might otherwhise give ++ * overflows. not long long since not all compilers ++ * support that one ++ */ ++ time_t startTime, currentTime; + + SET_BINARY_MODE(stream); + SET_BINARY_MODE(zStream); +@@ -432,12 +440,21 @@ + if (ferror(stream)) goto errhandler_io; + if (ferror(zStream)) goto errhandler_io; + ++ if ((srcMode == SM_F2F || srcMode == SM_F2O) && showProgress == True) { ++ (void)fseek(stream, 0, SEEK_END); ++ fileSize = ftello(stream); ++ rewind(stream); ++ if (verbosity >= 1) ++ fprintf(stderr, "Input-file size: %ld\n", (long)fileSize); ++ } ++ + bzf = BZ2_bzWriteOpen ( &bzerr, zStream, + blockSize100k, verbosity, workFactor ); + if (bzerr != BZ_OK) goto errhandler; + + if (verbosity >= 2) fprintf ( stderr, "\n" ); + ++ time(&startTime); + while (True) { + + if (myfeof(stream)) break; +@@ -446,6 +463,22 @@ + if (nIbuf > 0) BZ2_bzWrite ( &bzerr, bzf, (void*)ibuf, nIbuf ); + if (bzerr != BZ_OK) goto errhandler; + ++ if ((srcMode == SM_F2F || srcMode == SM_F2O) && showProgress == True) { ++ time(¤tTime); ++ ++ if ((currentTime - startTime) > 1) { /* show progress every 2 seconds */ ++ double curInPos = ftello(stream); ++ double curOutPos = ftello(zStream); ++ ++ startTime = currentTime; ++ ++ fprintf(stderr, "%.2f%% done", (curInPos * 100.0) / fileSize); ++ if (srcMode == SM_F2F) ++ fprintf(stderr, ", new size: %.2f%%", (curOutPos * 100.0) / curInPos); ++ ++ fprintf(stderr, " \r"); ++ } ++ } + } + + BZ2_bzWriteClose64 ( &bzerr, bzf, 0, +@@ -526,6 +559,8 @@ + UChar unused[BZ_MAX_UNUSED]; + Int32 nUnused; + UChar* unusedTmp; ++ double fileSize = 0; /* initialized to make the compiler stop crying */ ++ time_t startTime, currentTime; + + nUnused = 0; + streamNo = 0; +@@ -533,9 +568,19 @@ + SET_BINARY_MODE(stream); + SET_BINARY_MODE(zStream); + ++ if ((srcMode == SM_F2F || srcMode == SM_F2O) && showProgress == True) { ++ off_t dummy = ftello(zStream); ++ (void)fseeko(zStream, 0, SEEK_END); ++ fileSize = ftello(zStream); ++ (void)fseeko(zStream, dummy, SEEK_SET); ++ if (verbosity >= 1) ++ fprintf(stderr, "Input-file size: %ld\n", (long)fileSize); ++ } ++ + if (ferror(stream)) goto errhandler_io; + if (ferror(zStream)) goto errhandler_io; + ++ time(&startTime); + while (True) { + + bzf = BZ2_bzReadOpen ( +@@ -551,6 +596,16 @@ + if ((bzerr == BZ_OK || bzerr == BZ_STREAM_END) && nread > 0) + fwrite ( obuf, sizeof(UChar), nread, stream ); + if (ferror(stream)) goto errhandler_io; ++ ++ if ((srcMode == SM_F2F || srcMode == SM_F2O) && showProgress == True) { ++ time(¤tTime); ++ if ((currentTime - startTime) >= 2) { ++ double curInPos = ftello(zStream); ++ startTime = currentTime; ++ ++ fprintf(stderr, "%.2f%% done\r", (curInPos * 100.0) / fileSize); ++ } ++ } + } + if (bzerr != BZ_STREAM_END) goto errhandler; + +@@ -1872,6 +1927,7 @@ + deleteOutputOnInterrupt = False; + exitValue = 0; + i = j = 0; /* avoid bogus warning from egcs-1.1.X */ ++ showProgress = False; + + /*-- Set up signal handlers for mem access errors --*/ + signal (SIGSEGV, mySIGSEGVorSIGBUScatcher); +@@ -1949,6 +2005,7 @@ + case 'k': keepInputFiles = True; break; + case 's': smallMode = True; break; + case 'q': noisy = False; break; ++ case 'p': showProgress = True; break; + case '1': blockSize100k = 1; break; + case '2': blockSize100k = 2; break; + case '3': blockSize100k = 3; break; +@@ -1985,6 +2042,7 @@ + if (ISFLAG("--keep")) keepInputFiles = True; else + if (ISFLAG("--small")) smallMode = True; else + if (ISFLAG("--quiet")) noisy = False; else ++ if (ISFLAG("--show-progress")) showProgress = True; else + if (ISFLAG("--version")) license(); else + if (ISFLAG("--license")) license(); else + if (ISFLAG("--exponential")) workFactor = 1; else diff --git a/sdk_container/src/third_party/portage-stable/app-arch/bzip2/files/bzip2-1.0.8-mingw.patch b/sdk_container/src/third_party/portage-stable/app-arch/bzip2/files/bzip2-1.0.8-mingw.patch new file mode 100644 index 0000000000..b512a8f466 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-arch/bzip2/files/bzip2-1.0.8-mingw.patch @@ -0,0 +1,16 @@ +make it build for mingw targets + +https://bugs.gentoo.org/393573 + +--- a/bzlib.h ++++ b/bzlib.h +@@ -81,6 +81,9 @@ typedef + /* windows.h define small to char */ + # undef small + # endif ++# ifndef WINAPI ++# define WINAPI ++# endif + # ifdef BZ_EXPORT + # define BZ_API(func) WINAPI func + # define BZ_EXTERN extern diff --git a/sdk_container/src/third_party/portage-stable/app-arch/bzip2/files/bzip2-1.0.8-out-of-tree-build.patch b/sdk_container/src/third_party/portage-stable/app-arch/bzip2/files/bzip2-1.0.8-out-of-tree-build.patch new file mode 100644 index 0000000000..04818265b7 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-arch/bzip2/files/bzip2-1.0.8-out-of-tree-build.patch @@ -0,0 +1,76 @@ +--- bzip2-1.0.8/Makefile ++++ bzip2-1.0.8/Makefile +@@ -54,7 +54,6 @@ + + check: test + test: bzip2 +- @cat words1 + ./bzip2 -1 < sample1.ref > sample1.rb2 + ./bzip2 -2 < sample2.ref > sample2.rb2 + ./bzip2 -3 < sample3.ref > sample3.rb2 +@@ -67,7 +66,6 @@ + cmp sample1.tst sample1.ref + cmp sample2.tst sample2.ref + cmp sample3.tst sample3.ref +- @cat words3 + + install: bzip2 bzip2recover + if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi +@@ -113,25 +111,8 @@ + sample1.rb2 sample2.rb2 sample3.rb2 \ + sample1.tst sample2.tst sample3.tst + +-blocksort.o: blocksort.c +- @cat words0 +- $(CC) $(CFLAGS) -c blocksort.c +-huffman.o: huffman.c +- $(CC) $(CFLAGS) -c huffman.c +-crctable.o: crctable.c +- $(CC) $(CFLAGS) -c crctable.c +-randtable.o: randtable.c +- $(CC) $(CFLAGS) -c randtable.c +-compress.o: compress.c +- $(CC) $(CFLAGS) -c compress.c +-decompress.o: decompress.c +- $(CC) $(CFLAGS) -c decompress.c +-bzlib.o: bzlib.c +- $(CC) $(CFLAGS) -c bzlib.c +-bzip2.o: bzip2.c +- $(CC) $(CFLAGS) -c bzip2.c +-bzip2recover.o: bzip2recover.c +- $(CC) $(CFLAGS) -c bzip2recover.c ++%.o: %.c ++ $(CC) $(CFLAGS) -c $< + + + distclean: clean +--- bzip2-1.0.8/Makefile-libbz2_so ++++ bzip2-1.0.8/Makefile-libbz2_so +@@ -36,24 +36,10 @@ + + all: $(OBJS) + $(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.8 $(OBJS) +- $(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8 +- rm -f libbz2.so.1.0 +- ln -s libbz2.so.1.0.8 libbz2.so.1.0 ++ ln -sf libbz2.so.1.0.8 libbz2.so.1.0 + + clean: + rm -f $(OBJS) bzip2.o libbz2.so.1.0.8 libbz2.so.1.0 bzip2-shared + +-blocksort.o: blocksort.c +- $(CC) $(CFLAGS) -c blocksort.c +-huffman.o: huffman.c +- $(CC) $(CFLAGS) -c huffman.c +-crctable.o: crctable.c +- $(CC) $(CFLAGS) -c crctable.c +-randtable.o: randtable.c +- $(CC) $(CFLAGS) -c randtable.c +-compress.o: compress.c +- $(CC) $(CFLAGS) -c compress.c +-decompress.o: decompress.c +- $(CC) $(CFLAGS) -c decompress.c +-bzlib.o: bzlib.c +- $(CC) $(CFLAGS) -c bzlib.c ++%.o: %.c ++ $(CC) $(CFLAGS) -c $< diff --git a/sdk_container/src/third_party/portage-stable/app-arch/bzip2/files/bzip2-1.0.8-saneso.patch b/sdk_container/src/third_party/portage-stable/app-arch/bzip2/files/bzip2-1.0.8-saneso.patch new file mode 100644 index 0000000000..63409f5a85 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-arch/bzip2/files/bzip2-1.0.8-saneso.patch @@ -0,0 +1,13 @@ +--- bzip2-1.0.8/Makefile-libbz2_so ++++ bzip2-1.0.8/Makefile-libbz2_so +@@ -35,8 +35,8 @@ + bzlib.o + + all: $(OBJS) +- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS) +- $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8 ++ $(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.8 $(OBJS) ++ $(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8 + rm -f libbz2.so.1.0 + ln -s libbz2.so.1.0.8 libbz2.so.1.0 + diff --git a/sdk_container/src/third_party/portage-stable/app-arch/bzip2/metadata.xml b/sdk_container/src/third_party/portage-stable/app-arch/bzip2/metadata.xml new file mode 100644 index 0000000000..87e613c2ed --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-arch/bzip2/metadata.xml @@ -0,0 +1,11 @@ + + + + + base-system@gentoo.org + Gentoo Base System + + + cpe:/a:bzip:bzip2 + +