diff options
| -rw-r--r-- | package/util-linux/Makefile | 1 | ||||
| -rw-r--r-- | package/util-linux/patches/patch-Makefile_am | 11 | ||||
| -rw-r--r-- | package/util-linux/patches/patch-configure_ac | 47 |
3 files changed, 0 insertions, 59 deletions
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index dd95c4c90..b9ba78197 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -67,7 +67,6 @@ $(eval $(call PKG_template,LIBMOUNT,libmount,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG TARGET_CFLAGS+= -DSWAPON_HAS_TWO_ARGS -DHAVE_LLSEEK TARGET_LDFLAGS+= -ltinfo -AUTOTOOL_STYLE:= autoreconf CONFIGURE_ARGS+= --disable-use-tty-group \ --disable-chfn-chsh \ --disable-more \ diff --git a/package/util-linux/patches/patch-Makefile_am b/package/util-linux/patches/patch-Makefile_am deleted file mode 100644 index f0be8ad45..000000000 --- a/package/util-linux/patches/patch-Makefile_am +++ /dev/null @@ -1,11 +0,0 @@ ---- util-linux-2.28.orig/Makefile.am 2016-03-17 14:04:55.559598594 +0100 -+++ util-linux-2.28/Makefile.am 2016-06-02 23:20:29.880857815 +0200 -@@ -60,7 +60,7 @@ CHECK_LOCALS = - EXTRA_DIST = - CLEANFILES = - --SUBDIRS = po -+SUBDIRS = - - RCS_FIND_IGNORE = \( -name SCCS -o -name BitKeeper -o -name .svn -o \ - -name CVS -o -name .pc -o -name .hg -o -name .git \) -prune -o diff --git a/package/util-linux/patches/patch-configure_ac b/package/util-linux/patches/patch-configure_ac deleted file mode 100644 index 87d72ecad..000000000 --- a/package/util-linux/patches/patch-configure_ac +++ /dev/null @@ -1,47 +0,0 @@ ---- util-linux-2.28.orig/configure.ac 2016-04-12 12:32:55.652316240 +0200 -+++ util-linux-2.28/configure.ac 2016-06-03 03:59:03.583369345 +0200 -@@ -64,16 +64,6 @@ LIBFDISK_LT_MINOR=1 - LIBFDISK_LT_MICRO=0 - LIBFDISK_VERSION_INFO=`expr $LIBFDISK_LT_MAJOR + $LIBFDISK_LT_MINOR`:$LIBFDISK_LT_MICRO:$LIBFDISK_LT_MINOR - --# Check whether exec_prefix=/usr: --AS_CASE([$exec_prefix:$prefix], --[NONE:NONE | NONE:/usr | /usr:*], -- [AC_MSG_NOTICE([Default --exec-prefix detected.]) -- AS_CASE([$bindir], ['${exec_prefix}/bin'], [bindir=/bin; AC_MSG_NOTICE([ --bindir defaults to /bin]) ]) -- AS_CASE([$sbindir], ['${exec_prefix}/sbin'], [sbindir=/sbin; AC_MSG_NOTICE([ --sbindir defaults to /sbin])]) -- AS_CASE([$libdir], ['${exec_prefix}/lib'], [libdir=/lib; AC_MSG_NOTICE([ --libdir defaults to /lib]) ]) -- ] --) -- - AS_CASE([$prefix:$localstatedir], - [NONE:'${prefix}/var' | /usr:'${prefix}/var'], - [localstatedir=/run -@@ -187,16 +177,6 @@ UL_SET_ARCH([HPPA], [hppa*]) - AC_SYS_LARGEFILE - AC_HEADER_ASSERT - --dnl Don't forget to maintain alternatively allowed versions in autogen.sh! --AM_GNU_GETTEXT_VERSION([0.18.3]) --AM_GNU_GETTEXT([external]) -- --AS_IF([test -d "$srcdir/po"], [ -- ALL_LINGUAS=`cd $srcdir/po > /dev/null && echo *.po | sed 's/\.po//g'` --], [ -- ALL_LINGUAS="af am ar as be bg bn_IN bn ca cs cy da de el en_GB es et eu_ES fa fi fr gl gu he hi hr hu hy id is it ja ka kn ko ku lo lt lv mk ml mr ms my nb nl nn no nso or pa pl pt_BR pt ro ru si sk sl sq sr@Latn sr sv ta te th tr uk ur vi zh_CN zh_TW zu" --]) -- - AC_CHECK_HEADERS([linux/compiler.h linux/blkpg.h linux/major.h], [], [], [ - #ifdef HAVE_LINUX_COMPILER_H - #include <linux/compiler.h> -@@ -2134,7 +2114,9 @@ libmount/src/libmount.h - libsmartcols/docs/Makefile - libsmartcols/docs/version.xml - libsmartcols/src/libsmartcols.h --po/Makefile.in -+libblkid/blkid.pc -+libuuid/uuid.pc -+libmount/mount.pc - ]) - - AC_OUTPUT |