diff options
author | jlam <jlam@pkgsrc.org> | 1999-09-24 00:39:13 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 1999-09-24 00:39:13 +0000 |
commit | 369c1faa21d022818abb88a0e2a2242813442045 (patch) | |
tree | 65a3a98bcd7d732e79d42a3c4ebaf45f66185e27 /devel/ncurses/patches/patch-al | |
parent | 4fc0c8d2ef784bbc5f91926c724da0037f6d8d1f (diff) | |
download | pkgsrc-369c1faa21d022818abb88a0e2a2242813442045.tar.gz |
Go ahead and build and install the the ncurses C++ application framework
library. This was a side-effect of trying to deal with --with-cxx and
--without-cxx. We accept the default --with-cxx. This should work
regardless of whether libg++ exists.
Diffstat (limited to 'devel/ncurses/patches/patch-al')
-rw-r--r-- | devel/ncurses/patches/patch-al | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/devel/ncurses/patches/patch-al b/devel/ncurses/patches/patch-al new file mode 100644 index 00000000000..c9595935eee --- /dev/null +++ b/devel/ncurses/patches/patch-al @@ -0,0 +1,71 @@ +$NetBSD: patch-al,v 1.1 1999/09/24 00:39:13 jlam Exp $ + +--- c++/Makefile.in.orig Mon Mar 2 07:00:25 1998 ++++ c++/Makefile.in Thu Sep 23 18:25:59 1999 +@@ -73,10 +73,9 @@ + LINK = $(CXX) + + LIBROOT = ncurses++ +-LIBNAME = ../lib/lib$(LIBROOT).a ++LIBNAME = lib$(LIBROOT).la + +-LDFLAGS = @EXTRA_LDFLAGS@ -L../lib -L$(libdir) \ +- -l$(LIBROOT) \ ++LDFLAGS = @EXTRA_LDFLAGS@ ../lib/$(LIBNAME) \ + @TEST_ARGS@ @LDFLAGS@ \ + @LD_MODEL@ @LIBS@ @EXTRA_LIBS@ @LOCAL_LDFLAGS@ $(CXXLIBS) + +@@ -90,7 +89,7 @@ + AUTO_SRC = \ + etip.h + +-all: $(AUTO_SRC) $(LIBNAME) demo ++all: $(AUTO_SRC) ../lib/$(LIBNAME) demo + + sources : $(AUTO_SRC) + +@@ -106,9 +105,8 @@ + $(MODEL)/cursesapp.o \ + $(MODEL)/cursesmain.o + +-$(LIBNAME) : $(LIB_OBJS) +- $(AR) $(AR_OPTS) $@ $? +- $(RANLIB) $@ ++../lib/$(LIBNAME) : $(LIB_OBJS) ++ cd ../lib && $(LIBTOOL) --cplusplus --mode=link $(LINK) -o $(LIBNAME) $(LIB_OBJS:.o=.lo) -rpath $(INSTALL_PREFIX)$(libdir) -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) + + OBJS_DEMO = $(MODEL)/demo.o + +@@ -116,9 +114,9 @@ + $(cursesf_h) $(cursesm_h) $(cursesapp_h) + + demo: $(OBJS_DEMO) \ +- $(LIBNAME) \ ++ ../lib/$(LIBNAME) \ + @TEST_DEPS@ +- @ECHO_LINK@ $(LINK) -o $@ $(OBJS_DEMO) $(LDFLAGS_DEFAULT) ++ @ECHO_LINK@ $(LIBTOOL) --cplusplus --mode=link $(LINK) -o $@ $(OBJS_DEMO) $(LDFLAGS_DEFAULT) + + etip.h: $(srcdir)/etip.h.in $(srcdir)/edit_cfg.sh + cp $(srcdir)/etip.h.in $@ +@@ -128,8 +126,9 @@ + $(srcdir)/../mkinstalldirs $@ + + install \ +-install.libs:: $(LIBNAME) $(INSTALL_PREFIX)$(libdir) +- $(INSTALL) $(LIBNAME) $(INSTALL_PREFIX)$(libdir)/$(LIBNAME) ++install.libs:: ../lib/$(LIBNAME) $(INSTALL_PREFIX)$(libdir) ++ cd ../lib && $(LIBTOOL) --cplusplus --mode=install $(INSTALL_DATA) $(LIBNAME) $(INSTALL_PREFIX)$(libdir) ++ + + uninstall \ + uninstall.libs:: +@@ -139,7 +138,7 @@ + -rm -f core tags TAGS *~ *.ln *.atac trace + + clean :: mostlyclean +- -rm -f demo $(AUTO_SRC) $(LIBNAME) $(LIB_OBJS) $(OBJS_DEMO) ++ -rm -f demo $(AUTO_SRC) ../lib/$(LIBNAME) $(LIB_OBJS) $(OBJS_DEMO) + + distclean :: clean + -rm -f Makefile |