From e4ef8a39274ebf630f6986b8ac2370ec87500ecd Mon Sep 17 00:00:00 2001 From: naddy Date: Sat, 17 Jan 2004 01:34:49 +0000 Subject: [PATCH] C program links against C++ libs, so use ${CXX} for final linking --- x11/kde/edu3/patches/patch-kiten_Makefile_am | 11 +++++++++++ x11/kde/edu3/patches/patch-kiten_Makefile_in | 20 ++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 x11/kde/edu3/patches/patch-kiten_Makefile_am create mode 100644 x11/kde/edu3/patches/patch-kiten_Makefile_in diff --git a/x11/kde/edu3/patches/patch-kiten_Makefile_am b/x11/kde/edu3/patches/patch-kiten_Makefile_am new file mode 100644 index 00000000000..503195d35c6 --- /dev/null +++ b/x11/kde/edu3/patches/patch-kiten_Makefile_am @@ -0,0 +1,11 @@ +$OpenBSD: patch-kiten_Makefile_am,v 1.1 2004/01/17 01:34:49 naddy Exp $ +--- kiten/Makefile.am.orig 2004-01-16 17:45:53.000000000 -0700 ++++ kiten/Makefile.am 2004-01-16 17:46:28.000000000 -0700 +@@ -26,6 +26,7 @@ kiten_SOURCES = dummy.cpp + + kitengen_SOURCES = xjdxgen.c + kitengen_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) ++kitengen_LINK = $(CXXLINK) + + METASOURCES = AUTO + diff --git a/x11/kde/edu3/patches/patch-kiten_Makefile_in b/x11/kde/edu3/patches/patch-kiten_Makefile_in new file mode 100644 index 00000000000..0022bc23efb --- /dev/null +++ b/x11/kde/edu3/patches/patch-kiten_Makefile_in @@ -0,0 +1,20 @@ +$OpenBSD: patch-kiten_Makefile_in,v 1.1 2004/01/17 01:34:49 naddy Exp $ +--- kiten/Makefile.in.orig 2004-01-16 17:51:36.000000000 -0700 ++++ kiten/Makefile.in 2004-01-16 17:52:38.000000000 -0700 +@@ -300,6 +300,7 @@ kiten_SOURCES = dummy.cpp + + kitengen_SOURCES = xjdxgen.c + kitengen_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) ++kitengen_LINK = $(CXXLINK) + + #>- METASOURCES = AUTO + +@@ -488,7 +489,7 @@ kiten$(EXEEXT): $(kiten_OBJECTS) $(kiten + $(CXXLINK) $(kiten_LDFLAGS) $(kiten_OBJECTS) $(kiten_LDADD) $(LIBS) + kitengen$(EXEEXT): $(kitengen_OBJECTS) $(kitengen_DEPENDENCIES) + @rm -f kitengen$(EXEEXT) +- $(LINK) $(kitengen_LDFLAGS) $(kitengen_OBJECTS) $(kitengen_LDADD) $(LIBS) ++ $(kitengen_LINK) $(kitengen_LDFLAGS) $(kitengen_OBJECTS) $(kitengen_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) core *.core