From b289db8925f82e83048caa34332ccd654d12f62d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 20 Nov 2009 09:31:11 +0100 Subject: package updates and compile fixes - update ctorrent, cups, gnutls and freeradius-server - compile kerberos (heimdal,krb5) with com_err library from e2fsprogs to allow both to be build without installing local copys of libcom_err - cleanup lynx package add zlib dependency --- package/cxxtools/patches/patch-Makefile_in | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 package/cxxtools/patches/patch-Makefile_in (limited to 'package/cxxtools') diff --git a/package/cxxtools/patches/patch-Makefile_in b/package/cxxtools/patches/patch-Makefile_in new file mode 100644 index 000000000..d0936ae5d --- /dev/null +++ b/package/cxxtools/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +--- cxxtools-1.4.8.orig/Makefile.in 2008-05-26 19:51:34.000000000 +0200 ++++ cxxtools-1.4.8/Makefile.in 2009-11-19 22:10:18.000000000 +0100 +@@ -200,7 +200,7 @@ subdirs = @subdirs@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + ACLOCAL_AMFLAGS = -I m4 +-SUBDIRS = src include demo ++SUBDIRS = src include + bin_SCRIPTS = cxxtools-config + EXTRA_dist = \ + m4/acx_pthread.m4 \ -- cgit v1.2.3 From 15f7f8f402eab5b7cd03094c358435c4c880b5b6 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 22 Nov 2009 11:36:13 +0100 Subject: more bulk build fixes - update rtorrent, libtorrent and libsigc++ - add skeleton for cfinstaller - fix uclibc samba compile - fix parallel builds - update tcl - update iw - remove mac80211 package, use kernel integrated drivers - mark packages which can not be compiled parallel (make -j2) --- package/cxxtools/Config.in | 2 +- package/cxxtools/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'package/cxxtools') diff --git a/package/cxxtools/Config.in b/package/cxxtools/Config.in index bdc0168a7..5c040b674 100644 --- a/package/cxxtools/Config.in +++ b/package/cxxtools/Config.in @@ -10,7 +10,7 @@ config ADK_PACKAGE_CXXTOOLS choice prompt "C++ library to use" depends on ADK_PACKAGE_CXXTOOLS -default ADK_COMPILE_CXXTOOLS_WITH_STDCXX if ADK_TARGET_LIB_GLIBC +default ADK_COMPILE_CXXTOOLS_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC default ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC config ADK_COMPILE_CXXTOOLS_WITH_STDCXX diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile index f3a270aa8..36e91f35c 100644 --- a/package/cxxtools/Makefile +++ b/package/cxxtools/Makefile @@ -24,8 +24,8 @@ endif $(eval $(call PKG_template,CXXTOOLS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y) -TCXXFLAGS+= -fno-builtin -nostdinc++ -I${STAGING_DIR}/usr/include/uClibc++ -TLDFLAGS+= -luClibc++ -liconv -lm -nodefaultlibs +TCXXFLAGS+= -fno-builtin -nostdinc++ -I${STAGING_DIR}/usr/include/uClibc++ -Wl,-E +TLDFLAGS+= -luClibc++ -liconv -lm -nodefaultlibs -shared else TLDFLAGS+= -liconv -shared endif -- cgit v1.2.3 From c111f14db1b4558ebf5b2e894315c8e5217bf6fc Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 22 Nov 2009 16:08:36 +0100 Subject: make bulk build on Debian/lenny x86 complete - fix some menu descriptions - fix gcc package compile --- package/cxxtools/Config.in | 1 + 1 file changed, 1 insertion(+) (limited to 'package/cxxtools') diff --git a/package/cxxtools/Config.in b/package/cxxtools/Config.in index 5c040b674..566d2e6cb 100644 --- a/package/cxxtools/Config.in +++ b/package/cxxtools/Config.in @@ -21,6 +21,7 @@ config ADK_COMPILE_CXXTOOLS_WITH_STDCXX config ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX bool "Embedded uClibc++ library" select ADK_PACKAGE_UCLIBCXX + depends on ADK_BROKEN help endchoice -- cgit v1.2.3 From 02e9bb0970ba681f228dc642b1e5026cc97047c7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 25 Nov 2009 21:13:21 +0100 Subject: simplify buildsystem - remove ADK_IPV6, ADK_CXX and ADK_X11 - enable ipv6 by default in uclibc - enable build of c++ compiler by default --- package/cxxtools/Config.in | 1 - 1 file changed, 1 deletion(-) (limited to 'package/cxxtools') diff --git a/package/cxxtools/Config.in b/package/cxxtools/Config.in index 566d2e6cb..d7dcdb87d 100644 --- a/package/cxxtools/Config.in +++ b/package/cxxtools/Config.in @@ -2,7 +2,6 @@ config ADK_PACKAGE_CXXTOOLS prompt "cxxtools.......................... cxxtools" tristate default n - depends on ADK_CXX select ADK_PACKAGE_LIBICONV help http://www.tntnet.org -- cgit v1.2.3 From 1c8d49e1ee453e44af6c57f10e8b929d5ccdd3a2 Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sat, 19 Dec 2009 22:53:46 +0059 Subject: create package/Depends.mk dynamically; add PKG_BUILDDEP to all Makefiles Signed-off-by: Thorsten Glaser --- package/cxxtools/Makefile | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'package/cxxtools') diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile index 36e91f35c..a8b926ba9 100644 --- a/package/cxxtools/Makefile +++ b/package/cxxtools/Makefile @@ -6,6 +6,10 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cxxtools PKG_VERSION:= 1.4.8 PKG_RELEASE:= 1 +PKG_BUILDDEP+= libiconv +ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y) +PKG_BUILDDEP+= uclibc++ +endif PKG_MD5SUM:= 16ce92a83beb925fa5138fc9a52d55af PKG_DESCR:= a collection of general-purpose C++ classes PKG_SECTION:= net -- cgit v1.2.3 From 39d2849441575a8cc683c215ab32f93eccfd79ab Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sun, 20 Dec 2009 00:53:52 +0059 Subject: automatic handling of CFrustFrust packages Signed-off-by: Thorsten Glaser --- package/cxxtools/Makefile | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'package/cxxtools') diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile index a8b926ba9..0de136708 100644 --- a/package/cxxtools/Makefile +++ b/package/cxxtools/Makefile @@ -7,9 +7,7 @@ PKG_NAME:= cxxtools PKG_VERSION:= 1.4.8 PKG_RELEASE:= 1 PKG_BUILDDEP+= libiconv -ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y) -PKG_BUILDDEP+= uclibc++ -endif +PKG_CXX:= CXXTOOLS PKG_MD5SUM:= 16ce92a83beb925fa5138fc9a52d55af PKG_DESCR:= a collection of general-purpose C++ classes PKG_SECTION:= net @@ -19,12 +17,6 @@ PKG_SITES:= http://www.tntnet.org/download/ include ${TOPDIR}/mk/package.mk -ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y) -PKG_DEPENDS+= uclibc++ -else -PKG_DEPENDS+= libstdcxx -endif - $(eval $(call PKG_template,CXXTOOLS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y) -- cgit v1.2.3 From ce621815fecece2b4d8a4cb7115eb82c1cb7ed44 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 23 Dec 2009 11:37:42 +0100 Subject: remove and ignore autogenerated Config.in files --- package/cxxtools/Config.in | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 package/cxxtools/Config.in (limited to 'package/cxxtools') diff --git a/package/cxxtools/Config.in b/package/cxxtools/Config.in deleted file mode 100644 index d7dcdb87d..000000000 --- a/package/cxxtools/Config.in +++ /dev/null @@ -1,26 +0,0 @@ -config ADK_PACKAGE_CXXTOOLS - prompt "cxxtools.......................... cxxtools" - tristate - default n - select ADK_PACKAGE_LIBICONV - help - http://www.tntnet.org - -choice -prompt "C++ library to use" -depends on ADK_PACKAGE_CXXTOOLS -default ADK_COMPILE_CXXTOOLS_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC -default ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC - -config ADK_COMPILE_CXXTOOLS_WITH_STDCXX - bool "Standard C++ library" - select ADK_PACKAGE_LIBSTDCXX - help - -config ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX - bool "Embedded uClibc++ library" - select ADK_PACKAGE_UCLIBCXX - depends on ADK_BROKEN - help - -endchoice -- cgit v1.2.3 From dd163e09b582177ce54fae44b63b10579ee0746d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 27 Dec 2009 23:09:19 +0100 Subject: fix make allmodconfig update several packages, remove snort-wireless. --- package/cxxtools/Makefile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'package/cxxtools') diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile index 0de136708..326bed156 100644 --- a/package/cxxtools/Makefile +++ b/package/cxxtools/Makefile @@ -6,14 +6,15 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cxxtools PKG_VERSION:= 1.4.8 PKG_RELEASE:= 1 -PKG_BUILDDEP+= libiconv -PKG_CXX:= CXXTOOLS PKG_MD5SUM:= 16ce92a83beb925fa5138fc9a52d55af PKG_DESCR:= a collection of general-purpose C++ classes PKG_SECTION:= net PKG_DEPENDS:= libiconv +PKG_BUILDDEP+= libiconv PKG_URL:= http://www.tntnet.org PKG_SITES:= http://www.tntnet.org/download/ +#PKG_CXX:= CXXTOOLS + include ${TOPDIR}/mk/package.mk @@ -34,12 +35,12 @@ CONFIGURE_ARGS+= --with-libiconv-prefix='${STAGING_DIR}/usr' BUILD_STYLE:= auto INSTALL_STYLE:= auto confprog -ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y) +#ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y) # add workaround because libtool tries to link libstdc++ -post-configure: - ${SED} 's#postdeps="-lstdc.*#postdeps=""#' \ - ${WRKBUILD}/libtool -endif +#post-configure: +# ${SED} 's#postdeps="-lstdc.*#postdeps=""#' \ +# ${WRKBUILD}/libtool +#endif post-install: ${INSTALL_DIR} ${IDIR_CXXTOOLS}/usr/lib -- cgit v1.2.3 From 6daa792eab1488d013fefc5eb7e4d01f40f38687 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 7 Feb 2010 20:03:20 +0100 Subject: change defaults for CONFIG/BUILD/INSTALL styles All packages need an update, so here is a very huge commit. Most of the 460 source packages use automatic style for configuration, building and installing. Make these styles default to "auto". If you have a package, which does not conform to this, just use manual style and add a do-$task make target. I added a new style named AUTOTOOL style, which is needed for some broken packages, which needs to be updated via autoconf or automake. I renamed CONFIGURE_STYLE to CONFIG_STYLE. Updates for some packages, which have newer upstream versions. Renaming of all package/*/extra directories. Use the directory src/ to provide overwrites of source files or to add the code, when no upstream package is available or used. src directory will be automatically used. --- package/cxxtools/Makefile | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'package/cxxtools') diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile index 326bed156..7a3e3f142 100644 --- a/package/cxxtools/Makefile +++ b/package/cxxtools/Makefile @@ -13,15 +13,14 @@ PKG_DEPENDS:= libiconv PKG_BUILDDEP+= libiconv PKG_URL:= http://www.tntnet.org PKG_SITES:= http://www.tntnet.org/download/ -#PKG_CXX:= CXXTOOLS - include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,CXXTOOLS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y) -TCXXFLAGS+= -fno-builtin -nostdinc++ -I${STAGING_DIR}/usr/include/uClibc++ -Wl,-E +TCXXFLAGS+= -fno-builtin -nostdinc++ \ + -I${STAGING_DIR}/usr/include/uClibc++ -Wl,-E TLDFLAGS+= -luClibc++ -liconv -lm -nodefaultlibs -shared else TLDFLAGS+= -liconv -shared @@ -29,21 +28,10 @@ endif TCFLAGS+= -fPIC TCXXFLAGS+= -fPIC -CONFIGURE_STYLE:= gnu -CONFIGURE_ENV+= ac_cv_lib_nsl_setsockopt=no CONFIGURE_ARGS+= --with-libiconv-prefix='${STAGING_DIR}/usr' -BUILD_STYLE:= auto -INSTALL_STYLE:= auto confprog - -#ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y) -# add workaround because libtool tries to link libstdc++ -#post-configure: -# ${SED} 's#postdeps="-lstdc.*#postdeps=""#' \ -# ${WRKBUILD}/libtool -#endif post-install: ${INSTALL_DIR} ${IDIR_CXXTOOLS}/usr/lib - ${CP} ${WRKINST}/usr/lib/libcxxtools.so.* ${IDIR_CXXTOOLS}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libcxxtools.so* ${IDIR_CXXTOOLS}/usr/lib/ include ${TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3