cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

applied openbsd patches (as per bug 61)

Browse Source
This commit is contained in:
Frank Warmerdam 2001-07-16 20:42:59 +00:00
parent 0ef5434120
commit f45df42b1b
3 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2001-07-16 Frank Warmerdam <warmerdam@pobox.com>
* configure, libtiff/Makefile.in: applied OpenBSD patches
as per:
http://bugzilla.remotesensing.org/show_bug.cgi?id=61
2001-06-28 Frank Warmerdam <warmerdam@pobox.com>
* libtiff/tif_getimage.c: Fixed so that failure is properly

19
configure vendored
View File

@ -1,5 +1,5 @@
#!/bin/sh
# $Header: /cvs/maptools/cvsroot/libtiff/configure,v 1.18 2001-06-22 21:20:08 warmerda Exp $
# $Header: /cvs/maptools/cvsroot/libtiff/configure,v 1.19 2001-07-16 20:42:59 warmerda Exp $
#
# Tag Image File Format (TIFF) Software
#
@ -152,7 +152,7 @@ do
-target|--target) ac_prev=TARGET;;
-target=*|--target=*) TARGET="$ac_optarg" ;;
-version|--version)
echo "This is TIFF configure $Revision: 1.18 $"
echo "This is TIFF configure $Revision: 1.19 $"
exit 0
;;
-help|--help) usage; exit 0;;
@ -1178,6 +1178,21 @@ if [ "$DSO" = auto ]; then
DSOOPTS='-shared'
DSO=GNULD
;;
*-openbsd*)
DSOSUF=so.${DIST_MAJOR}.${DIST_MINOR}
LIBCOPTS='-fpic'
TIFFLIBREF='-L${DEPTH}/libtiff -ltiff'
case "$TARGET" in
*-openbsd[01].* | *-openbsd2.[0-7] | *-openbsd2.[0-7].*)
DSO=oldOPENBSD
;;
*)
DSO=OPENBSD
DSOLD="${CCOMPILER} ${ENVOPTS}"
DSOOPTS='-shared ${LIBCOPTS}'
;;
esac
;;
*-darwin*)
DSOSUF=${DIST_MAJOR}.dylib
DSOSUF_VERSION=${DIST_MAJOR}.${DIST_MINOR}.${DIST_POINT}.dylib

8
libtiff/Makefile.in
View File

@ -1,4 +1,4 @@
# $Header: /cvs/maptools/cvsroot/libtiff/libtiff/Makefile.in,v 1.13 2001-06-22 12:49:41 warmerda Exp $
# $Header: /cvs/maptools/cvsroot/libtiff/libtiff/Makefile.in,v 1.14 2001-07-16 20:42:59 warmerda Exp $
#
# Tag Image File Format Library
#
@ -221,7 +221,7 @@ DARWINdso: ${OBJS}
fi
touch $@
# NetBSD 1.1 or FreeBSD (old style)
NETBSDdso FREEBSDdso: ${OBJS}
NETBSDdso FREEBSDdso oldOPENBSDdso: ${OBJS}
@rm -f libtiff_pic.a
@${AR} cq libtiff_pic.a `lorder ${OBJS} | tsort -q`
${RANLIB} libtiff_pic.a
@ -240,6 +240,10 @@ LINUXdso: ${OBJS}
OSFdso: ${OBJS}
${LD} -o libtiff.@DSOSUF@ -shared -error_unresolved ${OBJS} @LIBJPEG@ @LIBGZ@ -lc -lm
OPENBSDdso: ${OBJS}
${CC} -shared @LIBCOPTS@ -o libtiff.@DSOSUF_VERSION@ ${OBJS} @LIBJPEG@ @LIBGZ@ -lm
touch $@
${OBJS}: ${SRCDIR}/tiffio.h ${SRCDIR}/tiff.h ${SRCDIR}/tif_dir.h
${OBJS}: ${SRCDIR}/tiffcomp.h ${SRCDIR}/tiffiop.h ${SRCDIR}/tiffconf.h