summaryrefslogtreecommitdiff
path: root/package/ncurses
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-07-26 21:43:57 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-07-26 21:43:57 +0200
commit06b3c25fea4145aae350fc569fb368b0c353ac04 (patch)
tree4187930f398a44e7c6e94df14be184138b0db894 /package/ncurses
parent4108f25fb4ec47a4761b11e9d56dc829610ec8d0 (diff)
fix build on MacOS X, static compiling of hosttools is not possible
Diffstat (limited to 'package/ncurses')
-rw-r--r--package/ncurses/Makefile13
-rw-r--r--package/ncurses/patches/patch-progs_Makefile_in11
2 files changed, 18 insertions, 6 deletions
diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index 6f312d3a1..053d06fe2 100644
--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= ncurses
PKG_VERSION:= 5.7
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= cce05daf61a64501ef6cd8da1f727ec6
PKG_DESCR:= a terminal handling library
PKG_SECTION:= libs
@@ -48,19 +48,20 @@ CONFIGURE_ARGS+= --without-cxx \
ALL_TARGET:= libs
INSTALL_TARGET:= install.libs install.data
-ifeq (${ADK_HOST_CYGWIN},y)
-CONFOPT:= --with-shared
-endif
-
pre-configure:
+ # create tic host binary
(cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
./configure \
- ${CONFOPT} \
+ --with-shared \
--with-build-cc=${HOSTCC} \
--with-progs \
+ --without-debug \
+ --without-profile \
);
${MAKE} -C ${WRKBUILD}/include
${MAKE} -C ${WRKBUILD}/progs
+ find ${WRKBUILD} -name *.o -exec rm {} \;
+ find ${WRKBUILD} -name *.a -exec rm {} \;
post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
# this is installed as libncurses - make libcurses a "link"
diff --git a/package/ncurses/patches/patch-progs_Makefile_in b/package/ncurses/patches/patch-progs_Makefile_in
new file mode 100644
index 000000000..db8b6a74b
--- /dev/null
+++ b/package/ncurses/patches/patch-progs_Makefile_in
@@ -0,0 +1,11 @@
+--- ncurses-5.7.orig/progs/Makefile.in 2008-09-07 15:58:55.000000000 +0200
++++ ncurses-5.7/progs/Makefile.in 2010-07-26 17:44:33.000000000 +0200
+@@ -109,7 +109,7 @@ LDFLAGS_SHARED = $(LDFLAGS) $(CFLAGS_SHA
+
+ LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@)
+
+-LIBS_TIC = @LDFLAGS_STATIC@ @TICS_ARGS@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
++LIBS_TIC = ../lib/libncurses.a
+ LDFLAGS_TIC = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TIC)
+
+ LIBS_TINFO = @LDFLAGS_STATIC@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@