diff options
| author | thorpej <thorpej> | 1998-08-20 10:05:55 +0000 |
|---|---|---|
| committer | thorpej <thorpej> | 1998-08-20 10:05:55 +0000 |
| commit | 1ef4429b907c17faea12b86b837a9944cbbe99cf (patch) | |
| tree | 5c699a86fbe53e5c99771baddfb18b8651a5a2af /x11 | |
| parent | be6a1f2b538f0573498b9bd1099ab6c902700652 (diff) | |
| download | pkgsrc-1ef4429b907c17faea12b86b837a9944cbbe99cf.tar.gz | |
Fix the LIBTOOL problem correctly, from agc.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/kdelibs/Makefile | 4 | ||||
| -rw-r--r-- | x11/kdelibs/patches/patch-aa | 17 |
2 files changed, 9 insertions, 12 deletions
diff --git a/x11/kdelibs/Makefile b/x11/kdelibs/Makefile index dd4a945d546..7f5f20c1c70 100644 --- a/x11/kdelibs/Makefile +++ b/x11/kdelibs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 1998/08/19 15:25:51 agc Exp $ +# $NetBSD: Makefile,v 1.19 1998/08/20 10:05:55 thorpej Exp $ # FreeBSD Id: Makefile,v 1.5 1997/11/27 00:25:46 se Exp # @@ -9,7 +9,6 @@ MASTER_SITES= ftp://ftp.us.kde.org/pub/kde/stable/1.0/distribution/tar/generic/s MAINTAINER= tron@netbsd.org -BUILD_DEPENDS= ${LOCALBASE}/bin/libtool:../../devel/libtool DEPENDS+= jpeg-6b:../../graphics/jpeg DEPENDS+= qt-1.40:../../x11/qt DEPENDS+= giflib-3.0:../../graphics/giflib @@ -23,6 +22,7 @@ CONFIGURE_ARGS= "--x-inc=${X11BASE}/include -I${LOCALBASE}/include -I${LOCALBASE "--datadir=${PREFIX}/share/kde" \ "--with-qt-dir=${PREFIX}" \ "--with-qt-includes=${PREFIX}/include/qt" +USE_LIBTOOL= yes LIBTOOL_FLAGS= --install-la CONFIGURE_ENV= CXXFLAGS="${CFLAGS}" diff --git a/x11/kdelibs/patches/patch-aa b/x11/kdelibs/patches/patch-aa index 3063accc4d3..b031adcafa1 100644 --- a/x11/kdelibs/patches/patch-aa +++ b/x11/kdelibs/patches/patch-aa @@ -1,24 +1,21 @@ -$NetBSD: patch-aa,v 1.6 1998/08/20 07:38:03 thorpej Exp $ +$NetBSD: patch-aa,v 1.7 1998/08/20 10:05:55 thorpej Exp $ ---- configure.orig Wed Aug 19 23:03:27 1998 -+++ configure Wed Aug 19 23:07:02 1998 -@@ -1688,6 +1688,11 @@ +--- configure.orig Sun Jul 19 18:35:14 1998 ++++ configure Sun Jul 19 18:35:48 1998 +@@ -1688,6 +1688,8 @@ ac_save_cflags="$CFLAGS" CC=$CXX CFLAGS="$CXXFLAGS" + -+if true; then -+# NetBSD: always use NetBSD's libtool! -+LIBTOOL='$(LOCALBASE)/bin/libtool' -+else ++if false; then # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -1733,6 +1738,8 @@ +@@ -1733,6 +1735,8 @@ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } -+fi # NetBSD libtool check ++fi + CC=$ac_save_cc CFLAGS="$ac_save_cflags" |