diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-06-20 10:13:00 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-06-20 10:13:24 +0200 |
| commit | 87c0185bf492767c4439f66f65398eb0ed3bda34 (patch) | |
| tree | 3c3255e6fab49050a3314ea797463d56190d57be /package/util-linux | |
| parent | dfd37d10510d013fc7c49ecb42d1b75c14be4594 (diff) | |
fix some packages, when static build is choosen
Diffstat (limited to 'package/util-linux')
| -rw-r--r-- | package/util-linux/Makefile | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index 3f2b101c8..a0e885020 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -52,26 +52,32 @@ $(eval $(call PKG_template,SWAP_UTILS,swap-utils,${PKG_VERSION}-${PKG_RELEASE},$ $(eval $(call PKG_template,LOSETUP,losetup,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LOSETUP},${PKGSD_LOSETUP},${PKGSC_LOSETUP})) $(eval $(call PKG_template,MOUNT,mount,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_MOUNT},${PKGSD_MOUNT},${PKGSC_MOUNT})) $(eval $(call PKG_template,MCOOKIE,mcookie,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_MCOOKIE},${PKGSC_MCOOKIE})) -$(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBUUID},${PKGSC_LIBUUID})) -$(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBBLKID},${PKGSC_LIBBLKID})) -$(eval $(call PKG_template,LIBMOUNT,libmount,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBMOUNT},${PKGSC_LIBMOUNT})) +$(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBUUID},${PKGSC_LIBUUID},${PKG_OPTS})) +$(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBBLKID},${PKGSC_LIBBLKID},${PKG_OPTS})) +$(eval $(call PKG_template,LIBMOUNT,libmount,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBMOUNT},${PKGSC_LIBMOUNT},${PKG_OPTS})) TARGET_CFLAGS+= -DSWAPON_HAS_TWO_ARGS -DHAVE_LLSEEK TARGET_LDFLAGS+= -ltinfo AUTOTOOL_STYLE:= autoreconf CONFIGURE_ENV+= have_scanf_alloc_modifier=yes \ scanf_cv_alloc_modifier=ms + +ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y) +CONFIGURE_ARGS+= --disable-su +CONFIGURE_ARGS+= --disable-runuser +else +CONFIGURE_ARGS+= --enable-su +endif + CONFIGURE_ARGS+= --disable-use-tty-group \ --disable-schedutils \ --disable-cramfs \ --disable-login \ --disable-eject \ - --enable-su \ --enable-libuuid \ --enable-libblkid \ --enable-libmount \ - --enable-mount \ - --with-ncurses=$(STAGING_TARGET_DIR)/usr/include + --enable-mount FAKE_FLAGS+= INSTALLSUID="install -m 4755" fdisk-install: |