Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 169382 Details for
Bug 243114
app-misc/lcd4linux-0.10.0-r1 failed
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
lcd4linux-0.10.0-nordtsc.patch
lcd4linux-0.10.0-nordtsc.patch (text/plain), 9.21 KB, created by
Conrad Kostecki
on 2008-10-22 09:25:17 UTC
(
hide
)
Description:
lcd4linux-0.10.0-nordtsc.patch
Filename:
MIME Type:
Creator:
Conrad Kostecki
Created:
2008-10-22 09:25:17 UTC
Size:
9.21 KB
patch
obsolete
>--- lcd4linux-0.10.0.orig/configure.in 2008-10-22 10:14:04.000000000 +0200 >+++ lcd4linux-0.10.0/configure.in 2008-10-22 10:14:50.000000000 +0200 >@@ -87,7 +87,6 @@ > AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/statfs.h sys/vfs.h sys/time.h syslog.h termios.h unistd.h]) > AC_CHECK_HEADERS(sys/io.h asm/io.h) > AC_CHECK_HEADERS(linux/parport.h linux/ppdev.h) >-AC_CHECK_HEADERS(asm/msr.h) > > # Checks for typedefs, structures, and compiler characteristics. > AC_C_CONST >--- lcd4linux-0.10.0.orig/udelay.c 2008-10-22 10:14:03.000000000 +0200 >+++ lcd4linux-0.10.0/udelay.c 2008-10-22 10:21:23.000000000 +0200 >@@ -147,10 +147,6 @@ > #include <string.h> > #include <sys/time.h> > >-#ifdef HAVE_ASM_MSR_H >-#include <asm/msr.h> >-#endif >- > #endif > > >@@ -201,104 +197,15 @@ > > #else > >-static unsigned int ticks_per_usec = 0; >- >-static void getCPUinfo(int *hasTSC, double *MHz) >-{ >- int fd; >- char buffer[4096], *p; >- >- *hasTSC = 0; >- *MHz = -1; >- >- fd = open("/proc/cpuinfo", O_RDONLY); >- if (fd == -1) { >- error("udelay: open(/proc/cpuinfo) failed: %s", strerror(errno)); >- return; >- } >- if (read(fd, &buffer, sizeof(buffer) - 1) == -1) { >- error("udelay: read(/proc/cpuinfo) failed: %s", strerror(errno)); >- close(fd); >- return; >- } >- close(fd); >- >- p = strstr(buffer, "flags"); >- if (p == NULL) { >- info("udelay: /proc/cpuinfo has no 'flags' line"); >- } else { >- p = strstr(p, "tsc"); >- if (p == NULL) { >- info("udelay: CPU does not support Time Stamp Counter"); >- } else { >- info("udelay: CPU supports Time Stamp Counter"); >- *hasTSC = 1; >- } >- } >- >- p = strstr(buffer, "cpu MHz"); >- if (p == NULL) { >- info("udelay: /proc/cpuinfo has no 'cpu MHz' line"); >- } else { >- if (sscanf(p + 7, " : %lf", MHz) != 1) { >- error("udelay: parse(/proc/cpuinfo) failed: unknown 'cpu MHz' format"); >- *MHz = -1; >- } else { >- info("udelay: CPU runs at %f MHz", *MHz); >- } >- } >- >-} >- > > void udelay_init(void) > { >-#ifdef HAVE_ASM_MSR_H >- >- int tsc; >- double mhz; >- >- getCPUinfo(&tsc, &mhz); >- >- if (tsc && mhz > 0.0) { >- ticks_per_usec = ceil(mhz); >- info("udelay: using TSC delay loop, %u ticks per microsecond", ticks_per_usec); >- } else >-#else >- error("udelay: The file 'include/asm/msr.h' was missing at compile time."); >- error("udelay: Even if your CPU supports TSC, it will not be used!"); >- error("udelay: You *really* should install msr.h and recompile LCD4linux!"); >-#endif >- >- { >- ticks_per_usec = 0; > info("udelay: using gettimeofday() delay loop"); >- } > } > > > void ndelay(const unsigned long nsec) > { >- >-#ifdef HAVE_ASM_MSR_H >- >- if (ticks_per_usec) { >- >- unsigned int t1, t2; >- unsigned long tsc; >- >- tsc = (nsec * ticks_per_usec + 999) / 1000; >- >- rdtscl(t1); >- do { >- rep_nop(); >- rdtscl(t2); >- } while ((t2 - t1) < tsc); >- >- } else >-#endif >- >- { > struct timeval now, end; > > gettimeofday(&end, NULL); >@@ -312,7 +219,6 @@ > rep_nop(); > gettimeofday(&now, NULL); > } while (now.tv_sec == end.tv_sec ? now.tv_usec < end.tv_usec : now.tv_sec < end.tv_sec); >- } > } > > #endif >--- lcd4linux-0.10.0.orig/config.h.in 2005-06-10 13:11:48.000000000 +0200 >+++ lcd4linux-0.10.0/config.h.in 2008-10-22 10:24:20.000000000 +0200 >@@ -12,9 +12,6 @@ > /* Define to 1 if you have the <asm/io.h> header file. */ > #undef HAVE_ASM_IO_H > >-/* Define to 1 if you have the <asm/msr.h> header file. */ >-#undef HAVE_ASM_MSR_H >- > /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'. > */ > #undef HAVE_DIRENT_H >--- lcd4linux-0.10.0.orig/configure 2008-10-22 10:14:04.000000000 +0200 >+++ lcd4linux-0.10.0/configure 2008-10-22 10:26:55.000000000 +0200 >@@ -8303,156 +8303,6 @@ > > done > >- >-for ac_header in asm/msr.h >-do >-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` >-if eval "test \"\${$as_ac_Header+set}\" = set"; then >- echo "$as_me:$LINENO: checking for $ac_header" >&5 >-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 >-if eval "test \"\${$as_ac_Header+set}\" = set"; then >- echo $ECHO_N "(cached) $ECHO_C" >&6 >-fi >-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 >-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 >-else >- # Is the header compilable? >-echo "$as_me:$LINENO: checking $ac_header usability" >&5 >-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 >-cat >conftest.$ac_ext <<_ACEOF >-/* confdefs.h. */ >-_ACEOF >-cat confdefs.h >>conftest.$ac_ext >-cat >>conftest.$ac_ext <<_ACEOF >-/* end confdefs.h. */ >-$ac_includes_default >-#include <$ac_header> >-_ACEOF >-rm -f conftest.$ac_objext >-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 >- (eval $ac_compile) 2>conftest.er1 >- ac_status=$? >- grep -v '^ *+' conftest.er1 >conftest.err >- rm -f conftest.er1 >- cat conftest.err >&5 >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); } && >- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' >- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 >- (eval $ac_try) 2>&5 >- ac_status=$? >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); }; } && >- { ac_try='test -s conftest.$ac_objext' >- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 >- (eval $ac_try) 2>&5 >- ac_status=$? >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); }; }; then >- ac_header_compiler=yes >-else >- echo "$as_me: failed program was:" >&5 >-sed 's/^/| /' conftest.$ac_ext >&5 >- >-ac_header_compiler=no >-fi >-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext >-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 >-echo "${ECHO_T}$ac_header_compiler" >&6 >- >-# Is the header present? >-echo "$as_me:$LINENO: checking $ac_header presence" >&5 >-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 >-cat >conftest.$ac_ext <<_ACEOF >-/* confdefs.h. */ >-_ACEOF >-cat confdefs.h >>conftest.$ac_ext >-cat >>conftest.$ac_ext <<_ACEOF >-/* end confdefs.h. */ >-#include <$ac_header> >-_ACEOF >-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 >- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 >- ac_status=$? >- grep -v '^ *+' conftest.er1 >conftest.err >- rm -f conftest.er1 >- cat conftest.err >&5 >- echo "$as_me:$LINENO: \$? = $ac_status" >&5 >- (exit $ac_status); } >/dev/null; then >- if test -s conftest.err; then >- ac_cpp_err=$ac_c_preproc_warn_flag >- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag >- else >- ac_cpp_err= >- fi >-else >- ac_cpp_err=yes >-fi >-if test -z "$ac_cpp_err"; then >- ac_header_preproc=yes >-else >- echo "$as_me: failed program was:" >&5 >-sed 's/^/| /' conftest.$ac_ext >&5 >- >- ac_header_preproc=no >-fi >-rm -f conftest.err conftest.$ac_ext >-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 >-echo "${ECHO_T}$ac_header_preproc" >&6 >- >-# So? What about this header? >-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in >- yes:no: ) >- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 >-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} >- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 >-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} >- ac_header_preproc=yes >- ;; >- no:yes:* ) >- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 >-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} >- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 >-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} >- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 >-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} >- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 >-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} >- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 >-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} >- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 >-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} >- ( >- cat <<\_ASBOX >-## ---------------------------------------------------- ## >-## Report this to lcd4linux-users@lists.sourceforge.net ## >-## ---------------------------------------------------- ## >-_ASBOX >- ) | >- sed "s/^/$as_me: WARNING: /" >&2 >- ;; >-esac >-echo "$as_me:$LINENO: checking for $ac_header" >&5 >-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 >-if eval "test \"\${$as_ac_Header+set}\" = set"; then >- echo $ECHO_N "(cached) $ECHO_C" >&6 >-else >- eval "$as_ac_Header=\$ac_header_preproc" >-fi >-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 >-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 >- >-fi >-if test `eval echo '${'$as_ac_Header'}'` = yes; then >- cat >>confdefs.h <<_ACEOF >-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 >-_ACEOF >- >-fi >- >-done >- >- > # Checks for typedefs, structures, and compiler characteristics. > echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 > echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=169382">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 243114
: 169382 |
169384
