From 9d6cafa93f7da6df9950986627a6bdbe913a04ce Mon Sep 17 00:00:00 2001 From: knu Date: Sat, 7 Dec 2002 10:28:15 +0000 Subject: Do not build the profiled library on 5-CURRENT, where g++ -pg produces strange function calls that the assembler cannot understand. Submitted by: bento http://bento.freebsd.org/errorlogs/5-latest/rudiments-0.24.log --- devel/rudiments/Makefile | 12 ++++++++++- devel/rudiments/files/extra-patch-src+Makefile.in | 25 +++++++++++++++++++++++ devel/rudiments/pkg-plist | 2 +- 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 devel/rudiments/files/extra-patch-src+Makefile.in (limited to 'devel') diff --git a/devel/rudiments/Makefile b/devel/rudiments/Makefile index 6c1f375561c0..c6f1c207524b 100644 --- a/devel/rudiments/Makefile +++ b/devel/rudiments/Makefile @@ -21,9 +21,19 @@ MAKE_ARGS= VERSION="${PORTVERSION:R}" INSTALLS_SHLIB= yes +.include + +.if ${OSVERSION} >= 500000 +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-* + +PLIST_SUB+= PROFILE="@comment " +.else +PLIST_SUB+= PROFILE="" +.endif + post-install: .if !defined(NOPORTDOCS) cd ${WRKSRC} && ${MAKE} doc-install .endif -.include +.include diff --git a/devel/rudiments/files/extra-patch-src+Makefile.in b/devel/rudiments/files/extra-patch-src+Makefile.in new file mode 100644 index 000000000000..c059fcc336bd --- /dev/null +++ b/devel/rudiments/files/extra-patch-src+Makefile.in @@ -0,0 +1,25 @@ +--- src/Makefile.in.orig Mon Apr 15 13:21:24 2002 ++++ src/Makefile.in Sat Dec 7 19:27:01 2002 +@@ -17,7 +17,6 @@ + + all: + $(MAKE) ../lib/librudiments.a; \ +- $(MAKE) ../lib/librudiments_p.a; \ + if ( test ! -n "@MINGW32@" -a ! -n "@CYGWIN@" -a ! -n "@UWIN@" ); then \ + $(MAKE) ../lib/librudiments.so.$(VERSION); \ + else \ +@@ -48,7 +47,6 @@ + install: + $(top_srcdir)/mkinstalldirs $(libdir) + $(INSTALL) -m 644 ../lib/librudiments.a $(libdir); \ +- $(INSTALL) -m 644 ../lib/librudiments_p.a $(libdir); \ + if ( test ! -n "@MINGW32@" -a ! -n "@CYGWIN@" -a ! -n "@UWIN@" ); then \ + $(RM) $(libdir)/librudiments.so*; \ + $(INSTALL) ../lib/librudiments.so.$(VERSION) $(libdir); \ +@@ -62,6 +60,5 @@ + uninstall: + $(RM) $(libdir)/librudiments.so* + $(RM) $(libdir)/librudiments.a +- $(RM) $(libdir)/librudiments_p.a + $(RM) $(libdir)/librudiments.dll + $(RM) $(libdir)/librudiments.lib diff --git a/devel/rudiments/pkg-plist b/devel/rudiments/pkg-plist index 225b98d8e0c8..498d2aaa7400 100644 --- a/devel/rudiments/pkg-plist +++ b/devel/rudiments/pkg-plist @@ -30,7 +30,7 @@ include/rudiments/private/socketnode.h lib/librudiments.a lib/librudiments.so lib/librudiments.so.0 -lib/librudiments_p.a +%%PROFILE%%lib/librudiments_p.a %%PORTDOCS%%share/doc/rudiments/classes/clientsocket.h.html %%PORTDOCS%%share/doc/rudiments/classes/commandline.h.html %%PORTDOCS%%share/doc/rudiments/classes/daemonprocess.h.html -- cgit