diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2013-04-13 12:20:21 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2013-04-14 11:10:31 +0200 |
| commit | 5b308cc754522bb5fc3cb998131708811ca2295f (patch) | |
| tree | 6422138fb775769b56d5902f9894b1e6e1da4dff | |
| parent | 21ae8f513e570ddde6a006addf4e91ddc9c2d819 (diff) | |
| download | ptxdist-5b308cc754522bb5fc3cb998131708811ca2295f.tar.gz ptxdist-5b308cc754522bb5fc3cb998131708811ca2295f.tar.xz | |
commoncpp2: cleanup options
* --without-libxml2 is long dead
* use global IPv6 option
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/commoncpp2.in | 6 | ||||
| -rw-r--r-- | rules/commoncpp2.make | 7 |
2 files changed, 2 insertions, 11 deletions
diff --git a/rules/commoncpp2.in b/rules/commoncpp2.in index b91490f66..d25d80762 100644 --- a/rules/commoncpp2.in +++ b/rules/commoncpp2.in @@ -8,8 +8,6 @@ menuconfig COMMONCPP2 select LIBC_PTHREAD select GCCLIBS_CXX select ZLIB if COMMONCPP2_LIBZ - select LIBXML2 if COMMONCPP2_LIBXML2 - select LIBXML2_PUSH if COMMONCPP2_LIBXML2 help GNU Common C++ is a portable and highly optimized class framework for writing C++ applications that need to use threads, @@ -25,8 +23,4 @@ config COMMONCPP2_LIBZ bool prompt "enable libz compression" -config COMMONCPP2_LIBXML2 - bool - prompt "enable libxml2 parser" - endif diff --git a/rules/commoncpp2.make b/rules/commoncpp2.make index f0df90cbb..699156d68 100644 --- a/rules/commoncpp2.make +++ b/rules/commoncpp2.make @@ -41,9 +41,10 @@ COMMONCPP2_MAKE_PAR := NO # COMMONCPP2_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ + --disable-static \ --disable-debug \ --disable-profiling \ - --without-ipv6 \ + --$(call ptx/wwo, PTXCONF_GLOBAL_IPV6)-ipv6 \ --without-nat \ --without-gnutls \ --without-openssl \ @@ -59,10 +60,6 @@ ifndef PTXCONF_COMMONCPP2_LIBZ COMMONCPP2_AUTOCONF += --without-compression endif -ifndef PTXCONF_COMMONCPP2_LIBXML2 -COMMONCPP2_AUTOCONF += --without-libxml2 -endif - # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- |