summaryrefslogtreecommitdiff
path: root/meta/packages/util-linux/util-linux-2.17
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/util-linux/util-linux-2.17')
-rw-r--r--meta/packages/util-linux/util-linux-2.17/tls.patch70
-rw-r--r--meta/packages/util-linux/util-linux-2.17/uclibc-compile.patch13
-rw-r--r--meta/packages/util-linux/util-linux-2.17/util-linux-ng-replace-siginterrupt.patch23
3 files changed, 0 insertions, 106 deletions
diff --git a/meta/packages/util-linux/util-linux-2.17/tls.patch b/meta/packages/util-linux/util-linux-2.17/tls.patch
deleted file mode 100644
index bdb29cae1..000000000
--- a/meta/packages/util-linux/util-linux-2.17/tls.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Index: util-linux-ng-2.16/m4/tls.m4
-===================================================================
---- util-linux-ng-2.16.orig/m4/tls.m4 2009-07-04 01:20:03.000000000 +0200
-+++ util-linux-ng-2.16/m4/tls.m4 2009-07-30 01:57:30.151697033 +0200
-@@ -18,31 +18,26 @@
- # version as well.
- #
- AC_DEFUN([AX_TLS], [
-- AC_MSG_CHECKING(for thread local storage (TLS) class)
-- AC_CACHE_VAL(ac_cv_tls, [
-- ax_tls_keywords="__thread __declspec(thread) none"
-- for ax_tls_keyword in $ax_tls_keywords; do
-- case $ax_tls_keyword in
-- none) ac_cv_tls=none ; break ;;
-- *)
-- AC_TRY_COMPILE(
-- [#include <stdlib.h>
-- static void
-- foo(void) {
-- static ] $ax_tls_keyword [ int bar;
-- exit(1);
-- }],
-- [],
-- [ac_cv_tls=$ax_tls_keyword ; break],
-- ac_cv_tls=none
-- )
-- esac
-- done
--])
-+ AC_CACHE_CHECK([for thread local storage (TLS) class],
-+ ac_cv_tls,
-+ [AC_LINK_IFELSE([__thread int a; int b; int main() { return a = b; }],
-+ [chktls_save_LDFLAGS="$LDFLAGS"
-+ LDFLAGS="-shared -Wl,--no-undefined $LDFLAGS"
-+ chktls_save_CFLAGS="$CFLAGS"
-+ CFLAGS="-fPIC $CFLAGS"
-+ dnl If -shared works, test if TLS works in a shared library.
-+ AC_LINK_IFELSE([int f() { return 0; }],
-+ AC_LINK_IFELSE([__thread int a; int b; int f() { return a = b; }],
-+ [ac_cv_tls=yes],
-+ [ac_cv_tls=no]),
-+ [ac_cv_tls=yes])
-+ CFLAGS="$chktls_save_CFLAGS"
-+ LDFLAGS="$chktls_save_LDFLAGS"], [ac_cv_tls=no])
-+ ])
-
-- if test "$ac_cv_tls" != "none"; then
-- dnl AC_DEFINE([TLS], [], [If the compiler supports a TLS storage class define it to that here])
-- AC_DEFINE_UNQUOTED([TLS], $ac_cv_tls, [If the compiler supports a TLS storage class define it to that here])
-- fi
-- AC_MSG_RESULT($ac_cv_tls)
-+ AS_IF([test "x$ac_cv_tls" = "xyes"],
-+ [AC_DEFINE([TLS], 1,
-+ [Define this if the compiler supports __thread for Thread-Local Storage])
-+ $1],
-+ [$2])
- ])
-Index: util-linux-ng-2.16/shlibs/uuid/src/gen_uuid.c
-===================================================================
---- util-linux-ng-2.16.orig/shlibs/uuid/src/gen_uuid.c 2009-07-30 02:31:48.518159459 +0200
-+++ util-linux-ng-2.16/shlibs/uuid/src/gen_uuid.c 2009-07-30 02:32:04.867871183 +0200
-@@ -99,7 +99,7 @@
- #endif
-
- #ifdef TLS
--#define THREAD_LOCAL static TLS
-+#define THREAD_LOCAL static __thread
- #else
- #define THREAD_LOCAL static
- #endif
diff --git a/meta/packages/util-linux/util-linux-2.17/uclibc-compile.patch b/meta/packages/util-linux/util-linux-2.17/uclibc-compile.patch
deleted file mode 100644
index b2e8a8b95..000000000
--- a/meta/packages/util-linux/util-linux-2.17/uclibc-compile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: util-linux-ng-2.16/misc-utils/cal.c
-===================================================================
---- util-linux-ng-2.16.orig/misc-utils/cal.c 2009-07-03 16:20:01.000000000 -0700
-+++ util-linux-ng-2.16/misc-utils/cal.c 2009-07-18 23:21:37.000000000 -0700
-@@ -407,7 +407,7 @@
- strcpy(day_headings,"");
- strcpy(j_day_headings,"");
-
--#ifdef HAVE_LANGINFO_H
-+#ifdef HAVE_LANGINFO_H && !defined(__UCLIBC__)
- # define weekday(wd) nl_langinfo(ABDAY_1+wd)
- #else
- # define weekday(wd) _time_info->abbrev_wkday[wd]
diff --git a/meta/packages/util-linux/util-linux-2.17/util-linux-ng-replace-siginterrupt.patch b/meta/packages/util-linux/util-linux-2.17/util-linux-ng-replace-siginterrupt.patch
deleted file mode 100644
index 4b5eb7376..000000000
--- a/meta/packages/util-linux/util-linux-2.17/util-linux-ng-replace-siginterrupt.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: util-linux-ng-2.14/login-utils/login.c
-===================================================================
---- util-linux-ng-2.14.orig/login-utils/login.c 2008-05-28 16:01:02.000000000 -0700
-+++ util-linux-ng-2.14/login-utils/login.c 2009-03-04 18:31:42.000000000 -0800
-@@ -358,6 +358,7 @@
- char *childArgv[10];
- char *buff;
- int childArgc = 0;
-+ struct sigaction act;
- #ifdef HAVE_SECURITY_PAM_MISC_H
- int retcode;
- pam_handle_t *pamh = NULL;
-@@ -373,7 +374,9 @@
- pid = getpid();
-
- signal(SIGALRM, timedout);
-- siginterrupt(SIGALRM,1); /* we have to interrupt syscalls like ioclt() */
-+ (void) sigaction(SIGALRM, NULL, &act);
-+ act.sa_flags &= ~SA_RESTART;
-+ sigaction(SIGALRM, &act, NULL);
- alarm((unsigned int)timeout);
- signal(SIGQUIT, SIG_IGN);
- signal(SIGINT, SIG_IGN);