diff options
| -rw-r--r-- | mk/build.mk | 3 | ||||
| -rw-r--r-- | package/file/Makefile | 1 | ||||
| -rw-r--r-- | package/lvm/patches/patch-libdm_Makefile_in | 6 | ||||
| -rw-r--r-- | package/lvm/patches/patch-tools_Makefile_in | 15 | ||||
| -rwxr-xr-x | scripts/cpio | 2 |
5 files changed, 19 insertions, 8 deletions
diff --git a/mk/build.mk b/mk/build.mk index f2d58ad5c..f6e438508 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -23,6 +23,7 @@ DEFCONFIG= ADK_DEVELSYSTEM=n \ ADK_PACKAGE_HEIMDAL_SERVER=n \ ADK_PACKAGE_LIBHEIMDAL=n \ ADK_PACKAGE_LIBHEIMDAL_CLIENT=n \ + BUSYBOX_BBCONFIG=n \ BUSYBOX_SELINUX=n \ BUSYBOX_MODPROBE_SMALL=n \ BUSYBOX_EJECT=n \ @@ -393,7 +394,7 @@ menuconfig: $(CONFIG)/mconf defconfig .menu _config: $(CONFIG)/conf .menu -@touch .config - @$(CONFIG)/conf ${W} $(CONFIG_CONFIG_IN) >/dev/null + @$(CONFIG)/conf ${W} $(CONFIG_CONFIG_IN) ${POSTCONFIG} .NOTPARALLEL: _mconfig diff --git a/package/file/Makefile b/package/file/Makefile index c090033f4..2b68ec306 100644 --- a/package/file/Makefile +++ b/package/file/Makefile @@ -21,6 +21,7 @@ pre-configure: (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \ CFLAGS="-static" \ ./configure --enable-static --disable-shared \ + --disable-warnings \ ); ${MAKE} -C ${WRKBUILD} ${INSTALL_BIN} ${WRKBUILD}/src/file ${WRKBUILD}/magic diff --git a/package/lvm/patches/patch-libdm_Makefile_in b/package/lvm/patches/patch-libdm_Makefile_in index 02d029e48..0a7799b33 100644 --- a/package/lvm/patches/patch-libdm_Makefile_in +++ b/package/lvm/patches/patch-libdm_Makefile_in @@ -1,6 +1,6 @@ always install static library ---- LVM2.2.02.51.orig/libdm/Makefile.in 2009-04-08 16:04:35.000000000 +0200 -+++ LVM2.2.02.51/libdm/Makefile.in 2009-08-22 15:37:53.000000000 +0200 +--- LVM2.2.02.51.orig/libdm/Makefile.in Wed Apr 8 16:04:35 2009 ++++ LVM2.2.02.51/libdm/Makefile.in Mon Feb 15 23:25:01 2010 @@ -34,9 +34,9 @@ SOURCES =\ INCLUDES = -I$(interface) -I. @@ -35,7 +35,7 @@ always install static library $(includedir)/libdevmapper.h install_dynamic: install_@interface@ -@@ -83,15 +84,17 @@ install_static: install_@interface@_stat +@@ -83,15 +84,17 @@ install_static: install_@interface@_static $(LN_S) -f libdevmapper.a.$(LIB_VERSION_DM) $(libdir)/libdevmapper.a install_ioctl: ioctl/libdevmapper.$(LIB_SUFFIX) diff --git a/package/lvm/patches/patch-tools_Makefile_in b/package/lvm/patches/patch-tools_Makefile_in index 5dc0235e4..8d6e49a3f 100644 --- a/package/lvm/patches/patch-tools_Makefile_in +++ b/package/lvm/patches/patch-tools_Makefile_in @@ -1,6 +1,15 @@ ---- LVM2.2.02.51.orig/tools/Makefile.in 2009-05-21 13:11:29.000000000 +0200 -+++ LVM2.2.02.51/tools/Makefile.in 2009-08-22 15:30:31.000000000 +0200 -@@ -160,21 +160,24 @@ cflow: lvm.cflow lvm.xref lvm.tree lvm.r +--- LVM2.2.02.51.orig/tools/Makefile.in Thu May 21 13:11:29 2009 ++++ LVM2.2.02.51/tools/Makefile.in Mon Feb 15 23:30:04 2010 +@@ -137,7 +137,7 @@ liblvm2cmd.$(LIB_SUFFIX): liblvm2cmd.a $(LDDEPS) + + .commands: commands.h cmdnames.h Makefile + $(CC) -E -P cmdnames.h 2> /dev/null | \ +- egrep -v '^ *(|#.*|dumpconfig|formats|help|pvdata|segtypes|version) *$$' > .commands ++ egrep -v '^ *\(|#.*|dumpconfig|formats|help|pvdata|segtypes|version\) *$$' > .commands + + .PHONY: install_cmdlib_dynamic install_cmdlib_static \ + install_tools_dynamic install_tools_static +@@ -160,21 +160,24 @@ cflow: lvm.cflow lvm.xref lvm.tree lvm.rtree lvm.rxref endif install_cmdlib_dynamic: liblvm2cmd.$(LIB_SUFFIX) diff --git a/scripts/cpio b/scripts/cpio index 0b406f712..7936b727f 100755 --- a/scripts/cpio +++ b/scripts/cpio @@ -4,7 +4,7 @@ os=$(uname) case $os in - NetBSD|MirBSD) + NetBSD|MirBSD|OpenBSD) quiet="" ;; *) |