diff options
Diffstat (limited to 'package')
-rw-r--r-- | package/aufs2-util/Config.in | 2 | ||||
-rw-r--r-- | package/gcc/Config.in | 1 | ||||
-rw-r--r-- | package/gcc/Makefile | 2 | ||||
-rw-r--r-- | package/iproute2/Config.in | 2 | ||||
-rw-r--r-- | package/libvirt/Config.in | 1 | ||||
-rw-r--r-- | package/linux-atm/Config.in | 2 | ||||
-rw-r--r-- | package/m4/Makefile | 2 | ||||
-rw-r--r-- | package/mdadm/Makefile | 2 | ||||
-rw-r--r-- | package/mdadm/patches/patch-Makefile | 50 | ||||
-rw-r--r-- | package/nss/Makefile | 6 | ||||
-rw-r--r-- | package/nss/patches/patch-mozilla_security_coreconf_Linux_mk | 22 |
11 files changed, 82 insertions, 10 deletions
diff --git a/package/aufs2-util/Config.in b/package/aufs2-util/Config.in index 4e3b34dcc..f6de6a8b9 100644 --- a/package/aufs2-util/Config.in +++ b/package/aufs2-util/Config.in @@ -3,7 +3,7 @@ config ADK_PACKAGE_AUFS_UTIL tristate default n select ADK_KPACKAGE_KMOD_AUFS_FS + depends on !ADK_HOST_FREEBSD help Utilities for use with aufs2. - http://aufs.sf.net diff --git a/package/gcc/Config.in b/package/gcc/Config.in index be3446b96..5cc23e6ca 100644 --- a/package/gcc/Config.in +++ b/package/gcc/Config.in @@ -4,6 +4,7 @@ config ADK_PACKAGE_GCC default n select ADK_PACKAGE_LIBGMP select ADK_PACKAGE_MPFR + depends on !ADK_HOST_FREEBSD help GCC http://www.gnu.org/gcc diff --git a/package/gcc/Makefile b/package/gcc/Makefile index b2f6266ef..0e6384a5b 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -35,9 +35,7 @@ CONFIGURE_ARGS+= --enable-languages=c,c++ \ --disable-multilib \ --disable-libstdcxx-pch BUILD_STYLE:= auto -#ALL_TARGET:= all-gcc all-target-libgcc INSTALL_STYLE:= auto -#INSTALL_TARGET:= install-gcc install-target-libgcc post-install: ${INSTALL_DIR} ${IDIR_GCC}/usr/lib/gcc ${IDIR_GCC}/usr/bin diff --git a/package/iproute2/Config.in b/package/iproute2/Config.in index d431a5293..19c08e371 100644 --- a/package/iproute2/Config.in +++ b/package/iproute2/Config.in @@ -24,7 +24,7 @@ config ADK_PACKAGE_TC_ATM prompt "atm support....................... atm support for tc" tristate default n - depends on ADK_PACKAGE_TC + depends on ADK_PACKAGE_TC && !ADK_HOST_FREEBSD select ADK_PACKAGE_LIBATM help ATM traffic control support library. diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in index b378722b8..58f0ce617 100644 --- a/package/libvirt/Config.in +++ b/package/libvirt/Config.in @@ -5,6 +5,7 @@ config ADK_PACKAGE_LIBVIRT select ADK_PACKAGE_LIBXML2 select ADK_PACKAGE_LIBGNUTLS select ADK_PACKAGE_BRIDGE_UTILS + depends on !ADK_HOST_FREEBSD default n help http://www.libvirt.org diff --git a/package/linux-atm/Config.in b/package/linux-atm/Config.in index 991da7ecb..e89db02d1 100644 --- a/package/linux-atm/Config.in +++ b/package/linux-atm/Config.in @@ -7,6 +7,7 @@ config ADK_PACKAGE_LIBATM prompt "libatm............................. ATM Library for Linux" tristate default n + depends on !ADK_HOST_FREEBSD help ATM Library for linux @@ -15,6 +16,7 @@ config ADK_PACKAGE_BR2684CTL tristate default n select ADK_PACKAGE_LIBATM + depends on !ADK_HOST_FREEBSD help Utility for setting up ATM RFC2684 bridging mode. (Useful for PPPoE) diff --git a/package/m4/Makefile b/package/m4/Makefile index ea2d4538f..df6a82bdf 100644 --- a/package/m4/Makefile +++ b/package/m4/Makefile @@ -17,6 +17,8 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,M4,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu +CONFIGURE_ENV+= ac_cv_func_mbrtowc=no \ + gl_cv_func_wcrtomb_retval=no BUILD_STYLE:= auto INSTALL_STYLE:= auto diff --git a/package/mdadm/Makefile b/package/mdadm/Makefile index 3efb1572c..28f61ee6d 100644 --- a/package/mdadm/Makefile +++ b/package/mdadm/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mdadm PKG_VERSION:= 3.0 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 1eb89885b2b881562fc79ed2f5e1a056 PKG_DESCR:= tool for managing Linux Software RAID arrays PKG_SECTION:= utils diff --git a/package/mdadm/patches/patch-Makefile b/package/mdadm/patches/patch-Makefile new file mode 100644 index 000000000..585f6730b --- /dev/null +++ b/package/mdadm/patches/patch-Makefile @@ -0,0 +1,50 @@ +--- mdadm-3.0.orig/Makefile 2009-06-02 07:48:29.000000000 +0200 ++++ mdadm-3.0/Makefile 2009-12-11 19:01:17.000000000 +0100 +@@ -186,29 +186,36 @@ sha1.o : sha1.c sha1.h md5.h + $(CC) $(CFLAGS) -DHAVE_STDINT_H -o sha1.o -c sha1.c + + install : mdadm mdmon install-man install-udev +- $(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm +- $(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon ++ $(INSTALL) -d $(DESTDIR)$(BINDIR) ++ $(INSTALL) $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm ++ $(INSTALL) $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon + + install-static : mdadm.static install-man +- $(INSTALL) -D $(STRIP) -m 755 mdadm.static $(DESTDIR)$(BINDIR)/mdadm ++ $(INSTALL) -d $(DESTDIR)$(BINDIR) ++ $(INSTALL) $(STRIP) -m 755 mdadm.static $(DESTDIR)$(BINDIR)/mdadm + + install-tcc : mdadm.tcc install-man +- $(INSTALL) -D $(STRIP) -m 755 mdadm.tcc $(DESTDIR)$(BINDIR)/mdadm ++ $(INSTALL) -d $(DESTDIR)$(BINDIR) ++ $(INSTALL) $(STRIP) -m 755 mdadm.tcc $(DESTDIR)$(BINDIR)/mdadm + + install-uclibc : mdadm.uclibc install-man +- $(INSTALL) -D $(STRIP) -m 755 mdadm.uclibc $(DESTDIR)$(BINDIR)/mdadm ++ $(INSTALL) -d $(DESTDIR)$(BINDIR) ++ $(INSTALL) $(STRIP) -m 755 mdadm.uclibc $(DESTDIR)$(BINDIR)/mdadm + + install-klibc : mdadm.klibc install-man +- $(INSTALL) -D $(STRIP) -m 755 mdadm.klibc $(DESTDIR)$(BINDIR)/mdadm ++ $(INSTALL) -d $(DESTDIR)$(BINDIR) ++ $(INSTALL) $(STRIP) -m 755 mdadm.klibc $(DESTDIR)$(BINDIR)/mdadm + + install-man: mdadm.8 md.4 mdadm.conf.5 mdmon.8 +- $(INSTALL) -D -m 644 mdadm.8 $(DESTDIR)$(MAN8DIR)/mdadm.8 +- $(INSTALL) -D -m 644 mdmon.8 $(DESTDIR)$(MAN8DIR)/mdmon.8 +- $(INSTALL) -D -m 644 md.4 $(DESTDIR)$(MAN4DIR)/md.4 +- $(INSTALL) -D -m 644 mdadm.conf.5 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 ++ $(INSTALL) -d $(DESTDIR)$(MAN8DIR) $(DESTDIR)$(MAN4DIR) $(DESTDIR)$(MAN5DIR) ++ $(INSTALL) -m 644 mdadm.8 $(DESTDIR)$(MAN8DIR)/mdadm.8 ++ $(INSTALL) -m 644 mdmon.8 $(DESTDIR)$(MAN8DIR)/mdmon.8 ++ $(INSTALL) -m 644 md.4 $(DESTDIR)$(MAN4DIR)/md.4 ++ $(INSTALL) -m 644 mdadm.conf.5 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 + + install-udev: udev-md-raid.rules +- $(INSTALL) -D -m 644 udev-md-raid.rules $(DESTDIR)/lib/udev/rules.d/64-md-raid.rules ++ $(INSTALL) -d $(DESTDIR)/lib/udev/rules.d/ ++ $(INSTALL) -m 644 udev-md-raid.rules $(DESTDIR)/lib/udev/rules.d/64-md-raid.rules + + uninstall: + rm -f $(DESTDIR)$(MAN8DIR)/mdadm.8 $(DESTDIR)$(MAN8DIR)/mdmon.8 $(DESTDIR)$(MAN4DIR)/md.4 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 $(DESTDIR)$(BINDIR)/mdadm diff --git a/package/nss/Makefile b/package/nss/Makefile index e3011eebb..48022d2f2 100644 --- a/package/nss/Makefile +++ b/package/nss/Makefile @@ -31,10 +31,10 @@ TLDFLAGS:= '' BUILD_STYLE:= auto INSTALL_STYLE:= auto -MAKE_FLAGS+= SOURCE_MD_DIR=${WRKDIST}/dist DIST=${WRKDIST}/dist NSS_DISABLE_DBM=1 OS_TEST=${ARCH} \ - ARCHFLAG="${TCFLAGS} ${TCPPFLAGS}" +MAKE_FLAGS+= SOURCE_MD_DIR=${WRKDIST}/dist DIST=${WRKDIST}/dist \ + ARCHFLAG="${TCFLAGS} ${TCPPFLAGS} -ldl" ALL_TARGET:= build_coreconf all -XAKE_FLAGS+= OS_TEST=${ARCH} NSS_DISABLE_DBM=1 +XAKE_FLAGS+= OS_TEST=${ARCH} NSS_DISABLE_DBM=1 OS_TARGET=Linux OS_RELEASE=2.6 post-install: $(INSTALL_DIR) $(IDIR_NSS)/usr/lib diff --git a/package/nss/patches/patch-mozilla_security_coreconf_Linux_mk b/package/nss/patches/patch-mozilla_security_coreconf_Linux_mk index cce23e2ee..68345c404 100644 --- a/package/nss/patches/patch-mozilla_security_coreconf_Linux_mk +++ b/package/nss/patches/patch-mozilla_security_coreconf_Linux_mk @@ -1,5 +1,5 @@ ---- nss-3.12.3.orig/mozilla/security/coreconf/Linux.mk 2008-09-06 01:17:23.000000000 +0200 -+++ nss-3.12.3/mozilla/security/coreconf/Linux.mk 2009-06-24 19:11:27.470840369 +0200 +--- nss-3.12.4.orig/mozilla/security/coreconf/Linux.mk 2009-07-30 01:43:41.000000000 +0200 ++++ nss-3.12.4/mozilla/security/coreconf/Linux.mk 2009-12-11 20:45:13.000000000 +0100 @@ -46,9 +46,9 @@ ifeq ($(USE_PTHREADS),1) IMPL_STRATEGY = _PTH endif @@ -13,3 +13,21 @@ DEFAULT_COMPILER = gcc +@@ -135,7 +135,7 @@ OS_PTHREAD = -lpthread + endif + + OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -ansi -Wall -Werror-implicit-function-declaration -Wno-switch -pipe -DLINUX -Dlinux -D_POSIX_SOURCE -D_BSD_SOURCE -DHAVE_STRERROR +-OS_LIBS = $(OS_PTHREAD) -ldl -lc ++OS_LIBS = $(OS_PTHREAD) + + ifdef USE_PTHREADS + DEFINES += -D_REENTRANT +@@ -151,7 +151,7 @@ DSO_LDOPTS = -shared $(ARCHFLAG) + ZDEFS_FLAG = -Wl,-z,defs + DSO_LDOPTS += $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG)) + DSO_LDFLAGS = +-LDFLAGS += $(ARCHFLAG) ++#LDFLAGS += $(ARCHFLAG) + + # INCLUDES += -I/usr/include -Y/usr/include/linux + G++INCLUDES = -I/usr/include/g++ |