diff options
| author | Scott Mace <smace@FreeBSD.org> | 1998-09-18 22:05:47 +0000 |
|---|---|---|
| committer | Scott Mace <smace@FreeBSD.org> | 1998-09-18 22:05:47 +0000 |
| commit | 230fa89564484162e506970c5eb53f00065d9242 (patch) | |
| tree | fea892a9c2c3d62010732ef650c8ade571f05876 /graphics/tiff | |
| parent | Convert to Elf (diff) | |
COnvert to Elf.
Two DSO types for tiff34 are now supported: FREEBSD_AOUTdso and FREEBSD_ELFdso
Notes
Notes:
svn path=/head/; revision=13219
Diffstat (limited to 'graphics/tiff')
| -rw-r--r-- | graphics/tiff/files/patch-aa | 25 | ||||
| -rw-r--r-- | graphics/tiff/files/patch-ab | 18 |
2 files changed, 24 insertions, 19 deletions
diff --git a/graphics/tiff/files/patch-aa b/graphics/tiff/files/patch-aa index 67603a2995d5..c395d2f467a3 100644 --- a/graphics/tiff/files/patch-aa +++ b/graphics/tiff/files/patch-aa @@ -1,5 +1,5 @@ ---- libtiff/Makefile.in.orig Tue Apr 30 00:16:21 1996 -+++ libtiff/Makefile.in Thu Nov 6 15:07:08 1997 +--- libtiff/Makefile.in.orig Mon Apr 29 17:16:21 1996 ++++ libtiff/Makefile.in Fri Sep 18 16:46:03 1998 @@ -62,7 +62,7 @@ # CONF_LIBRARY=@CONF_JPEG@ @CONF_ZIP@ @@ -31,7 +31,7 @@ # # NB: The configure script verifies that the configured -@@ -159,47 +159,50 @@ +@@ -159,47 +159,56 @@ # default IRIX DSO building rule IRIXdso: ${OBJS} @@ -92,21 +92,20 @@ - ${LD} -o libtiff.@DSOSUF@ -shared -error_unresolved ${OBJS} @LIBJPEG@ @LIBGZ@ -lc -lm - + ${LD} -o libtiff34.@DSOSUF@ -shared -error_unresolved ${OBJS} @LIBJPEG@ @LIBGZ@ -lc -lm -+FREEBSDdso: ${OBJS} ++FREEBSD_AOUTdso: ${OBJS} + ${LD} -Bshareable -x ${LIBDIR}/c++rt0.o -o libtiff34.@DSOSUF_VERSION@ \ + ${OBJS} @LIBJPEG@ @LIBGZ@ ++ @LN@ @LN_S@ libtiff34.@DSOSUF_VERSION@ libtiff34.@DSOSUF@ ++ touch $@ ++FREEBSD_ELFdso: ${OBJS} ++ ${CC} -shared -Wl,-soname,libtiff34.@DSOSUF_VERSION@ -o libtiff34.@DSOSUF_VERSION@ \ ++ ${OBJS} @LIBJPEG@ @LIBGZ@ ++ @LN@ @LN_S@ libtiff34.@DSOSUF_VERSION@ libtiff34.@DSOSUF@ + touch $@ ${OBJS}: ${SRCDIR}/tiffio.h ${SRCDIR}/tiff.h ${SRCDIR}/tif_dir.h ${OBJS}: ${SRCDIR}/tiffcomp.h ${SRCDIR}/tiffiop.h ${SRCDIR}/tiffconf.h -@@ -300,23 +303,23 @@ - installHdrs: ${INCS} - ${INSTALL} -idb tiff.sw.dev -m 755 -dir @DIR_INC@ - for i in ${INCS}; do \ - f=`basename $$i`; \ - ${INSTALL} -idb tiff.sw.dev -m 444 -F @DIR_INC@ \ - -src $$i -O $$f; \ - done +@@ -307,16 +316,16 @@ installDSO: @DSO@dso if [ @DSOSUF_VERSION@ != @DSOSUF@ ]; then \ ${INSTALL} -idb tiff.sw.tools -m 555 -F @DIR_LIB@ \ @@ -127,7 +126,7 @@ if [ @DSO@dso != nodso ]; then \ ${MAKE} installDSO; \ else \ -@@ -327,4 +330,4 @@ +@@ -327,4 +336,4 @@ rm -f ${TARGETS} ${OBJS} core a.out \ mkg3states tif_fax3sm.c \ mkversion version.h \ diff --git a/graphics/tiff/files/patch-ab b/graphics/tiff/files/patch-ab index c4032c27d1c9..e4b9991a172d 100644 --- a/graphics/tiff/files/patch-ab +++ b/graphics/tiff/files/patch-ab @@ -1,15 +1,21 @@ ---- ./configure.orig Tue Apr 30 07:16:17 1996 -+++ ./configure Sun May 25 22:37:20 1997 -@@ -1140,6 +1140,13 @@ +--- configure.orig Mon Apr 29 17:16:17 1996 ++++ configure Fri Sep 18 16:38:02 1998 +@@ -1140,6 +1140,19 @@ DSOOPTS='-shared' DSO=OSF ;; + *-freebsd*) + DSOSUF=so -+ DSOSUF_VERSION=${DSOSUF}.1.0 + LIBCOPTS='-fpic -DPIC' -+ DSOOPTS='-Bshareable' -+ DSO=FREEBSD ++ if [ $PORTOBJFORMAT = elf ]; then ++ DSOSUF_VERSION=${DSOSUF}.1 ++ DSOOPTS='-shared' ++ DSO=FREEBSD_ELF ++ else ++ DSOSUF_VERSION=${DSOSUF}.1.0 ++ DSOOPTS='-Bshareable' ++ DSO=FREEBSD_AOUT ++ fi + ;; *) DSO=no;; esac |