diff options
| author | skrll <skrll> | 2002-08-12 16:23:23 +0000 |
|---|---|---|
| committer | skrll <skrll> | 2002-08-12 16:23:23 +0000 |
| commit | 3d4a42af9d273decb39d8daa38bedf352bd182e8 (patch) | |
| tree | 945a7ed10b6916c76e36f249caa0fde1814aa9e2 /textproc/jade | |
| parent | b552403a5f78546ac4a1ef3a79f9452dacbd66ed (diff) | |
| download | pkgsrc-3d4a42af9d273decb39d8daa38bedf352bd182e8.tar.gz | |
Fix pkg/16053.
Remove the --disable-shared option from CONFIGURE_ARGS it doesn't do
anything as pkgsrc libtool isn't built this way. We want shared libraries
anyway...
Use CXX when linking the libraries as we have global contructors that need
calling. Problem only visible on a.out platforms.
Diffstat (limited to 'textproc/jade')
| -rw-r--r-- | textproc/jade/Makefile | 5 | ||||
| -rw-r--r-- | textproc/jade/distinfo | 3 | ||||
| -rw-r--r-- | textproc/jade/patches/patch-ah | 11 |
3 files changed, 15 insertions, 4 deletions
diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile index 0346bd634c1..ec13828fa6a 100644 --- a/textproc/jade/Makefile +++ b/textproc/jade/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2002/05/08 11:41:27 kleink Exp $ +# $NetBSD: Makefile,v 1.20 2002/08/12 16:23:23 skrll Exp $ DISTNAME= jade-1.2.1 PKGREVISION= 4 @@ -25,8 +25,7 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/config/ltconfig JADE_CATALOG_DIR= ${PREFIX}/share/sgml/jade/catalog -CONFIGURE_ARGS= --disable-shared -CONFIGURE_ARGS+= --enable-default-catalog=${JADE_CATALOG_DIR} +CONFIGURE_ARGS= --enable-default-catalog=${JADE_CATALOG_DIR} CONFIGURE_ARGS+= --enable-mif CXXFLAGS+= ${CFLAGS} diff --git a/textproc/jade/distinfo b/textproc/jade/distinfo index 37dd6ec8b29..36d0015968f 100644 --- a/textproc/jade/distinfo +++ b/textproc/jade/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2001/10/14 12:19:16 tron Exp $ +$NetBSD: distinfo,v 1.6 2002/08/12 16:23:23 skrll Exp $ SHA1 (jade-1.2.1.tar.gz) = 4326e73b7f0b865515e1bb90c622a8b2aa6ecd06 Size (jade-1.2.1.tar.gz) = 1092062 bytes @@ -11,3 +11,4 @@ SHA1 (patch-ad) = 1afe17aeabda9f7f5c8531b09fb0af6085a8526f SHA1 (patch-ae) = a01bd39d4be17884f902a06c5c7324912935241f SHA1 (patch-af) = ef312d2f090bc32cdac60296d6b85940205da2a3 SHA1 (patch-ag) = e6772fab67961e12ee8870a15763cde466b60636 +SHA1 (patch-ah) = d829ea273b99c06d83a6d7944ece12fbae513b6c diff --git a/textproc/jade/patches/patch-ah b/textproc/jade/patches/patch-ah new file mode 100644 index 00000000000..2474038a1f3 --- /dev/null +++ b/textproc/jade/patches/patch-ah @@ -0,0 +1,11 @@ +--- Makefile.lib.in.orig Mon Aug 12 16:56:51 2002 ++++ Makefile.lib.in Mon Aug 12 16:56:48 2002 +@@ -18,7 +18,7 @@ + echo 'LT_OBJS='`echo $(OBJS)|sed 's/\.o/.lo/g'` >Makefile.lt + + lib$(LIB).la: $(LT_OBJS) +- $(LIBTOOL) --mode=link $(CC) -o lib$(LIB).la $(LT_OBJS) \ ++ $(LIBTOOL) --mode=link $(CXX) -o lib$(LIB).la $(LT_OBJS) \ + -rpath $(libdir) -version-info $(LTVERSION) $(DEPLIBS) + + install: |