summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-08-26 23:33:28 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-08-26 23:33:28 +0000
commitc86c1f7986f7e52a1deaf5e4b39868af076ae811 (patch)
tree48ce26c5646cad24bc2205a256a04c346f590810 /package
parent49b68868da34494ce47a16905e6df92aa030b607 (diff)
package/util-linux fixes:
* don't use Build/Configure/Default since it is not an autoconf based package * fix opt flags passed more than once * move DEPENDS:=@!LINUX_2_6_ETRAX in shared Package/util-linux/Default git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8498 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/util-linux/Makefile23
1 files changed, 14 insertions, 9 deletions
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index 810a093677..c5c574c4bb 100644
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -21,13 +21,13 @@ include $(INCLUDE_DIR)/package.mk
define Package/util-linux/Default
SECTION:=utils
CATEGORY:=Utilities
+ DEPENDS:=@!LINUX_2_6_ETRAX
URL:=http://www.kernel.org/pub/linux/utils/util-linux/
endef
define Package/fdisk
$(call Package/util-linux/Default)
TITLE:=Partition table manipulation utility
- DEPENDS:=@!LINUX_2_6_ETRAX
DESCRIPTION:=\
This package contains a utility for managing disk partition tables.
URL:=http://www.kernel.org/pub/linux/utils/util-linux/
@@ -36,7 +36,7 @@ endef
define Package/cfdisk
$(call Package/util-linux/Default)
TITLE:=Partition table manipulation utility
- DEPENDS:=+libncurses @!LINUX_2_6_ETRAX
+ DEPENDS+= +libncurses
DESCRIPTION:=\
This package contains a utility for managing disk partition tables.
URL:=http://www.kernel.org/pub/linux/utils/util-linux/
@@ -45,7 +45,6 @@ endef
define Package/losetup
$(call Package/util-linux/Default)
TITLE:=Loopback devices setup and control utility
- DEPENDS:=@!LINUX_2_6_ETRAX
DESCRIPTION:=\
This package contains a utility for managing loopback devices.
endef
@@ -53,7 +52,6 @@ endef
define Package/swap-utils
$(call Package/util-linux/Default)
TITLE:=Swap space management utilities
- DEPENDS:=@!LINUX_2_6_ETRAX
DESCRIPTION:=\
This package contains a collection of tools for managing swap space: \\\
- mkswap\\\
@@ -64,19 +62,26 @@ endef
define Package/hwclock
$(call Package/util-linux/Default)
TITLE:=Utilities for managing the hardware clock
- DEPENDS:=@!LINUX_2_6_ETRAX
DESCRIPTION:=\
This package contains a utility for managing the hardware clock
endef
-TARGET_CFLAGS += -I$(PKG_BUILD_DIR)/lib
+define Build/Configure
+ # this is NOT GNU configure!
+ ( cd $(PKG_BUILD_DIR); \
+ CC="$(TARGET_CC)" \
+ CFLAGS="$(TARGET_CPPFLAGS)" \
+ LDFLAGS="$(TARGET_LDFLAGS)" \
+ ./configure \
+ );
+endef
+
define Build/Compile
- $(call Build/Compile/Default, \
+ $(MAKE) -C $(PKG_BUILD_DIR) \
OPT="$(TARGET_CFLAGS)" \
INSTALLSUID="install -m 4755" \
DESTDIR="$(PKG_INSTALL_DIR)" \
- all install \
- )
+ all install
endef
define Package/Template