[ncurses] include shared ncurses C++ libraries (#911540)
Miroslav Lichvar
mlichvar at fedoraproject.org
Mon Mar 18 17:50:44 UTC 2013
commit 23510766d12a6bf36ceb9915a9ff3d1224e36a01
Author: Miroslav Lichvar <mlichvar at redhat.com>
Date: Mon Mar 18 17:40:19 2013 +0100
include shared ncurses C++ libraries (#911540)
ncurses-libs.patch | 22 ++++++++++++++++++++++
ncurses.spec | 3 ++-
2 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/ncurses-libs.patch b/ncurses-libs.patch
index 0675cf1..c009671 100644
--- a/ncurses-libs.patch
+++ b/ncurses-libs.patch
@@ -1,3 +1,25 @@
+diff -up ncurses-5.9/c++/Makefile.in.libs ncurses-5.9/c++/Makefile.in
+--- ncurses-5.9/c++/Makefile.in.libs 2013-03-18 17:43:56.589838616 +0100
++++ ncurses-5.9/c++/Makefile.in 2013-03-18 17:54:15.484320959 +0100
+@@ -104,7 +104,7 @@ LOCAL_LIBDIR = @top_builddir@/lib
+
+ LINK = @LINK_PROGS@ $(LIBTOOL_LINK) @CXXLDFLAGS@
+ SHLIB_DIRS = -L../lib
+-SHLIB_LIST = $(SHLIB_DIRS) -lform at LIB_SUFFIX@ -lmenu at LIB_SUFFIX@ -lpanel at LIB_SUFFIX@ -lncurses at LIB_SUFFIX@ @SHLIB_LIST@
++SHLIB_LIST = $(SHLIB_DIRS) -lform at LIB_SUFFIX@ -lmenu at LIB_SUFFIX@ -lpanel at LIB_SUFFIX@ -lncurses at LIB_SUFFIX@ #@SHLIB_LIST@
+
+ LIBROOT = ncurses++
+
+@@ -127,8 +127,7 @@ LINK_SHARED = $(LINK_FLAGS)
+ TEST_LIBS = @TEST_LIBS@
+ TEST_ARGS = @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@
+
+-LDFLAGS = $(TEST_ARGS) @LDFLAGS@ \
+- @LD_MODEL@ $(TEST_LIBS) @LIBS@ @LOCAL_LDFLAGS@ $(CXXLIBS)
++LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ $(CXXLIBS)
+
+ LDFLAGS_LIBTOOL = $(LDFLAGS) $(CFLAGS_LIBTOOL)
+ LDFLAGS_NORMAL = $(LDFLAGS) $(CFLAGS_NORMAL)
diff -up ncurses-5.9/form/Makefile.in.libs ncurses-5.9/form/Makefile.in
--- ncurses-5.9/form/Makefile.in.libs 2012-02-07 18:25:33.000000000 +0100
+++ ncurses-5.9/form/Makefile.in 2012-02-07 18:26:45.915065925 +0100
diff --git a/ncurses.spec b/ncurses.spec
index 13580fe..9cfd5b9 100644
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -126,6 +126,7 @@ done
--with-pkg-config-libdir=%{_libdir}/pkgconfig \\\
--with-termlib=tinfo \\\
--with-chtype=long \\\
+ --with-cxx-shared \\\
--with-xterm-kbs=DEL
mkdir narrowc widec
@@ -199,7 +200,7 @@ echo "INPUT(-lncursesw)" > $RPM_BUILD_ROOT%{_libdir}/libcursesw.so
echo "INPUT(-ltinfo)" > $RPM_BUILD_ROOT%{_libdir}/libtermcap.so
rm -f $RPM_BUILD_ROOT%{_libdir}/terminfo
-rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/{*_g,ncurses++*}.pc
+rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/*_g.pc
bzip2 NEWS
More information about the scm-commits
mailing list