From owner-freebsd-ports Sun Jun 28 22:32:28 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id WAA09447 for freebsd-ports-outgoing; Sun, 28 Jun 1998 22:32:28 -0700 (PDT) (envelope-from owner-freebsd-ports@FreeBSD.ORG) Received: from shire.domestic.de (kuebart.stuttgart.netsurf.de [194.233.216.182]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id WAA09408 for ; Sun, 28 Jun 1998 22:32:19 -0700 (PDT) (envelope-from joki@kuebart.stuttgart.netsurf.de) Received: from yacht.domestic.de (yacht.domestic.de [192.168.1.4]) by shire.domestic.de (8.8.8/8.8.7) with ESMTP id HAA22256 for ; Mon, 29 Jun 1998 07:31:17 +0200 (CEST) (envelope-from joki@shire.domestic.de) From: Joachim Kuebart Received: (from joki@localhost) by yacht.domestic.de (8.8.8/8.8.7) id HAA15424 for freebsd-ports@freebsd.org; Mon, 29 Jun 1998 07:33:16 +0200 (CEST) (envelope-from joki@shire.domestic.de) Message-Id: <199806290533.HAA15424@yacht.domestic.de> Subject: New Patch for libtiff34 in ELF To: freebsd-ports@FreeBSD.ORG Date: Mon, 29 Jun 1998 07:33:16 +0200 (CEST) X-Mailer: ELM [version 2.4ME+ PL32 (25)] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org Hi, the patches/patch-aa file has to look like the one below for an ELF build to work. I don't know if it breaks the a.out build, though (I just removed the explicit reference to /usr/lib/c++rt0.o from the link command line). --- libtiff/Makefile.in.orig Tue Apr 30 00:16:21 1996 +++ libtiff/Makefile.in Mon Jun 29 07:27:07 1998 @@ -62,7 +62,7 @@ # CONF_LIBRARY=@CONF_JPEG@ @CONF_ZIP@ COPTS = @GCOPTS@ -OPTIMIZER=-O +#OPTIMIZER=-O CFLAGS = @ENVOPTS@ @LIBCOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH} ${CONF_LIBRARY} # SRCS = \ @@ -133,7 +133,7 @@ tif_write.o \ tif_zip.o \ ${NULL} -TARGETS = libtiff.a +TARGETS = libtiff34.a all: ${TARGETS} if [ @DSO@dso != nodso ]; then \ @@ -142,9 +142,9 @@ true; \ fi -libtiff.a: ${OBJS} - ${AR} ${AROPTS} libtiff.a $? - ${RANLIB} libtiff.a +libtiff34.a: ${OBJS} + ${AR} ${AROPTS} libtiff34.a $? + ${RANLIB} libtiff34.a # # NB: The configure script verifies that the configured @@ -159,47 +159,50 @@ # default IRIX DSO building rule IRIXdso: ${OBJS} - ${CC} -o libtiff.@DSOSUF@ -shared -rdata_shared \ + ${CC} -o libtiff34.@DSOSUF@ -shared -rdata_shared \ -check_registry ${SRCDIR}/../port/irix/so_locations \ -quickstart_info \ ${OBJS} @LIBJPEG@ @LIBGZ@ touch $@ # special rule for IRIX 5.2 IRIX52dso: ${OBJS} - ${LD} -elf -o libtiff.@DSOSUF@ -shared -no_unresolved -all ${OBJS} \ + ${LD} -elf -o libtiff34.@DSOSUF@ -shared -no_unresolved -all ${OBJS} \ @LIBJPEG@ @LIBGZ@ -lc -lm touch $@ # Solaris 2.4 SOLARISdso: ${OBJS} - ${LD} -L@DIR_LIB@ -G -o libtiff.@DSOSUF@ ${OBJS} + ${LD} -L@DIR_LIB@ -G -o libtiff34.@DSOSUF@ ${OBJS} touch $@ # HP-UX A.09.03 HPUXdso: ${OBJS} - ${LD} +b@DIR_LIB@ -b -o libtiff.@DSOSUF@ ${OBJS} + ${LD} +b@DIR_LIB@ -b -o libtiff34.@DSOSUF@ ${OBJS} touch $@ # AIX 2.3.5 and 4.1.1 AIXdso: ${OBJS} - rm -f libtiff.syms shr.o - echo "#!" > libtiff.syms - /bin/dump -g libtiff.a | sed -n -e \ + rm -f libtiff34.syms shr.o + echo "#!" > libtiff34.syms + /bin/dump -g libtiff34.a | sed -n -e \ 's/^[ ]*[0-9][0-9]*[ ]*\([^ .][^ ]*\)$$/\1/p' \ - >> libtiff.syms - ${LD} -o shr.o libtiff.a -H512 -T512 -bM\:SRE \ - -bE\:libtiff.syms @LIBJPEG@ @LIBGZ@ -lc -lm -L@DIR_LIB@ - rm -f libtiff.syms libtiff.@DSOSUF@ - ${AR} ${AROPTS} libtiff.@DSOSUF@ shr.o + >> libtiff34.syms + ${LD} -o shr.o libtiff34.a -H512 -T512 -bM\:SRE \ + -bE\:libtiff34.syms @LIBJPEG@ @LIBGZ@ -lc -lm -L@DIR_LIB@ + rm -f libtiff34.syms libtiff34.@DSOSUF@ + ${AR} ${AROPTS} libtiff34.@DSOSUF@ shr.o rm -f shr.o touch $@ # linux ELF shared lib rule LINUXdso: ${OBJS} - ${CC} -shared -Wl,-soname,libtiff.@DSOSUF@ \ - -o libtiff.@DSOSUF_VERSION@ ${OBJS} @LIBJPEG@ @LIBGZ@ - @LN@ @LN_S@ libtiff.@DSOSUF_VERSION@ libtiff.@DSOSUF@ + ${CC} -shared -Wl,-soname,libtiff34.@DSOSUF@ \ + -o libtiff34.@DSOSUF_VERSION@ ${OBJS} @LIBJPEG@ @LIBGZ@ + @LN@ @LN_S@ libtiff34.@DSOSUF_VERSION@ libtiff34.@DSOSUF@ touch $@ # OSF/1 3.2 shared lib rule OSFdso: ${OBJS} - ${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} + ${LD} -Bshareable -x -o libtiff34.@DSOSUF_VERSION@ \ + ${OBJS} @LIBJPEG@ @LIBGZ@ + touch $@ ${OBJS}: ${SRCDIR}/tiffio.h ${SRCDIR}/tiff.h ${SRCDIR}/tif_dir.h ${OBJS}: ${SRCDIR}/tiffcomp.h ${SRCDIR}/tiffiop.h ${SRCDIR}/tiffconf.h @@ -307,16 +310,16 @@ installDSO: @DSO@dso if [ @DSOSUF_VERSION@ != @DSOSUF@ ]; then \ ${INSTALL} -idb tiff.sw.tools -m 555 -F @DIR_LIB@ \ - -O libtiff.@DSOSUF_VERSION@; \ + -O libtiff34.@DSOSUF_VERSION@; \ ${INSTALL} -idb tiff.sw.tools -F @DIR_LIB@ \ - -ln libtiff.@DSOSUF_VERSION@ -O libtiff.@DSOSUF@; \ + -lns libtiff34.@DSOSUF_VERSION@ -O libtiff34.@DSOSUF@; \ else \ ${INSTALL} -idb tiff.sw.tools -m 444 -F @DIR_LIB@ \ - -O libtiff.@DSOSUF@; \ + -O libtiff34.@DSOSUF@; \ 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 + ${INSTALL} -idb tiff.sw.dev -m 444 -F @DIR_LIB@ -O libtiff34.a if [ @DSO@dso != nodso ]; then \ ${MAKE} installDSO; \ else \ @@ -327,4 +330,4 @@ rm -f ${TARGETS} ${OBJS} core a.out \ mkg3states tif_fax3sm.c \ mkversion version.h \ - libtiff.a libtiff.@DSOSUF@ libtiff.@DSOSUF_VERSION@ *dso + libtiff34.a libtiff34.@DSOSUF@ libtiff34.@DSOSUF_VERSION@ *dso cu Jo --------------------------------------------------------------------- FreeBSD: The Power to Serve Joachim Kuebart Tel: +49 711 653706 Replicants are like any other machine -- Germany they're either a benefit or a hazard. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message