OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 01-May-2007 14:34:20
Branch: HEAD Handle: 2007050113341900
Modified files:
openpkg-src/ncurses ncurses.patch ncurses.spec
Log:
fix building under Solaris where no static libc is available (in at
least default installations)
Summary:
Revision Changes Path
1.11 +56 -17 openpkg-src/ncurses/ncurses.patch
1.317 +1 -1 openpkg-src/ncurses/ncurses.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ncurses/ncurses.patch
============================================================================
$ cvs diff -u -r1.10 -r1.11 ncurses.patch
--- openpkg-src/ncurses/ncurses.patch 22 Apr 2007 07:07:47 -0000 1.10
+++ openpkg-src/ncurses/ncurses.patch 1 May 2007 12:34:19 -0000 1.11
@@ -8,9 +8,9 @@
arbitrary C compiler (usually a non-GCC 3.x vendor compiler!).
Index: include/curses.h.in
---- include/curses.h.in.orig 2004-02-22 09:36:58.000000000 +0100
-+++ include/curses.h.in 2004-02-22 09:37:14.000000000 +0100
-@@ -61,7 +61,11 @@
+--- include/curses.h.in.orig 2007-05-01 14:30:17 +0200
++++ include/curses.h.in 2007-05-01 14:30:18 +0200
+@@ -69,7 +69,11 @@
* User-definable tweak to disable the include of <stdbool.h>.
*/
#ifndef NCURSES_ENABLE_STDBOOL_H
@@ -24,22 +24,40 @@
/*
Index: ncurses/Makefile.in
---- ncurses/Makefile.in.orig Wed Dec 22 13:02:27 2004
-+++ ncurses/Makefile.in Wed Dec 22 13:02:30 2004
-@@ -273,7 +273,8 @@
- @ECHO_LINK@ $(CC) -o $@ $(CFLAGS_DEFAULT) -DHASHDEBUG
$(serial)/hashmap.c $(TEST_LDFLAGS)
+--- ncurses/Makefile.in.orig 2007-05-01 14:30:17 +0200
++++ ncurses/Makefile.in 2007-05-01 14:30:18 +0200
+@@ -154,7 +154,7 @@
+ names-stamp
+
+ TEST_DEPS = ../lib/@[EMAIL PROTECTED]@DFT_DEP_SUFFIX@
+-TEST_ARGS = @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@
++TEST_ARGS = @TEST_ARGS@ @LDFLAGS_SHARED@
+ TEST_LDFLAGS = @LD_MODEL@ $(TEST_ARGS) @LIBS@ @LOCAL_LDFLAGS@
@LDFLAGS@
+
+ TEST_PROGS = \
+@@ -275,7 +275,8 @@
+ @ECHO_LINK@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DHASHDEBUG
$(serial)/hashmap.c $(TEST_LDFLAGS)
lib_mvcur$x : $(serial)/lib_mvcur.c $(TEST_DEPS) \
- ../@DFT_OBJ_SUBDIR@/dump_entry$o
+ ../@DFT_OBJ_SUBDIR@/dump_entry$o \
+ ../@DFT_OBJ_SUBDIR@/comp_parse$o
- @ECHO_LINK@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DNCURSES_TEST
-I$(serial)/../../progs $(serial)/lib_mvcur.c ../@DFT_OBJ_SUBDIR@/dump_entry$o
$(TEST_LDFLAGS)
+ @ECHO_LINK@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DNCURSES_TEST
-I$(serial)/../../progs $(serial)/lib_mvcur.c ../@DFT_OBJ_SUBDIR@/dump_entry$o
$(TEST_LDFLAGS)
- link_test$x : link_test.c $(TEST_DEPS) \
+ link_test$x : ./link_test.c $(TEST_DEPS) \
Index: progs/Makefile.in
---- progs/Makefile.in.orig Sat Nov 1 23:45:57 2003
-+++ progs/Makefile.in Wed Dec 22 13:04:07 2004
-@@ -192,7 +192,8 @@
+--- progs/Makefile.in.orig 2007-05-01 14:30:17 +0200
++++ progs/Makefile.in 2007-05-01 14:30:18 +0200
+@@ -99,7 +99,7 @@
+
+ LD = @LD@
+ LINK = @LINK_PROGS@ $(LIBTOOL_LINK)
+-LDFLAGS = @EXTRA_LDFLAGS@ @LDFLAGS_STATIC@ @TICS_ARGS@
@TINFO_ARGS@ @LDFLAGS_SHARED@ @LDFLAGS@ @LD_MODEL@ @LIBS@
++LDFLAGS = @EXTRA_LDFLAGS@ @TICS_ARGS@ @TINFO_ARGS@
@LDFLAGS_SHARED@ @LDFLAGS@ @LD_MODEL@ @LIBS@
+
+ LDFLAGS_LIBTOOL = $(LDFLAGS) $(CFLAGS_LIBTOOL)
+ LDFLAGS_NORMAL = $(LDFLAGS) $(CFLAGS_NORMAL)
+@@ -207,7 +207,8 @@
DEPS_TIC = \
$(MODEL)/tic$o \
@@ -49,7 +67,7 @@
tic$x: $(DEPS_TIC) $(DEPS_CURSES) transform.h
@ECHO_LINK@ $(LINK) $(DEPS_TIC) $(LDFLAGS_DEFAULT) -o $@
-@@ -211,14 +212,16 @@
+@@ -226,14 +227,16 @@
@ECHO_LINK@ $(LINK) $(DEPS_CLEAR) $(LDFLAGS_DEFAULT) -o $@
DEPS_TPUT = \
@@ -68,11 +86,32 @@
infocmp$x: $(DEPS_INFOCMP) $(DEPS_CURSES)
@ECHO_LINK@ $(LINK) $(DEPS_INFOCMP) $(LDFLAGS_DEFAULT) -o $@
+Index: test/Makefile.in
+--- test/Makefile.in.orig 2007-05-01 14:30:17 +0200
++++ test/Makefile.in 2007-05-01 14:30:18 +0200
+@@ -87,7 +87,7 @@
+ LDFLAGS_PROFILE = $(LDFLAGS) $(CFLAGS_PROFILE)
+ LDFLAGS_SHARED = $(LDFLAGS) $(CFLAGS_SHARED) @LD_SHARED_OPTS@
+
+-TEST_ARGS = @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@
++TEST_ARGS = @TEST_ARGS@ @LDFLAGS_SHARED@
+
+ # use these for linking with all of the libraries
+ LIBS_DEFAULT = $(TEST_ARGS) @LIBS@ $(MATH_LIB)
+@@ -98,7 +98,7 @@
+ LDFLAGS_CURSES = $([EMAIL PROTECTED]@) $(LIBS_CURSES)
+
+ # use these for linking with the tinfo library if we have it, or curses
library if not
+-LIBS_TINFO = @LDFLAGS_STATIC@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LIBS@
$(MATH_LIB)
++LIBS_TINFO = @TINFO_ARGS@ @LDFLAGS_SHARED@ @LIBS@ $(MATH_LIB)
+ LDFLAGS_TINFO = $([EMAIL PROTECTED]@) $(LIBS_TINFO)
+
+ LINT = @LINT@
Index: test/programs
---- test/programs.orig 2006-06-18 09:10:51 +0200
-+++ test/programs 2006-06-18 09:13:14 +0200
-@@ -36,7 +36,7 @@
- cardfile $(LDFLAGS_DEFAULT) $(LOCAL_LIBS) cardfile
+--- test/programs.orig 2007-05-01 14:30:17 +0200
++++ test/programs 2007-05-01 14:30:18 +0200
+@@ -37,7 +37,7 @@
+ chgat $(LDFLAGS_CURSES) $(LOCAL_LIBS) chgat
color_set $(LDFLAGS_CURSES) $(LOCAL_LIBS) color_set
demo_altkeys $(LDFLAGS_CURSES) $(LOCAL_LIBS) demo_altkeys
-demo_defkey $(LDFLAGS_CURSES) $(LOCAL_LIBS) demo_defkey
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ncurses/ncurses.spec
============================================================================
$ cvs diff -u -r1.316 -r1.317 ncurses.spec
--- openpkg-src/ncurses/ncurses.spec 29 Apr 2007 07:01:05 -0000 1.316
+++ openpkg-src/ncurses/ncurses.spec 1 May 2007 12:34:19 -0000 1.317
@@ -49,7 +49,7 @@
Group: Terminal
License: MIT-style
Version: %{V_base}.%{V_patchL}
-Release: 20070429
+Release: 20070501
# list of sources
Source0: ftp://invisible-island.net/ncurses/ncurses-%{V_base}.tar.gz
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
