From f301128f7409b3f047591409c472936ec6801491 Mon Sep 17 00:00:00 2001 From: abs Date: Thu, 23 Aug 2001 00:07:18 +0000 Subject: Lets compile libtiff on sparc64, gcc 2.95.3. --- graphics/tiff/distinfo | 14 +++--- graphics/tiff/patches/patch-aa | 50 ++++++++++++---------- graphics/tiff/patches/patch-ab | 74 +++++++++----------------------- graphics/tiff/patches/patch-ac | 38 +++++------------ graphics/tiff/patches/patch-ad | 96 ++++++++++++++++++++++++++++++------------ graphics/tiff/patches/patch-ae | 44 ++++++++++--------- graphics/tiff/patches/patch-af | 38 ++++++++++++----- 7 files changed, 184 insertions(+), 170 deletions(-) (limited to 'graphics') diff --git a/graphics/tiff/distinfo b/graphics/tiff/distinfo index cc67e195398..ad71ebf1fcf 100644 --- a/graphics/tiff/distinfo +++ b/graphics/tiff/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.5 2001/05/28 02:50:24 jlam Exp $ +$NetBSD: distinfo,v 1.6 2001/08/23 00:07:18 abs Exp $ SHA1 (tiff-v3.5.5.tar.gz) = e86acf234ea5d1423ff98d6607d49b150d822075 Size (tiff-v3.5.5.tar.gz) = 900890 bytes SHA1 (libtiff-lzw-compression-kit-1.1.tar.gz) = ef9874616cdadcd717e2abd5b6a4abbc4fb247ac Size (libtiff-lzw-compression-kit-1.1.tar.gz) = 18685 bytes -SHA1 (patch-aa) = 622053a43caf20c552c31e8a9bbf00c4845682a3 -SHA1 (patch-ab) = 0cc2841a803ae4de250e2d3d5a8c51190ba7ee39 -SHA1 (patch-ac) = 593b5d3ef434f1befa74ec59acfae05dbb48d82b -SHA1 (patch-ad) = 29d528c5d18ab5f47ac74faf7fe8b8d9e23257b4 -SHA1 (patch-ae) = 2dbeeec944c356dd6f658bde895117d8d9dbd3da -SHA1 (patch-af) = efb9f0036738927c7527d318d840848fcddd3ef6 +SHA1 (patch-aa) = d76a78bc36bc0b7a5a42c5f5a9fa1cb1bc8fad3e +SHA1 (patch-ab) = 563d1d48a932d29ca377feefb473b688d3b6394f +SHA1 (patch-ac) = 8cd7083afa94916350f5ab9bddc4e12c97c3fcad +SHA1 (patch-ad) = cf443f74316678f60c9d6172094965eba451c356 +SHA1 (patch-ae) = 5b56c6430ef5ad303c396f5ec9b94c82ac605dbc +SHA1 (patch-af) = d4eda39d4f70ec55fb329666fefdaa00a7a290c5 diff --git a/graphics/tiff/patches/patch-aa b/graphics/tiff/patches/patch-aa index c939b9a533a..9008e74f72b 100644 --- a/graphics/tiff/patches/patch-aa +++ b/graphics/tiff/patches/patch-aa @@ -1,24 +1,30 @@ -$NetBSD: patch-aa,v 1.9 2001/02/27 09:45:12 skrll Exp $ +$NetBSD: patch-aa,v 1.10 2001/08/23 00:07:18 abs Exp $ ---- man/Makefile.in.orig Mon Jan 3 17:34:03 2000 -+++ man/Makefile.in Mon Jan 3 17:34:04 2000 -@@ -336,8 +336,7 @@ - ${ECHO} 'install:'; \ - for i in *.1; do \ - f=${MANAPPNAME}; \ -- ${ECHO} ' cd ..; ${INSTALL} -m 444 -F ${MAN}/${MANAPPS} \ -- -idb tiff.man.tools -src' apps/"$$i" '-O' "$$f"; \ -+ ${ECHO} ' ${BSD_INSTALL_DATA}' $$i ${MAN}/${MANAPPS}/$$f; \ - done \ - )>apps/Makefile - lib/Makefile: -@@ -348,8 +347,7 @@ - ${ECHO} 'install:'; \ - for i in *.3t; do \ - f=${MANLIBNAME}; \ -- ${ECHO} ' cd ..; ${INSTALL} -m 444 -F ${MAN}/${MANLIB} \ -- -idb tiff.man.dev -src' lib/"$$i" '-O' "$$f"; \ -+ ${ECHO} ' ${BSD_INSTALL_DATA}' $$i ${MAN}/${MANLIB}/$$f; \ - done \ - )>lib/Makefile +--- configure.orig Mon Mar 20 18:20:42 2000 ++++ configure +@@ -486,7 +486,7 @@ + checkCompiler() + { +- compiler=$1 ++ compiler="$*" + if isGNU $compiler; then + ISGCC=yes + else +@@ -512,7 +512,7 @@ + $RM dummy dummy.o + capture $compiler -o dummy ${C_ANSI} dummy.c && { + CC=$compiler; +- test -z "${CCOMPILER-}" && CCOMPILER=`findApp $compiler $PATH` ++ test -z "${CCOMPILER-}" && CCOMPILER=$compiler + test -z "${ENVOPTS-}" && ENVOPTS="${C_ANSI-}" + return 0 + } +@@ -1661,6 +1661,7 @@ + -[LR]/*) echo "$i" ;; + -L*) echo "$i" | sed 's;^-L;-L../;' ;; + -R*) echo "$i" | sed 's;^-R;-R../;' ;; ++ -W*) echo "$i" ;; + *) echo "../$i" ;; + esac + done) | tr '\012' ' ' diff --git a/graphics/tiff/patches/patch-ab b/graphics/tiff/patches/patch-ab index e8ee934af36..7ecf6943e11 100644 --- a/graphics/tiff/patches/patch-ab +++ b/graphics/tiff/patches/patch-ab @@ -1,56 +1,22 @@ -$NetBSD: patch-ab,v 1.10 2001/05/28 02:50:25 jlam Exp $ +$NetBSD: patch-ab,v 1.11 2001/08/23 00:07:18 abs Exp $ ---- libtiff/Makefile.in.orig Sun Nov 28 15:15:36 1999 -+++ libtiff/Makefile.in Sun May 27 22:19:44 2001 -@@ -35,12 +35,18 @@ - # - SHELL = @SCRIPT_SH@ - NULL = --CC = @CCOMPILER@ -+CCOMPILER = @CCOMPILER@ -+CC = ${LIBTOOL} ${CCOMPILER} - AR = @AR@ - AROPTS = @AROPTS@ - RANLIB = @RANLIB@ - INSTALL = @INSTALL@ - -+LIBJPEG = @LIBJPEG@ -+LIBGZ = @LIBGZ@ -+LIBPORT = @LIBPORT@ -+MACHLIBS = @MACHDEPLIBS@ -+ - # - # If JPEG support is to be included and the Independent JPEG - # Software distribution is not installed then DIR_JPEG must -@@ -135,7 +141,7 @@ - tif_write.o \ - tif_zip.o \ +--- html/Makefile.in.orig Mon Mar 27 17:05:55 2000 ++++ html/Makefile.in +@@ -76,8 +76,6 @@ + v3.5.1.html \ + v3.5.2.html \ + v3.5.3.html \ +- v3.5.4.html \ +- v3.5.5.html \ ${NULL} --TARGETS = libtiff.a -+TARGETS = libtiff.la - - all: ${TARGETS} - if [ @DSO@dso != nodso ]; then \ -@@ -144,9 +150,10 @@ - true; \ - fi - --libtiff.a: ${OBJS} -- ${AR} ${AROPTS} libtiff.a $? -- ${RANLIB} libtiff.a -+libtiff.la: ${OBJS} -+ ${CC} -o $@ ${OBJS:.o=.lo} -rpath @DIR_LIB@ \ -+ -version-info @DIST_MAJOR@:@DIST_MINOR@ \ -+ ${LIBJPEG} ${LIBGZ} ${LIBPORT} ${MACHLIBS} - - # - # NB: The configure script verifies that the configured -@@ -334,7 +341,7 @@ - fi - install: all installHdrs - ${INSTALL} -idb tiff.sw.dev -m 755 -dir @DIR_LIB@ -- ${INSTALL} -idb tiff.sw.dev -m 444 -F @DIR_LIB@ -O libtiff.a -+ ${LIBTOOL} ${BSD_INSTALL_DATA} libtiff.la @DIR_LIB@ - if [ @DSO@dso != nodso ]; then \ - ${MAKE} installDSO; \ - else \ + IMAGES=\ + images/back.gif \ +@@ -85,6 +83,8 @@ + images/cat.gif \ + images/cover.jpg \ + images/cramps.gif \ ++ images/dave.gif \ ++ images/info.gif \ + images/jello.jpg \ + images/jim.gif \ + images/note.gif \ diff --git a/graphics/tiff/patches/patch-ac b/graphics/tiff/patches/patch-ac index db604744e37..108e24e7b7a 100644 --- a/graphics/tiff/patches/patch-ac +++ b/graphics/tiff/patches/patch-ac @@ -1,28 +1,12 @@ -$NetBSD: patch-ac,v 1.11 2001/02/27 09:45:13 skrll Exp $ +$NetBSD: patch-ac,v 1.12 2001/08/23 00:07:18 abs Exp $ ---- tools/Makefile.in.orig Sat Mar 18 14:30:08 2000 -+++ tools/Makefile.in Sat Mar 18 14:40:14 2000 -@@ -47,10 +47,10 @@ - IPATH = -I. -I${SRCDIR} -I${LIBDIR} - CFLAGS = @ENVOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH} - # --TIFFLIB = ${DEPTH}/libtiff/libtiff.@DSOSUF@ -+TIFFLIB = ${DEPTH}/libtiff/libtiff.la - LIBJPEG = @LIBJPEG@ - LIBGZ = @LIBGZ@ --LIBTIFF = @TIFFLIBREF@ -+LIBTIFF = ${TIFFLIB} - LIBPORT = @LIBPORT@ - MACHLIBS= @MACHDEPLIBS@ - LIBS = ${LIBTIFF} ${LIBJPEG} ${LIBGZ} ${LIBPORT} ${MACHLIBS} -@@ -108,8 +108,8 @@ - true; \ - fi - install: all -- ${INSTALL} -idb nostrip tiff.sw.tools -m 755 -dir @DIR_BIN@ -- ${INSTALL} -idb nostrip tiff.sw.tools -m 755 -F @DIR_BIN@ -O ${TARGETS} -+ ${INSTALL} -idb tiff.sw.tools -m 755 -dir @DIR_BIN@ -+ ${LIBTOOL} ${BSD_INSTALL_PROGRAM} ${TARGETS} @DIR_BIN@ - @if [ "@LIBIMAGE@" = yes ]; then \ - ${INSTALL} -idb tiff.sw.tools -m 755 -F @DIR_BIN@ -O sgi2tiff; \ - else \ +--- html/index.html.orig Mon Mar 27 17:05:55 2000 ++++ html/index.html +@@ -78,7 +78,6 @@ +
  • Bugs and the TIFF mailing list +
  • Test images +
  • Acknowledgements and copyright issues +-
  • Man Pages + + +

    diff --git a/graphics/tiff/patches/patch-ad b/graphics/tiff/patches/patch-ad index a91cc9918ca..b2acac53936 100644 --- a/graphics/tiff/patches/patch-ad +++ b/graphics/tiff/patches/patch-ad @@ -1,30 +1,70 @@ -$NetBSD: patch-ad,v 1.7 2001/05/03 13:22:50 skrll Exp $ +$NetBSD: patch-ad,v 1.8 2001/08/23 00:07:18 abs Exp $ ---- configure.orig Mon Mar 20 18:20:42 2000 -+++ configure Thu May 3 14:15:41 2001 -@@ -486,7 +486,7 @@ +--- libtiff/Makefile.in.orig Sun Nov 28 20:15:36 1999 ++++ libtiff/Makefile.in +@@ -35,12 +35,18 @@ + # + SHELL = @SCRIPT_SH@ + NULL = +-CC = @CCOMPILER@ ++CCOMPILER = @CCOMPILER@ ++CC = ${LIBTOOL} ${CCOMPILER} + AR = @AR@ + AROPTS = @AROPTS@ + RANLIB = @RANLIB@ + INSTALL = @INSTALL@ - checkCompiler() - { -- compiler=$1 -+ compiler="$*" - if isGNU $compiler; then - ISGCC=yes - else -@@ -512,7 +512,7 @@ - $RM dummy dummy.o - capture $compiler -o dummy ${C_ANSI} dummy.c && { - CC=$compiler; -- test -z "${CCOMPILER-}" && CCOMPILER=`findApp $compiler $PATH` -+ test -z "${CCOMPILER-}" && CCOMPILER=$compiler - test -z "${ENVOPTS-}" && ENVOPTS="${C_ANSI-}" - return 0 - } -@@ -1661,6 +1661,7 @@ - -[LR]/*) echo "$i" ;; - -L*) echo "$i" | sed 's;^-L;-L../;' ;; - -R*) echo "$i" | sed 's;^-R;-R../;' ;; -+ -W*) echo "$i" ;; - *) echo "../$i" ;; - esac - done) | tr '\012' ' ' ++LIBJPEG = @LIBJPEG@ ++LIBGZ = @LIBGZ@ ++LIBPORT = @LIBPORT@ ++MACHLIBS = @MACHDEPLIBS@ ++ + # + # If JPEG support is to be included and the Independent JPEG + # Software distribution is not installed then DIR_JPEG must +@@ -135,7 +141,7 @@ + tif_write.o \ + tif_zip.o \ + ${NULL} +-TARGETS = libtiff.a ++TARGETS = libtiff.la + + all: ${TARGETS} + if [ @DSO@dso != nodso ]; then \ +@@ -144,9 +150,10 @@ + true; \ + fi + +-libtiff.a: ${OBJS} +- ${AR} ${AROPTS} libtiff.a $? +- ${RANLIB} libtiff.a ++libtiff.la: ${OBJS} ++ ${CC} -o $@ ${OBJS:.o=.lo} -rpath @DIR_LIB@ \ ++ -version-info @DIST_MAJOR@:@DIST_MINOR@ \ ++ ${LIBJPEG} ${LIBGZ} ${LIBPORT} ${MACHLIBS} + + # + # NB: The configure script verifies that the configured +@@ -249,8 +256,13 @@ + ${CC} -c ${CFLAGS} ${SRCDIR}/tif_dir.c + tif_dirinfo.o: ${SRCDIR}/tif_dirinfo.c + ${CC} -c ${CFLAGS} ${SRCDIR}/tif_dirinfo.c ++.if (${MACHINE_ARCH} == "sparc64") ++tif_dirread.o: ${SRCDIR}/tif_dirread.c ++ ${CC} -c ${CFLAGS} -O0 ${SRCDIR}/tif_dirread.c ++.else + tif_dirread.o: ${SRCDIR}/tif_dirread.c + ${CC} -c ${CFLAGS} ${SRCDIR}/tif_dirread.c ++.endif + tif_dirwrite.o: ${SRCDIR}/tif_dirwrite.c + ${CC} -c ${CFLAGS} ${SRCDIR}/tif_dirwrite.c + tif_dumpmode.o: ${SRCDIR}/tif_dumpmode.c +@@ -334,7 +346,7 @@ + fi + install: all installHdrs + ${INSTALL} -idb tiff.sw.dev -m 755 -dir @DIR_LIB@ +- ${INSTALL} -idb tiff.sw.dev -m 444 -F @DIR_LIB@ -O libtiff.a ++ ${LIBTOOL} ${BSD_INSTALL_DATA} libtiff.la @DIR_LIB@ + if [ @DSO@dso != nodso ]; then \ + ${MAKE} installDSO; \ + else \ diff --git a/graphics/tiff/patches/patch-ae b/graphics/tiff/patches/patch-ae index 808d5193ee6..f6dc8d76f0b 100644 --- a/graphics/tiff/patches/patch-ae +++ b/graphics/tiff/patches/patch-ae @@ -1,22 +1,24 @@ -$NetBSD: patch-ae,v 1.4 2000/04/01 00:05:29 wiz Exp $ +$NetBSD: patch-ae,v 1.5 2001/08/23 00:07:18 abs Exp $ ---- html/Makefile.in.orig Mon Mar 27 19:05:55 2000 -+++ html/Makefile.in Fri Mar 31 23:47:24 2000 -@@ -76,8 +76,6 @@ - v3.5.1.html \ - v3.5.2.html \ - v3.5.3.html \ -- v3.5.4.html \ -- v3.5.5.html \ - ${NULL} - IMAGES=\ - images/back.gif \ -@@ -85,6 +83,8 @@ - images/cat.gif \ - images/cover.jpg \ - images/cramps.gif \ -+ images/dave.gif \ -+ images/info.gif \ - images/jello.jpg \ - images/jim.gif \ - images/note.gif \ +--- man/Makefile.in.orig Tue Aug 21 08:44:42 2001 ++++ man/Makefile.in +@@ -336,8 +336,7 @@ + ${ECHO} 'install:'; \ + for i in *.1; do \ + f=${MANAPPNAME}; \ +- ${ECHO} ' cd ..; ${INSTALL} -m 444 -F ${MAN}/${MANAPPS} \ +- -idb tiff.man.tools -src' apps/"$$i" '-O' "$$f"; \ ++ ${ECHO} ' ${BSD_INSTALL_DATA}' $$i ${MAN}/${MANAPPS}/$$f; \ + done \ + )>apps/Makefile + lib/Makefile: +@@ -348,8 +347,7 @@ + ${ECHO} 'install:'; \ + for i in *.3t; do \ + f=${MANLIBNAME}; \ +- ${ECHO} ' cd ..; ${INSTALL} -m 444 -F ${MAN}/${MANLIB} \ +- -idb tiff.man.dev -src' lib/"$$i" '-O' "$$f"; \ ++ ${ECHO} ' ${BSD_INSTALL_DATA}' $$i ${MAN}/${MANLIB}/$$f; \ + done \ + )>lib/Makefile + diff --git a/graphics/tiff/patches/patch-af b/graphics/tiff/patches/patch-af index 57aa5442e6a..a604a90bb46 100644 --- a/graphics/tiff/patches/patch-af +++ b/graphics/tiff/patches/patch-af @@ -1,12 +1,28 @@ -$NetBSD: patch-af,v 1.4 2000/04/01 00:05:29 wiz Exp $ +$NetBSD: patch-af,v 1.5 2001/08/23 00:07:19 abs Exp $ ---- html/index.html.orig Mon Mar 27 19:05:55 2000 -+++ html/index.html Fri Mar 31 23:27:39 2000 -@@ -78,7 +78,6 @@ -

  • Bugs and the TIFF mailing list -
  • Test images -
  • Acknowledgements and copyright issues --
  • Man Pages - - -

    +--- tools/Makefile.in.orig Tue Aug 21 08:44:43 2001 ++++ tools/Makefile.in +@@ -47,10 +47,10 @@ + IPATH = -I. -I${SRCDIR} -I${LIBDIR} + CFLAGS = @ENVOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH} + # +-TIFFLIB = ${DEPTH}/libtiff/libtiff.@DSOSUF@ ++TIFFLIB = ${DEPTH}/libtiff/libtiff.la + LIBJPEG = @LIBJPEG@ + LIBGZ = @LIBGZ@ +-LIBTIFF = @TIFFLIBREF@ ++LIBTIFF = ${TIFFLIB} + LIBPORT = @LIBPORT@ + MACHLIBS= @MACHDEPLIBS@ + LIBS = ${LIBTIFF} ${LIBJPEG} ${LIBGZ} ${LIBPORT} ${MACHLIBS} +@@ -108,8 +108,8 @@ + true; \ + fi + install: all +- ${INSTALL} -idb nostrip tiff.sw.tools -m 755 -dir @DIR_BIN@ +- ${INSTALL} -idb nostrip tiff.sw.tools -m 755 -F @DIR_BIN@ -O ${TARGETS} ++ ${INSTALL} -idb tiff.sw.tools -m 755 -dir @DIR_BIN@ ++ ${LIBTOOL} ${BSD_INSTALL_PROGRAM} ${TARGETS} @DIR_BIN@ + @if [ "@LIBIMAGE@" = yes ]; then \ + ${INSTALL} -idb tiff.sw.tools -m 755 -F @DIR_BIN@ -O sgi2tiff; \ + else \ -- cgit v1.2.3