diff options
| author | minskim <minskim> | 2006-05-17 04:29:00 +0000 |
|---|---|---|
| committer | minskim <minskim> | 2006-05-17 04:29:00 +0000 |
| commit | b3c112423f42adf365b723c8ba0eb2cd8a95fa5a (patch) | |
| tree | e146345c49abd191156cedbd048f340924d27ffa /textproc/tcl-expat/patches | |
| parent | 1c7ff741f8efa4986ba2fce1761bc9d4da55f839 (diff) | |
| download | pkgsrc-b3c112423f42adf365b723c8ba0eb2cd8a95fa5a.tar.gz | |
Use libtool to make this package build on more platforms. Approved by
jwise@.
Bump PKGREVISION.
Diffstat (limited to 'textproc/tcl-expat/patches')
| -rw-r--r-- | textproc/tcl-expat/patches/patch-aa | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/textproc/tcl-expat/patches/patch-aa b/textproc/tcl-expat/patches/patch-aa index 19b8b9b3e63..8a9ddd178d7 100644 --- a/textproc/tcl-expat/patches/patch-aa +++ b/textproc/tcl-expat/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.3 2004/03/09 01:16:59 minskim Exp $ +$NetBSD: patch-aa,v 1.4 2006/05/17 04:29:00 minskim Exp $ ---- Makefile.orig 1998-08-25 02:25:20.000000000 -0500 +--- Makefile.orig 1998-08-25 07:25:20.000000000 +0000 +++ Makefile @@ -18,12 +18,12 @@ TCLEXPAT_VERSION = 1.1 @@ -8,17 +8,24 @@ $NetBSD: patch-aa,v 1.3 2004/03/09 01:16:59 minskim Exp $ TCL_OBJS = tclexpat.o -TCL_PREFIX = /usr/local/tcl/8.0 -TCL_EXEC_PREFIX = /usr/local/tcl/8.0 +-TCL_SHLIB_CFLAGS = -fPIC +-TCL_SHLIB_LD = gcc -shared +-TCL_CC = gcc +-TCL_PACKAGE_PATH = /usr/local/tcl/8.0/lib +TCL_PREFIX = ${LOCALBASE} +TCL_EXEC_PREFIX = ${LOCALBASE} - TCL_SHLIB_CFLAGS = -fPIC - TCL_SHLIB_LD = gcc -shared - TCL_CC = gcc --TCL_PACKAGE_PATH = /usr/local/tcl/8.0/lib ++TCL_SHLIB_CFLAGS = ++TCL_SHLIB_LD = ${SHLIBTOOL} --mode=link ${CC} ++TCL_CC = ${SHLIBTOOL} --mode=compile ${CC} +TCL_PACKAGE_PATH = ${PREFIX}/lib/tcl -@@ -68,35 +68,23 @@ CC= $(TCL_CC) +@@ -64,39 +64,27 @@ FILEMAP_OBJ=expat/xmlwf/unixfilemap.o + # You shouldnt have to edit anything below here + #---------------------------------------------------------------------------- + +-CC= $(TCL_CC) LIB= tclexpat$(TCL_SHLIB_SUFFIX) @@ -41,7 +48,7 @@ $NetBSD: patch-aa,v 1.3 2004/03/09 01:16:59 minskim Exp $ -${OBJS}: - cd expat ; make CC=${CC} SHLIB_CFLAGS=${TCL_SHLIB_CFLAGS} +$(LIB): tclexpat.o -+ $(TCL_SHLIB_LD) -o $(LIB) $(OBJS) tclexpat.o -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lexpat -ltcl84 ++ $(TCL_SHLIB_LD) -o ${LIB:.so=.la} ${OBJS:.o=.lo} tclexpat.lo -L${LOCALBASE}/lib -rpath ${PREFIX}/lib -lexpat -ltcl84 -module -avoid-version tclexpat.o: tclexpat.c - $(TCL_CC) $(CFLAGS) -c $(TCL_DEFS) $(TCL_SHLIB_CFLAGS) -I$(TCL_PREFIX)/include -Iexpat/xmlparse tclexpat.c @@ -49,10 +56,13 @@ $NetBSD: patch-aa,v 1.3 2004/03/09 01:16:59 minskim Exp $ install: $(LIB) instdir=`echo $(TCL_PACKAGE_PATH) | cut -f 1 -d :` ; \ - mkdir $$instdir/TclExpat-$(TCLEXPAT_VERSION) ; \ +- mkdir $$instdir/TclExpat-$(TCLEXPAT_VERSION) ; \ - cp $(LIB) pkgIndex.tcl $$instdir -+ cp $(LIB) pkgIndex.tcl $$instdir/TclExpat-${TCLEXPAT_VERSION} - +- ++ ${BSD_INSTALL_DATA_DIR} $$instdir/TclExpat-$(TCLEXPAT_VERSION) ; \ ++ ${SHLIBTOOL} --mode=install ${BSD_INSTALL_LIB} ${LIB:.so=.la} $$instdir/TclExpat-${TCLEXPAT_VERSION}; \ ++ ${SHLIBTOOL} --mode=finish $$instdir/TclExpat-${TCLEXPAT_VERSION}; \ ++ ${BSD_INSTALL_DATA} pkgIndex.tcl $$instdir/TclExpat-${TCLEXPAT_VERSION} clean: - @cd expat; make clean |