diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-11-23 11:21:24 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-11-23 11:21:24 +0100 |
| commit | e81bdd9d423b5db0d18018bd465672cd9ba74e48 (patch) | |
| tree | 617d97cf0064501967c1552ad952387ec2e9df15 | |
| parent | 8cd3b84e8c43c4319aa27ed1ac6d272d58e4a410 (diff) | |
bulk build fixes
| -rw-r--r-- | mk/build.mk | 5 | ||||
| -rw-r--r-- | package/cxxtools/Makefile | 2 | ||||
| -rw-r--r-- | package/jack/Makefile | 2 | ||||
| -rw-r--r-- | package/openbox/Makefile | 43 | ||||
| -rw-r--r-- | package/tntnet/Makefile | 2 |
5 files changed, 10 insertions, 44 deletions
diff --git a/mk/build.mk b/mk/build.mk index 207cd8c53..858ac700f 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -26,6 +26,10 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_PACKAGE_GRUB=n \ ADK_PACKAGE_BASE_FILES=y \ ADK_PACKAGE_CRYPTINIT=n \ + ADK_PACKAGE_HEIMDAL=n \ + ADK_PACKAGE_LIBHEIMDAL=n \ + ADK_PACKAGE_LIBHEIMDAL_CLIENT=n \ + ADK_PACKAGE_PAM=n \ ADK_PACKAGE_PYTHON=n \ ADK_PACKAGE_VIRTINST=n \ ADK_PACKAGE_URLGRABBER=n \ @@ -590,6 +594,7 @@ bulkallmod: $(GMAKE) prereq && \ $(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=archive allmodconfig; \ $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then echo $$system-$$libc >.exit; exit 1;fi; \ + $(GMAKE) cleantarget; \ rm .config; \ ) 2>&1 | tee $(TOPDIR)/bin/$${system}_$${arch}_$$libc/build.log; \ done; \ diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile index 8b4279f3e..2c019d4b0 100644 --- a/package/cxxtools/Makefile +++ b/package/cxxtools/Makefile @@ -15,6 +15,8 @@ PKG_URL:= http://www.tntnet.org/ PKG_SITES:= http://www.tntnet.org/download/ PKG_NEED_CXX:= 1 +PKG_ARCH_DEPENDS:= !arm + PKG_SUBPKGS:= CXXTOOLS CXXTOOLS_DEV PKGSC_CXXTOOLS_DEV:= devel PKGSD_CXXTOOLS_DEV:= a collection of general-purpose C++ classes (headers) diff --git a/package/jack/Makefile b/package/jack/Makefile index ece6930b2..90ddd180a 100644 --- a/package/jack/Makefile +++ b/package/jack/Makefile @@ -14,7 +14,7 @@ PKG_BUILDDEP:= python2 alsa-lib PKG_URL:= http://jackaudio.org PKG_SITES:= http://www.grame.fr/~letz/ -PKG_ARCH_DEPENDS:= !cris +PKG_ARCH_DEPENDS:= x86 PKG_HOST_DEPENDS:= !darwin DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 diff --git a/package/openbox/Makefile b/package/openbox/Makefile deleted file mode 100644 index d7d17fd96..000000000 --- a/package/openbox/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include $(TOPDIR)/rules.mk - -PKG_NAME:= openbox -PKG_VERSION:= 3.4.11.2 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 30e669134fa81df810fe7d1dc59cd931 -PKG_DESCR:= fast x11 window managaer -PKG_SECTION:= x11/lxde -PKG_BUILDDEP:= glib libxml2 libX11 libXext pango -PKG_DEPENDS:= glib libxml2 libx11 libxext pango libstdcxx -PKG_DEPENDS+= fontconfig -PKG_URL:= http://openbox.org/ -PKG_SITES:= http://openbox.org/dist/openbox/ - -include $(TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,OPENBOX,openbox,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -openbox-install: - $(INSTALL_DIR) $(IDIR_OPENBOX)/etc/xdg/openbox - $(CP) $(WRKINST)/etc/xdg/openbox/{rc.xml,autostart.sh} \ - $(IDIR_OPENBOX)/etc/xdg/openbox - $(INSTALL_DIR) $(IDIR_OPENBOX)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/openbox \ - $(IDIR_OPENBOX)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/obxprop \ - $(IDIR_OPENBOX)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/openbox-session \ - $(IDIR_OPENBOX)/usr/bin - $(INSTALL_DIR) $(IDIR_OPENBOX)/usr/lib - $(CP) $(WRKINST)/usr/lib/libobrender.so* \ - $(IDIR_OPENBOX)/usr/lib - $(CP) $(WRKINST)/usr/lib/libobparser.so* \ - $(IDIR_OPENBOX)/usr/lib - $(INSTALL_DIR) $(IDIR_OPENBOX)/usr/share/themes - $(CP) $(WRKINST)/usr/share/themes/* \ - $(IDIR_OPENBOX)/usr/share/themes - - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/tntnet/Makefile b/package/tntnet/Makefile index 7e9553b56..c1287bc52 100644 --- a/package/tntnet/Makefile +++ b/package/tntnet/Makefile @@ -15,6 +15,8 @@ PKG_URL:= http://www.tntnet.org/ PKG_SITES:= http://www.tntnet.org/download/ PKG_NEED_CXX:= 1 +PKG_ARCH_DEPENDS:= !arm + PKG_CHOICES_TNTNET:= WITHOUT_SSL WITH_OPENSSL WITH_GNUTLS PKGCD_WITHOUT_SSL:= use no SSL PKGCD_WITH_OPENSSL:= use OpenSSL for crypto |