diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-28 12:56:36 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-28 12:56:36 +0100 |
| commit | 62d218c2368b3ad1e9802075cef06e3f626fb234 (patch) | |
| tree | 4804f063c6e29cd1b17097324d6bd262a3c291b5 /package/ncurses | |
| parent | b3259201a158cb1a571c2a3b2976fbd7b95a4b80 (diff) | |
| parent | 03c7aed5dcad2172bbe1bcd311fabb63fbf6dca0 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/ncurses')
| -rw-r--r-- | package/ncurses/Makefile | 5 | ||||
| -rw-r--r-- | package/ncurses/patches/patch-misc_run_tic_in | 12 |
2 files changed, 4 insertions, 13 deletions
diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index c3997b060..9e9ddf9b5 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -43,12 +43,15 @@ INSTALL_STYLE= auto ALL_TARGET:= libs INSTALL_TARGET:= install.libs install.data +ifeq (${ADK_HOST_CYGWIN},y) +CONFOPT:= --with-shared +endif pre-configure: (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \ ./configure \ + ${CONFOPT} \ --with-build-cc=${HOSTCC} \ - --with-shared \ --with-progs \ ); ${MAKE} -C ${WRKBUILD}/include diff --git a/package/ncurses/patches/patch-misc_run_tic_in b/package/ncurses/patches/patch-misc_run_tic_in deleted file mode 100644 index c2d76c4f7..000000000 --- a/package/ncurses/patches/patch-misc_run_tic_in +++ /dev/null @@ -1,12 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- ncurses-5.7.orig/misc/run_tic.in 2006-10-28 21:43:30.000000000 +0200 -+++ ncurses-5.7/misc/run_tic.in 2009-05-07 18:43:38.156250000 +0200 -@@ -61,7 +61,7 @@ test -z "${DESTDIR}" && DESTDIR= - # Allow tic to run either from the install-path, or from the build-directory. - # Do not do this if we appear to be cross-compiling. In that case, we rely - # on the host's copy of tic to compile the terminfo database. --if test "$THAT_CC" = "$THIS_CC" ; then -+if test "$THAT_CC" != "$THIS_CC" ; then - case "$PATH" in - :*) PATH=../progs:../lib:${DESTDIR}$bindir$PATH ;; - *) PATH=../progs:../lib:${DESTDIR}$bindir:$PATH ;; |