diff options
author | skrll <skrll> | 2001-03-05 12:40:25 +0000 |
---|---|---|
committer | skrll <skrll> | 2001-03-05 12:40:25 +0000 |
commit | a54b919387d5d8adf92c714d15d72905345656f6 (patch) | |
tree | a1fda51658ebe847c5bd795428ecd43102aeb169 /devel/pwlib | |
parent | c5171d71e0d21b7e2afc76e57df606b72137cb9f (diff) | |
download | pkgsrc-a54b919387d5d8adf92c714d15d72905345656f6.tar.gz |
Add --tag= options to keep libtool happy.
Fix PLIST problem while I'm here by not adding the original from a
patched include.
Diffstat (limited to 'devel/pwlib')
-rw-r--r-- | devel/pwlib/Makefile | 5 | ||||
-rw-r--r-- | devel/pwlib/files/patch-sum | 6 | ||||
-rw-r--r-- | devel/pwlib/patches/patch-ab | 12 | ||||
-rw-r--r-- | devel/pwlib/patches/patch-ac | 8 |
4 files changed, 16 insertions, 15 deletions
diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile index 1026ace3f79..bccecd9e1ce 100644 --- a/devel/pwlib/Makefile +++ b/devel/pwlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/02/25 04:17:42 hubertf Exp $ +# $NetBSD: Makefile,v 1.8 2001/03/05 12:40:25 skrll Exp $ # DISTNAME= pwlib_min_1.1pl17 @@ -36,7 +36,8 @@ do-build: do-install: cd ${WRKSRC}; env PWLIBDIR=`pwd` ${GMAKE} install; ${INSTALL_DATA_DIR} ${PREFIX}/include/ptclib ${PREFIX}/include/ptlib/unix/ptlib - cd ${WRKSRC}/include; for f in `find . -name CVS -prune -o -type f -print` ; \ + cd ${WRKSRC}/include; \ + for f in `find . -name CVS -prune -o -type f ! -name "*.orig" -print` ; \ do ${BSD_INSTALL_DATA} $$f ${PREFIX}/include/`dirname $$f`; done ${INSTALL_DATA_DIR} ${PREFIX}/share/pwlib/make cd ${WRKSRC}/make; for f in unix.mak common.mak lib.mak ptlib.mak ; \ diff --git a/devel/pwlib/files/patch-sum b/devel/pwlib/files/patch-sum index dc84680ed46..1ab97811a53 100644 --- a/devel/pwlib/files/patch-sum +++ b/devel/pwlib/files/patch-sum @@ -1,8 +1,8 @@ -$NetBSD: patch-sum,v 1.2 2000/08/28 22:29:34 mjl Exp $ +$NetBSD: patch-sum,v 1.3 2001/03/05 12:40:25 skrll Exp $ MD5 (patch-aa) = d03e041c0a8a3e8dc33ef93f29d56354 -MD5 (patch-ab) = cf3b873bee3676e975d4605f7d2c6a9f -MD5 (patch-ac) = f3b5ecbf024aa01f76d37ef9f6233102 +MD5 (patch-ab) = 1aeed0ae1693894eaece462694d0d45e +MD5 (patch-ac) = 20f4b0bd30f04b34421aa693407ff395 MD5 (patch-ad) = fe6ad704d70a477532e685e653d9a8e2 MD5 (patch-ae) = 8e35918b6974ef55079c0407677362ec MD5 (patch-af) = 70eab357bd9f2a17f6f02c84ec4ad9e0 diff --git a/devel/pwlib/patches/patch-ab b/devel/pwlib/patches/patch-ab index 6f52ca78d90..0dc6ca24d30 100644 --- a/devel/pwlib/patches/patch-ab +++ b/devel/pwlib/patches/patch-ab @@ -1,14 +1,14 @@ -$NetBSD: patch-ab,v 1.1.1.1 2000/08/25 16:03:42 mjl Exp $ +$NetBSD: patch-ab,v 1.2 2001/03/05 12:40:25 skrll Exp $ ---- make/lib.mak.orig Fri May 19 03:26:31 2000 -+++ make/lib.mak Thu Aug 24 21:21:28 2000 +--- make/lib.mak.orig Fri May 19 02:26:31 2000 ++++ make/lib.mak @@ -49,29 +49,33 @@ BUILD_NUMBER := 0 endif +ifndef PROG -+CC := ${LIBTOOL} --mode=compile /usr/pkg/pthreads/bin/pgcc -+CPLUS := ${LIBTOOL} --mode=compile /usr/pkg/pthreads/bin/pg++ ++CC := ${LIBTOOL} --mode=compile --tag=CC /usr/pkg/pthreads/bin/pgcc ++CPLUS := ${LIBTOOL} --mode=compile --tag=CXX /usr/pkg/pthreads/bin/pg++ +INSTALL := ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} +endif + @@ -35,7 +35,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/08/25 16:03:42 mjl Exp $ +$(LIBDIR)/${LIB_BASENAME}: $(OBJS) @if [ ! -d $(LIBDIR) ] ; then mkdir $(LIBDIR) ; fi - gcc -shared -Wl,-soname,$(LIB_BASENAME).1 -o $(LIBDIR)/$(LIBNAME_PAT) $(OBJS) -+ ${LIBTOOL} --mode=link g++ -o ${LIBDIR}/${LIB_BASENAME:.so=.la} ${OBJS:.o=.lo} \ ++ ${LIBTOOL} --mode=link --tag=CXX g++ -o ${LIBDIR}/${LIB_BASENAME:.so=.la} ${OBJS:.o=.lo} \ + -rpath ${PREFIX}/lib -version-info ${MAJOR_VERSION}:${MINOR_VERSION} CLEAN_FILES += $(LIBDIR)/$(LIBNAME_PAT) $(LIBDIR)/$(LIB_BASENAME) $(LIBDIR)/$(LIBNAME_MAJ) $(LIBDIR)/$(LIBNAME_MIN) diff --git a/devel/pwlib/patches/patch-ac b/devel/pwlib/patches/patch-ac index a200fd82013..33563ea2f17 100644 --- a/devel/pwlib/patches/patch-ac +++ b/devel/pwlib/patches/patch-ac @@ -1,13 +1,13 @@ -$NetBSD: patch-ac,v 1.1.1.1 2000/08/25 16:03:42 mjl Exp $ +$NetBSD: patch-ac,v 1.2 2001/03/05 12:40:26 skrll Exp $ ---- make/common.mak.orig Wed Aug 23 22:49:37 2000 -+++ make/common.mak Wed Aug 23 23:05:10 2000 +--- make/common.mak.orig Wed Apr 26 01:40:48 2000 ++++ make/common.mak @@ -213,7 +213,7 @@ endif $(TARGET): $(OBJS) $(TARGET_LIBS) - $(CPLUS) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@ $(LDLIBS) -+ ${LIBTOOL} --mode=link $(CPLUS) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@ $(LDLIBS) ++ ${LIBTOOL} --mode=link --tag=CXX $(CPLUS) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@ $(LDLIBS) ifdef DEBUG |