diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2008-12-15 22:09:28 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2008-12-15 22:09:28 +0000 |
| commit | ce10b04ef6f842572d1e4ead5c976e1a04e7f52e (patch) | |
| tree | 2b201a6d2c0a1c09303d0158fd73e85bdd0d34e5 /app-admin/analog/files | |
| parent | Fix building w/ gcc-4.3, #250684 (diff) | |
| download | gentoo-2-ce10b04ef6f842572d1e4ead5c976e1a04e7f52e.tar.gz gentoo-2-ce10b04ef6f842572d1e4ead5c976e1a04e7f52e.tar.bz2 gentoo-2-ce10b04ef6f842572d1e4ead5c976e1a04e7f52e.zip | |
Fix ${S}. Do not build bzip2/ or link to it (still bug #249140).
(Portage version: 2.2_rc17/cvs/Linux 2.6.25-gentoo-r7-JeR i686)
Diffstat (limited to 'app-admin/analog/files')
| -rw-r--r-- | app-admin/analog/files/analog-6.0-bzip2.patch | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/app-admin/analog/files/analog-6.0-bzip2.patch b/app-admin/analog/files/analog-6.0-bzip2.patch index 5a0c23d7da48..30ec4ae8461e 100644 --- a/app-admin/analog/files/analog-6.0-bzip2.patch +++ b/app-admin/analog/files/analog-6.0-bzip2.patch @@ -3,7 +3,7 @@ Use system bzip2 library. Get CC and CFLAGS from environment. --- analog-6.0/src/Makefile.orig 2004-12-19 14:51:30.000000000 +0100 -+++ analog-6.0/src/Makefile 2008-12-15 07:34:09.000000000 +0100 ++++ analog-6.0/src/Makefile 2008-12-15 22:50:04.000000000 +0100 @@ -2,16 +2,16 @@ # Please read docs/Readme.html, or http://www.analog.cx/ # This is a general Unix-like Makefile: Makefiles for other OS's can be found @@ -33,3 +33,32 @@ Use system bzip2 library. Get CC and CFLAGS from environment. # need -lm LAST # if you defined HAVE_GD above you also need -lgd -lpng -ljpeg -lz # if you defined HAVE_ZLIB above you also need -lz +@@ -54,7 +54,7 @@ + input.o macinput.o macstuff.o output.o output2.o outcro.o outhtml.o \ + outlatex.o outplain.o outxhtml.o outxml.o process.o settings.o sort.o \ + tree.o utils.o win32.o +-SUBDIRS = bzip2 libgd libpng pcre unzip zlib ++SUBDIRS = libgd libpng pcre unzip zlib + SUBDIROBJS = libgd/gd.o libgd/gd_io.o libgd/gd_io_file.o libgd/gd_png.o \ + libgd/gdfontf.o libgd/gdfonts.o libgd/gdtables.o \ + libpng/png.o libpng/pngerror.o libpng/pngmem.o libpng/pngset.o \ +@@ -63,9 +63,7 @@ + zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o \ + zlib/gzio.o zlib/infblock.o zlib/infcodes.o zlib/inffast.o \ + zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/trees.o \ +- zlib/uncompr.o zlib/zutil.o unzip/ioapi.o unzip/unzip.o \ +- bzip2/bzlib.o bzip2/blocksort.o bzip2/compress.o bzip2/crctable.o \ +- bzip2/decompress.o bzip2/huffman.o bzip2/randtable.o ++ zlib/uncompr.o zlib/zutil.o unzip/ioapi.o unzip/unzip.o + HEADERS = anlghead.h anlghea2.h anlghea3.h anlghea4.h macdir.h \ + pcre/pcre.h libgd/gd.h libgd/gdfontf.h libgd/gdfonts.h unzip/unzip.h \ + zlib/zlib.h bzip2/bzlib.h +@@ -77,8 +75,6 @@ + + # There doesn't seem to be a good way to write all these rules in a generic + # form that works for all "make" programs +-bzip2: ALWAYS +- cd bzip2 && $(MAKE) 'CC=$(CC)' 'ALLCFLAGS=$(ALLCFLAGS)' + + libgd: ALWAYS + cd libgd && $(MAKE) 'CC=$(CC)' 'ALLCFLAGS=$(ALLCFLAGS)' |