rpms/ncurses
5
0
Fork 0
Code Issues Pull Requests Releases Activity

include shared ncurses C++ libraries (#911540)

Browse Source
This commit is contained in:
Miroslav Lichvar 2013-03-18 17:40:19 +01:00
parent fcaa41eeff
commit 23510766d1
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ncurses-libs.patch
View File

@ -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@LIB_SUFFIX@ -lmenu@LIB_SUFFIX@ -lpanel@LIB_SUFFIX@ -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
+SHLIB_LIST = $(SHLIB_DIRS) -lform@LIB_SUFFIX@ -lmenu@LIB_SUFFIX@ -lpanel@LIB_SUFFIX@ -lncurses@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

3
ncurses.spec
View File

@ -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