summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-12-27 14:45:25 -0600
committerWaldemar Brodkorb <wbx@openadk.org>2014-12-27 14:45:32 -0600
commitf34bca312fb9b40909b48e64e2d67e4a0076f5c7 (patch)
tree4892dd1987d915a7ffb5a5192251baeabf19c3fe
parent12d2a79814987afd34c457a5e4365d7167972bc0 (diff)
remove some crap
-rw-r--r--package/util-linux/patches/patch-config_ltmain_sh56
-rw-r--r--package/util-linux/patches/patch-config_missing20
-rw-r--r--package/util-linux/patches/patch-config_test-driver51
-rw-r--r--package/util-linux/patches/patch-configure_ac.orig19
-rw-r--r--package/util-linux/patches/patch-misc-utils_uuidd_820
5 files changed, 0 insertions, 166 deletions
diff --git a/package/util-linux/patches/patch-config_ltmain_sh b/package/util-linux/patches/patch-config_ltmain_sh
deleted file mode 100644
index 76996c357..000000000
--- a/package/util-linux/patches/patch-config_ltmain_sh
+++ /dev/null
@@ -1,56 +0,0 @@
---- util-linux-2.25.2.orig/config/ltmain.sh 2014-06-25 02:25:47.000000000 -0500
-+++ util-linux-2.25.2/config/ltmain.sh 2014-12-27 12:19:20.435521793 -0600
-@@ -5176,7 +5176,7 @@ func_mode_link ()
- ;;
- -all-static | -static | -static-libtool-libs)
- case $arg in
-- -all-static)
-+ -all-static|-static)
- if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
- func_warning "complete static linking is impossible in this configuration"
- fi
-@@ -5185,12 +5185,6 @@ func_mode_link ()
- fi
- prefer_static_libs=yes
- ;;
-- -static)
-- if test -z "$pic_flag" && test -n "$link_static_flag"; then
-- dlopen_self=$dlopen_self_static
-- fi
-- prefer_static_libs=built
-- ;;
- -static-libtool-libs)
- if test -z "$pic_flag" && test -n "$link_static_flag"; then
- dlopen_self=$dlopen_self_static
-@@ -5473,7 +5467,7 @@ func_mode_link ()
- prevarg="$arg"
-
- case $arg in
-- -all-static)
-+ -all-static|-static)
- if test -n "$link_static_flag"; then
- # See comment for -static flag below, for more details.
- func_append compile_command " $link_static_flag"
-@@ -5754,12 +5748,7 @@ func_mode_link ()
- continue
- ;;
-
-- -static | -static-libtool-libs)
-- # The effects of -static are defined in a previous loop.
-- # We used to do the same as -all-static on platforms that
-- # didn't have a PIC flag, but the assumption that the effects
-- # would be equivalent was wrong. It would break on at least
-- # Digital Unix and AIX.
-+ -static-libtool-libs)
- continue
- ;;
-
-@@ -5853,7 +5842,7 @@ func_mode_link ()
- # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-- -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
-+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*)
- func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
- func_append compile_command " $arg"
diff --git a/package/util-linux/patches/patch-config_missing b/package/util-linux/patches/patch-config_missing
deleted file mode 100644
index afebc2a0f..000000000
--- a/package/util-linux/patches/patch-config_missing
+++ /dev/null
@@ -1,20 +0,0 @@
---- util-linux-2.25.2.orig/config/missing 2013-08-05 05:10:38.000000000 -0500
-+++ util-linux-2.25.2/config/missing 2014-12-27 12:19:31.479521691 -0600
-@@ -1,7 +1,7 @@
- #! /bin/sh
- # Common wrapper for a few potentially missing GNU programs.
-
--scriptversion=2012-06-26.16; # UTC
-+scriptversion=2013-10-28.13; # UTC
-
- # Copyright (C) 1996-2013 Free Software Foundation, Inc.
- # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-@@ -160,7 +160,7 @@ give_advice ()
- ;;
- autom4te*)
- echo "You might have modified some maintainer files that require"
-- echo "the 'automa4te' program to be rebuilt."
-+ echo "the 'autom4te' program to be rebuilt."
- program_details 'autom4te'
- ;;
- bison*|yacc*)
diff --git a/package/util-linux/patches/patch-config_test-driver b/package/util-linux/patches/patch-config_test-driver
deleted file mode 100644
index 60e8464d4..000000000
--- a/package/util-linux/patches/patch-config_test-driver
+++ /dev/null
@@ -1,51 +0,0 @@
---- util-linux-2.25.2.orig/config/test-driver 2013-08-05 05:10:38.000000000 -0500
-+++ util-linux-2.25.2/config/test-driver 2014-12-27 12:19:32.871521679 -0600
-@@ -1,7 +1,7 @@
- #! /bin/sh
- # test-driver - basic testsuite driver script.
-
--scriptversion=2012-06-27.10; # UTC
-+scriptversion=2013-07-13.22; # UTC
-
- # Copyright (C) 2011-2013 Free Software Foundation, Inc.
- #
-@@ -44,13 +44,12 @@ print_usage ()
- Usage:
- test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
- [--expect-failure={yes|no}] [--color-tests={yes|no}]
-- [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT
-+ [--enable-hard-errors={yes|no}] [--]
-+ TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
- The '--test-name', '--log-file' and '--trs-file' options are mandatory.
- END
- }
-
--# TODO: better error handling in option parsing (in particular, ensure
--# TODO: $log_file, $trs_file and $test_name are defined).
- test_name= # Used for reporting.
- log_file= # Where to save the output of the test script.
- trs_file= # Where to save the metadata of the test run.
-@@ -69,10 +68,23 @@ while test $# -gt 0; do
- --enable-hard-errors) enable_hard_errors=$2; shift;;
- --) shift; break;;
- -*) usage_error "invalid option: '$1'";;
-+ *) break;;
- esac
- shift
- done
-
-+missing_opts=
-+test x"$test_name" = x && missing_opts="$missing_opts --test-name"
-+test x"$log_file" = x && missing_opts="$missing_opts --log-file"
-+test x"$trs_file" = x && missing_opts="$missing_opts --trs-file"
-+if test x"$missing_opts" != x; then
-+ usage_error "the following mandatory options are missing:$missing_opts"
-+fi
-+
-+if test $# -eq 0; then
-+ usage_error "missing argument"
-+fi
-+
- if test $color_tests = yes; then
- # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
- red='' # Red.
diff --git a/package/util-linux/patches/patch-configure_ac.orig b/package/util-linux/patches/patch-configure_ac.orig
deleted file mode 100644
index a2fc44d18..000000000
--- a/package/util-linux/patches/patch-configure_ac.orig
+++ /dev/null
@@ -1,19 +0,0 @@
---- util-linux-2.25.2.orig/configure.ac 2014-10-24 05:24:02.952545559 -0500
-+++ util-linux-2.25.2/configure.ac 2014-12-27 12:17:12.651522964 -0600
-@@ -53,16 +53,6 @@ LIBSMARTCOLS_LT_MINOR=1
- LIBSMARTCOLS_LT_MICRO=0
- LIBSMARTCOLS_VERSION_INFO=`expr $LIBSMARTCOLS_LT_MAJOR + $LIBSMARTCOLS_LT_MINOR`:$LIBSMARTCOLS_LT_MICRO:$LIBSMARTCOLS_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
diff --git a/package/util-linux/patches/patch-misc-utils_uuidd_8 b/package/util-linux/patches/patch-misc-utils_uuidd_8
deleted file mode 100644
index e4709603e..000000000
--- a/package/util-linux/patches/patch-misc-utils_uuidd_8
+++ /dev/null
@@ -1,20 +0,0 @@
---- util-linux-2.25.2.orig/misc-utils/uuidd.8 2014-10-24 05:29:31.248109303 -0500
-+++ util-linux-2.25.2/misc-utils/uuidd.8 2014-12-27 12:01:48.179531428 -0600
-@@ -34,7 +34,7 @@ UUIDs.
- .TP
- .BR \-p , " \-\-pid " \fIpath\fR
- Specify the pathname where the pid file should be written. By default,
--the pid file is written to /run/uuidd/uuidd.pid.
-+the pid file is written to /var/uuidd/uuidd.pid.
- .TP
- .BR \-P , " \-\-no-pid "
- Do not create pid file.
-@@ -57,7 +57,7 @@ request it to return a random-based UUID
- .TP
- .BR \-s , " \-\-socket " \fIpath\fR
- Specify the pathname used for the unix-domain socket used by uuidd. By
--default, the pathname used is /run/uuidd/request. This is primarily
-+default, the pathname used is /var/uuidd/request. This is primarily
- for debugging purposes, since the pathname is hard-coded in the libuuid
- library.
- .TP